| Message ID | 784c2efbdfead4dd8b70fbcf7ffbb81f5ad503c8.1436563183.git.jcd@tribudubois.net |
|---|---|
| State | New |
| Headers | show |
On Fri, Jul 10, 2015 at 4:31 PM, Jean-Christophe Dubois <jcd@tribudubois.net> wrote: > Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net> Reviewed-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> > --- > > 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: > * Fix coding style > > Changes since v9: > * no change > > Changes since v10: > * no change. > > Changes since v11: > * no change. > > hw/timer/imx_epit.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c > index f1f82e9..10c5d2b 100644 > --- a/hw/timer/imx_epit.c > +++ b/hw/timer/imx_epit.c > @@ -128,9 +128,9 @@ static void imx_epit_reset(DeviceState *dev) > > static uint32_t imx_epit_update_count(IMXEPITState *s) > { > - s->cnt = ptimer_get_count(s->timer_reload); > + s->cnt = ptimer_get_count(s->timer_reload); > > - return s->cnt; > + return s->cnt; > } > > static uint64_t imx_epit_read(void *opaque, hwaddr offset, unsigned size) > @@ -298,13 +298,13 @@ void imx_timerp_create(const hwaddr addr, qemu_irq irq, DeviceState *ccm) > } > > static const MemoryRegionOps imx_epit_ops = { > - .read = imx_epit_read, > - .write = imx_epit_write, > - .endianness = DEVICE_NATIVE_ENDIAN, > + .read = imx_epit_read, > + .write = imx_epit_write, > + .endianness = DEVICE_NATIVE_ENDIAN, > }; > > static const VMStateDescription vmstate_imx_timer_epit = { > - .name = "imx.epit", > + .name = TYPE_IMX_EPIT, > .version_id = 2, > .minimum_version_id = 2, > .fields = (VMStateField[]) { > -- > 2.1.4 > >
diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index f1f82e9..10c5d2b 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -128,9 +128,9 @@ static void imx_epit_reset(DeviceState *dev) static uint32_t imx_epit_update_count(IMXEPITState *s) { - s->cnt = ptimer_get_count(s->timer_reload); + s->cnt = ptimer_get_count(s->timer_reload); - return s->cnt; + return s->cnt; } static uint64_t imx_epit_read(void *opaque, hwaddr offset, unsigned size) @@ -298,13 +298,13 @@ void imx_timerp_create(const hwaddr addr, qemu_irq irq, DeviceState *ccm) } static const MemoryRegionOps imx_epit_ops = { - .read = imx_epit_read, - .write = imx_epit_write, - .endianness = DEVICE_NATIVE_ENDIAN, + .read = imx_epit_read, + .write = imx_epit_write, + .endianness = DEVICE_NATIVE_ENDIAN, }; static const VMStateDescription vmstate_imx_timer_epit = { - .name = "imx.epit", + .name = TYPE_IMX_EPIT, .version_id = 2, .minimum_version_id = 2, .fields = (VMStateField[]) {
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: * Fix coding style Changes since v9: * no change Changes since v10: * no change. Changes since v11: * no change. hw/timer/imx_epit.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)