Re: [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard declarations into a new header
On 1/7/19 7:39 AM, Thomas Huth wrote: > On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote: >> Signed-off-by: Philippe Mathieu-Daudé >> --- >> MAINTAINERS | 1 + >> hw/arm/nseries.c | 1 + >> hw/display/blizzard.c | 2 +- >> include/hw/devices.h | 7 --- >> include/hw/display/blizzard.h | 21 + >> 5 files changed, 24 insertions(+), 8 deletions(-) >> create mode 100644 include/hw/display/blizzard.h >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index dff4b98401..156ce9a698 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -640,6 +640,7 @@ M: Peter Maydell >> L: qemu-...@nongnu.org >> S: Odd Fixes >> F: hw/arm/nseries.c >> +F: include/hw/display/blizzard.h > > While you're at it, also add an entry for hw/display/blizzard.c here? Good idea :) > >> Palm >> M: Andrzej Zaborowski >> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c >> index 906b7ca22d..9521be1cef 100644 >> --- a/hw/arm/nseries.c >> +++ b/hw/arm/nseries.c >> @@ -31,6 +31,7 @@ >> #include "hw/boards.h" >> #include "hw/i2c/i2c.h" >> #include "hw/devices.h" >> +#include "hw/display/blizzard.h" >> #include "hw/block/flash.h" >> #include "hw/hw.h" >> #include "hw/bt.h" >> diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c >> index 291abe6fca..471bd0ed99 100644 >> --- a/hw/display/blizzard.c >> +++ b/hw/display/blizzard.c >> @@ -21,7 +21,7 @@ >> #include "qemu/osdep.h" >> #include "qemu-common.h" >> #include "ui/console.h" >> -#include "hw/devices.h" >> +#include "hw/display/blizzard.h" >> #include "ui/pixel_ops.h" >> >> typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int); >> diff --git a/include/hw/devices.h b/include/hw/devices.h >> index 5ad134232c..25f895b330 100644 >> --- a/include/hw/devices.h >> +++ b/include/hw/devices.h >> @@ -28,13 +28,6 @@ void tsc2005_set_transform(void *opaque, >> MouseTransformInfo *info); >> /* stellaris_input.c */ >> void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); >> >> -/* blizzard.c */ >> -void *s1d13745_init(qemu_irq gpio_int); >> -void s1d13745_write(void *opaque, int dc, uint16_t value); >> -void s1d13745_write_block(void *opaque, int dc, >> -void *buf, size_t len, int pitch); >> -uint16_t s1d13745_read(void *opaque, int dc); >> - >> /* cbus.c */ >> typedef struct { >> qemu_irq clk; >> diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.h >> new file mode 100644 >> index 00..8132557da1 >> --- /dev/null >> +++ b/include/hw/display/blizzard.h >> @@ -0,0 +1,21 @@ >> +/* >> + * Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controller. >> + * >> + * Copyright (C) 2008 Nokia Corporation >> + * Written by Andrzej Zaborowski > > I don't think that this e-mail address is still valid since that company > has been bought up > 10 years ago... so it likely does not make sense to > mention it in new files anymore. So just mention the name? Sure, I had no idea. TIL: check email domain when moving emails. >> + * This work is licensed under the terms of the GNU GPL, version 2 or later. >> + * See the COPYING file in the top-level directory. >> + */ >> +#ifndef HW_DISPLAY_BLIZZARD_H >> +#define HW_DISPLAY_BLIZZARD_H >> + >> +#include "hw/irq.h" >> + >> +void *s1d13745_init(qemu_irq gpio_int); >> +void s1d13745_write(void *opaque, int dc, uint16_t value); >> +void s1d13745_write_block(void *opaque, int dc, >> + void *buf, size_t len, int pitch); >> +uint16_t s1d13745_read(void *opaque, int dc); >> + >> +#endif >> > > Reviewed-by: Thomas Huth Thanks!
Re: [Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard declarations into a new header
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé > --- > MAINTAINERS | 1 + > hw/arm/nseries.c | 1 + > hw/display/blizzard.c | 2 +- > include/hw/devices.h | 7 --- > include/hw/display/blizzard.h | 21 + > 5 files changed, 24 insertions(+), 8 deletions(-) > create mode 100644 include/hw/display/blizzard.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index dff4b98401..156ce9a698 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -640,6 +640,7 @@ M: Peter Maydell > L: qemu-...@nongnu.org > S: Odd Fixes > F: hw/arm/nseries.c > +F: include/hw/display/blizzard.h While you're at it, also add an entry for hw/display/blizzard.c here? > Palm > M: Andrzej Zaborowski > diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c > index 906b7ca22d..9521be1cef 100644 > --- a/hw/arm/nseries.c > +++ b/hw/arm/nseries.c > @@ -31,6 +31,7 @@ > #include "hw/boards.h" > #include "hw/i2c/i2c.h" > #include "hw/devices.h" > +#include "hw/display/blizzard.h" > #include "hw/block/flash.h" > #include "hw/hw.h" > #include "hw/bt.h" > diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c > index 291abe6fca..471bd0ed99 100644 > --- a/hw/display/blizzard.c > +++ b/hw/display/blizzard.c > @@ -21,7 +21,7 @@ > #include "qemu/osdep.h" > #include "qemu-common.h" > #include "ui/console.h" > -#include "hw/devices.h" > +#include "hw/display/blizzard.h" > #include "ui/pixel_ops.h" > > typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int); > diff --git a/include/hw/devices.h b/include/hw/devices.h > index 5ad134232c..25f895b330 100644 > --- a/include/hw/devices.h > +++ b/include/hw/devices.h > @@ -28,13 +28,6 @@ void tsc2005_set_transform(void *opaque, > MouseTransformInfo *info); > /* stellaris_input.c */ > void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); > > -/* blizzard.c */ > -void *s1d13745_init(qemu_irq gpio_int); > -void s1d13745_write(void *opaque, int dc, uint16_t value); > -void s1d13745_write_block(void *opaque, int dc, > -void *buf, size_t len, int pitch); > -uint16_t s1d13745_read(void *opaque, int dc); > - > /* cbus.c */ > typedef struct { > qemu_irq clk; > diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.h > new file mode 100644 > index 00..8132557da1 > --- /dev/null > +++ b/include/hw/display/blizzard.h > @@ -0,0 +1,21 @@ > +/* > + * Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controller. > + * > + * Copyright (C) 2008 Nokia Corporation > + * Written by Andrzej Zaborowski I don't think that this e-mail address is still valid since that company has been bought up > 10 years ago... so it likely does not make sense to mention it in new files anymore. So just mention the name? > + * This work is licensed under the terms of the GNU GPL, version 2 or later. > + * See the COPYING file in the top-level directory. > + */ > +#ifndef HW_DISPLAY_BLIZZARD_H > +#define HW_DISPLAY_BLIZZARD_H > + > +#include "hw/irq.h" > + > +void *s1d13745_init(qemu_irq gpio_int); > +void s1d13745_write(void *opaque, int dc, uint16_t value); > +void s1d13745_write_block(void *opaque, int dc, > + void *buf, size_t len, int pitch); > +uint16_t s1d13745_read(void *opaque, int dc); > + > +#endif > Reviewed-by: Thomas Huth
[Qemu-devel] [PATCH 05/16] hw/devices: Move Blizzard declarations into a new header
Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + hw/arm/nseries.c | 1 + hw/display/blizzard.c | 2 +- include/hw/devices.h | 7 --- include/hw/display/blizzard.h | 21 + 5 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 include/hw/display/blizzard.h diff --git a/MAINTAINERS b/MAINTAINERS index dff4b98401..156ce9a698 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -640,6 +640,7 @@ M: Peter Maydell L: qemu-...@nongnu.org S: Odd Fixes F: hw/arm/nseries.c +F: include/hw/display/blizzard.h Palm M: Andrzej Zaborowski diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 906b7ca22d..9521be1cef 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -31,6 +31,7 @@ #include "hw/boards.h" #include "hw/i2c/i2c.h" #include "hw/devices.h" +#include "hw/display/blizzard.h" #include "hw/block/flash.h" #include "hw/hw.h" #include "hw/bt.h" diff --git a/hw/display/blizzard.c b/hw/display/blizzard.c index 291abe6fca..471bd0ed99 100644 --- a/hw/display/blizzard.c +++ b/hw/display/blizzard.c @@ -21,7 +21,7 @@ #include "qemu/osdep.h" #include "qemu-common.h" #include "ui/console.h" -#include "hw/devices.h" +#include "hw/display/blizzard.h" #include "ui/pixel_ops.h" typedef void (*blizzard_fn_t)(uint8_t *, const uint8_t *, unsigned int); diff --git a/include/hw/devices.h b/include/hw/devices.h index 5ad134232c..25f895b330 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -28,13 +28,6 @@ void tsc2005_set_transform(void *opaque, MouseTransformInfo *info); /* stellaris_input.c */ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); -/* blizzard.c */ -void *s1d13745_init(qemu_irq gpio_int); -void s1d13745_write(void *opaque, int dc, uint16_t value); -void s1d13745_write_block(void *opaque, int dc, -void *buf, size_t len, int pitch); -uint16_t s1d13745_read(void *opaque, int dc); - /* cbus.c */ typedef struct { qemu_irq clk; diff --git a/include/hw/display/blizzard.h b/include/hw/display/blizzard.h new file mode 100644 index 00..8132557da1 --- /dev/null +++ b/include/hw/display/blizzard.h @@ -0,0 +1,21 @@ +/* + * Epson S1D13744/S1D13745 (Blizzard/Hailstorm/Tornado) LCD/TV controller. + * + * Copyright (C) 2008 Nokia Corporation + * Written by Andrzej Zaborowski + * + * This work is licensed under the terms of the GNU GPL, version 2 or later. + * See the COPYING file in the top-level directory. + */ +#ifndef HW_DISPLAY_BLIZZARD_H +#define HW_DISPLAY_BLIZZARD_H + +#include "hw/irq.h" + +void *s1d13745_init(qemu_irq gpio_int); +void s1d13745_write(void *opaque, int dc, uint16_t value); +void s1d13745_write_block(void *opaque, int dc, + void *buf, size_t len, int pitch); +uint16_t s1d13745_read(void *opaque, int dc); + +#endif -- 2.17.2