| Message ID | 9977fa8a82dd525f7702337570c983e227209920.1436138841.git.jcd@tribudubois.net |
|---|---|
| State | New |
| Headers | show |
Also wondering what this prepares for, can it be deleted later from its current form? Regards, Peter On Sun, Jul 5, 2015 at 5:05 PM, Jean-Christophe Dubois <jcd@tribudubois.net> wrote: > Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> > --- > > Changes since v1: > * not present on v1 > > Changes since v2: > * not present on v2 > > Changes since v3: > * not present on v3 > > Changes since v4: > * not present on v4 > > Changes since v5: > * not present on v5 > > Changes since v6: > * not present on v6 > > Changes since v7: > * not present on v7 > > Changes since v8: > * remove qdev construction helper > > Changes since v9: > * Qdev construction helper is reintegrated and moved to a header file > as an inline function. > > hw/timer/imx_epit.c | 11 ----------- > include/hw/arm/imx.h | 17 ++++++++++++++--- > 2 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c > index f1f82e9..68dc0bc 100644 > --- a/hw/timer/imx_epit.c > +++ b/hw/timer/imx_epit.c > @@ -12,7 +12,6 @@ > * > */ > > -#include "hw/arm/imx.h" > #include "hw/timer/imx_epit.h" > #include "hw/misc/imx_ccm.h" > #include "qemu/main-loop.h" > @@ -287,16 +286,6 @@ static void imx_epit_cmp(void *opaque) > imx_epit_update_int(s); > } > > -void imx_timerp_create(const hwaddr addr, qemu_irq irq, DeviceState *ccm) > -{ > - IMXEPITState *pp; > - DeviceState *dev; > - > - dev = sysbus_create_simple(TYPE_IMX_EPIT, addr, irq); > - pp = IMX_EPIT(dev); > - pp->ccm = ccm; > -} > - > static const MemoryRegionOps imx_epit_ops = { > .read = imx_epit_read, > .write = imx_epit_write, > diff --git a/include/hw/arm/imx.h b/include/hw/arm/imx.h > index 0e8cc5a..c6cb192 100644 > --- a/include/hw/arm/imx.h > +++ b/include/hw/arm/imx.h > @@ -15,6 +15,7 @@ > #include "hw/sysbus.h" > #include "hw/char/imx_serial.h" > #include "hw/misc/imx_ccm.h" > +#include "hw/timer/imx_epit.h" > > /*** > * This Qdev construction helper is going to be removed soon > @@ -41,12 +42,22 @@ static inline void imx_serial_create(int uart, const hwaddr addr, qemu_irq irq) > } > } > > +static inline > void imx_timerp_create(const hwaddr addr, > qemu_irq irq, > - DeviceState *ccm); > + DeviceState *ccm) > +{ > + IMXEPITState *pp; > + DeviceState *dev; > + > + dev = sysbus_create_simple(TYPE_IMX_EPIT, addr, irq); > + pp = IMX_EPIT(dev); > + pp->ccm = ccm; > +} > + > void imx_timerg_create(const hwaddr addr, > - qemu_irq irq, > - DeviceState *ccm); > + qemu_irq irq, > + DeviceState *ccm); > > > > -- > 2.1.4 > >
diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index f1f82e9..68dc0bc 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -12,7 +12,6 @@ * */ -#include "hw/arm/imx.h" #include "hw/timer/imx_epit.h" #include "hw/misc/imx_ccm.h" #include "qemu/main-loop.h" @@ -287,16 +286,6 @@ static void imx_epit_cmp(void *opaque) imx_epit_update_int(s); } -void imx_timerp_create(const hwaddr addr, qemu_irq irq, DeviceState *ccm) -{ - IMXEPITState *pp; - DeviceState *dev; - - dev = sysbus_create_simple(TYPE_IMX_EPIT, addr, irq); - pp = IMX_EPIT(dev); - pp->ccm = ccm; -} - static const MemoryRegionOps imx_epit_ops = { .read = imx_epit_read, .write = imx_epit_write, diff --git a/include/hw/arm/imx.h b/include/hw/arm/imx.h index 0e8cc5a..c6cb192 100644 --- a/include/hw/arm/imx.h +++ b/include/hw/arm/imx.h @@ -15,6 +15,7 @@ #include "hw/sysbus.h" #include "hw/char/imx_serial.h" #include "hw/misc/imx_ccm.h" +#include "hw/timer/imx_epit.h" /*** * This Qdev construction helper is going to be removed soon @@ -41,12 +42,22 @@ static inline void imx_serial_create(int uart, const hwaddr addr, qemu_irq irq) } } +static inline void imx_timerp_create(const hwaddr addr, qemu_irq irq, - DeviceState *ccm); + DeviceState *ccm) +{ + IMXEPITState *pp; + DeviceState *dev; + + dev = sysbus_create_simple(TYPE_IMX_EPIT, addr, irq); + pp = IMX_EPIT(dev); + pp->ccm = ccm; +} + void imx_timerg_create(const hwaddr addr, - qemu_irq irq, - DeviceState *ccm); + qemu_irq irq, + DeviceState *ccm);
Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> --- Changes since v1: * not present on v1 Changes since v2: * not present on v2 Changes since v3: * not present on v3 Changes since v4: * not present on v4 Changes since v5: * not present on v5 Changes since v6: * not present on v6 Changes since v7: * not present on v7 Changes since v8: * remove qdev construction helper Changes since v9: * Qdev construction helper is reintegrated and moved to a header file as an inline function. hw/timer/imx_epit.c | 11 ----------- include/hw/arm/imx.h | 17 ++++++++++++++--- 2 files changed, 14 insertions(+), 14 deletions(-)