Message ID | 20190104175847.6290-7-philmd@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | hw: Remove "hw/devices.h" | expand |
On 2019-01-04 18:58, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > MAINTAINERS | 1 + > hw/arm/nseries.c | 1 + > hw/misc/cbus.c | 2 +- > include/hw/devices.h | 14 -------------- > include/hw/misc/cbus.h | 31 +++++++++++++++++++++++++++++++ > 5 files changed, 34 insertions(+), 15 deletions(-) > create mode 100644 include/hw/misc/cbus.h > > diff --git a/MAINTAINERS b/MAINTAINERS > index 156ce9a698..63ed6636ef 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -641,6 +641,7 @@ L: qemu-arm@nongnu.org > S: Odd Fixes > F: hw/arm/nseries.c > F: include/hw/display/blizzard.h > +F: include/hw/misc/cbus.h (note: I've added an entry for cbus.c here: https://lists.gnu.org/archive/html/qemu-devel/2019-01/msg00097.html you likely got to rebase this patch in case it hits master before your patch) > Palm > M: Andrzej Zaborowski <balrogg@gmail.com> > diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c > index 9521be1cef..ac876b5878 100644 > --- a/hw/arm/nseries.c > +++ b/hw/arm/nseries.c > @@ -32,6 +32,7 @@ > #include "hw/i2c/i2c.h" > #include "hw/devices.h" > #include "hw/display/blizzard.h" > +#include "hw/misc/cbus.h" > #include "hw/block/flash.h" > #include "hw/hw.h" > #include "hw/bt.h" > diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c > index 25e337ea77..16ee704bca 100644 > --- a/hw/misc/cbus.c > +++ b/hw/misc/cbus.c > @@ -23,7 +23,7 @@ > #include "qemu/osdep.h" > #include "hw/hw.h" > #include "hw/irq.h" > -#include "hw/devices.h" > +#include "hw/misc/cbus.h" > #include "sysemu/sysemu.h" > > //#define DEBUG > diff --git a/include/hw/devices.h b/include/hw/devices.h > index 25f895b330..8b649541b1 100644 > --- a/include/hw/devices.h > +++ b/include/hw/devices.h > @@ -28,18 +28,4 @@ void tsc2005_set_transform(void *opaque, MouseTransformInfo *info); > /* stellaris_input.c */ > void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); > > -/* cbus.c */ > -typedef struct { > - qemu_irq clk; > - qemu_irq dat; > - qemu_irq sel; > -} CBus; > -CBus *cbus_init(qemu_irq dat_out); > -void cbus_attach(CBus *bus, void *slave_opaque); > - > -void *retu_init(qemu_irq irq, int vilma); > -void *tahvo_init(qemu_irq irq, int betty); > - > -void retu_key_event(void *retu, int state); > - > #endif > diff --git a/include/hw/misc/cbus.h b/include/hw/misc/cbus.h > new file mode 100644 > index 0000000000..1ce1855ccf > --- /dev/null > +++ b/include/hw/misc/cbus.h > @@ -0,0 +1,31 @@ > +/* > + * CBUS three-pin bus and the Retu / Betty / Tahvo / Vilma / Avilma / > + * Hinku / Vinku / Ahne / Pihi chips used in various Nokia platforms. > + * Based on reverse-engineering of a linux driver. > + * > + * Copyright (C) 2008 Nokia Corporation > + * Written by Andrzej Zaborowski <andrew@openedhand.com> I'd drop the invalid e-mail address here, too, I think. > + * 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_MISC_CBUS_H > +#define HW_MISC_CBUS_H > + > +#include "hw/irq.h" > + > +typedef struct { > + qemu_irq clk; > + qemu_irq dat; > + qemu_irq sel; > +} CBus; > + > +CBus *cbus_init(qemu_irq dat_out); > +void cbus_attach(CBus *bus, void *slave_opaque); > + > +void *retu_init(qemu_irq irq, int vilma); > +void *tahvo_init(qemu_irq irq, int betty); > + > +void retu_key_event(void *retu, int state); > + > +#endif > Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/MAINTAINERS b/MAINTAINERS index 156ce9a698..63ed6636ef 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -641,6 +641,7 @@ L: qemu-arm@nongnu.org S: Odd Fixes F: hw/arm/nseries.c F: include/hw/display/blizzard.h +F: include/hw/misc/cbus.h Palm M: Andrzej Zaborowski <balrogg@gmail.com> diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c index 9521be1cef..ac876b5878 100644 --- a/hw/arm/nseries.c +++ b/hw/arm/nseries.c @@ -32,6 +32,7 @@ #include "hw/i2c/i2c.h" #include "hw/devices.h" #include "hw/display/blizzard.h" +#include "hw/misc/cbus.h" #include "hw/block/flash.h" #include "hw/hw.h" #include "hw/bt.h" diff --git a/hw/misc/cbus.c b/hw/misc/cbus.c index 25e337ea77..16ee704bca 100644 --- a/hw/misc/cbus.c +++ b/hw/misc/cbus.c @@ -23,7 +23,7 @@ #include "qemu/osdep.h" #include "hw/hw.h" #include "hw/irq.h" -#include "hw/devices.h" +#include "hw/misc/cbus.h" #include "sysemu/sysemu.h" //#define DEBUG diff --git a/include/hw/devices.h b/include/hw/devices.h index 25f895b330..8b649541b1 100644 --- a/include/hw/devices.h +++ b/include/hw/devices.h @@ -28,18 +28,4 @@ void tsc2005_set_transform(void *opaque, MouseTransformInfo *info); /* stellaris_input.c */ void stellaris_gamepad_init(int n, qemu_irq *irq, const int *keycode); -/* cbus.c */ -typedef struct { - qemu_irq clk; - qemu_irq dat; - qemu_irq sel; -} CBus; -CBus *cbus_init(qemu_irq dat_out); -void cbus_attach(CBus *bus, void *slave_opaque); - -void *retu_init(qemu_irq irq, int vilma); -void *tahvo_init(qemu_irq irq, int betty); - -void retu_key_event(void *retu, int state); - #endif diff --git a/include/hw/misc/cbus.h b/include/hw/misc/cbus.h new file mode 100644 index 0000000000..1ce1855ccf --- /dev/null +++ b/include/hw/misc/cbus.h @@ -0,0 +1,31 @@ +/* + * CBUS three-pin bus and the Retu / Betty / Tahvo / Vilma / Avilma / + * Hinku / Vinku / Ahne / Pihi chips used in various Nokia platforms. + * Based on reverse-engineering of a linux driver. + * + * Copyright (C) 2008 Nokia Corporation + * Written by Andrzej Zaborowski <andrew@openedhand.com> + * + * 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_MISC_CBUS_H +#define HW_MISC_CBUS_H + +#include "hw/irq.h" + +typedef struct { + qemu_irq clk; + qemu_irq dat; + qemu_irq sel; +} CBus; + +CBus *cbus_init(qemu_irq dat_out); +void cbus_attach(CBus *bus, void *slave_opaque); + +void *retu_init(qemu_irq irq, int vilma); +void *tahvo_init(qemu_irq irq, int betty); + +void retu_key_event(void *retu, int state); + +#endif
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> --- MAINTAINERS | 1 + hw/arm/nseries.c | 1 + hw/misc/cbus.c | 2 +- include/hw/devices.h | 14 -------------- include/hw/misc/cbus.h | 31 +++++++++++++++++++++++++++++++ 5 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 include/hw/misc/cbus.h