Message ID | 20210121190622.22000-7-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show |
Series | Convert CMSDK timer, watchdog, dualtimer to Clock framework | expand |
On 1/21/21 8:06 PM, Peter Maydell wrote: > The state struct for the CMSDK APB timer device doesn't follow our > usual naming convention of camelcase -- "CMSDK" and "APB" are both > acronyms, but "TIMER" is not so should not be all-uppercase. > Globally rename the struct to "CMSDKAPBTimer" (bringing it into line > with CMSDKAPBWatchdog and CMSDKAPBDualTimer; CMSDKAPBUART remains > as-is because "UART" is an acronym). > > Commit created with: > perl -p -i -e 's/CMSDKAPBTIMER/CMSDKAPBTimer/g' hw/timer/cmsdk-apb-timer.c include/hw/arm/armsse.h include/hw/timer/cmsdk-apb-timer.h > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > include/hw/arm/armsse.h | 6 +++--- > include/hw/timer/cmsdk-apb-timer.h | 4 ++-- > hw/timer/cmsdk-apb-timer.c | 28 ++++++++++++++-------------- > 3 files changed, 19 insertions(+), 19 deletions(-) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
On 19:06 Thu 21 Jan , Peter Maydell wrote: > The state struct for the CMSDK APB timer device doesn't follow our > usual naming convention of camelcase -- "CMSDK" and "APB" are both > acronyms, but "TIMER" is not so should not be all-uppercase. > Globally rename the struct to "CMSDKAPBTimer" (bringing it into line > with CMSDKAPBWatchdog and CMSDKAPBDualTimer; CMSDKAPBUART remains > as-is because "UART" is an acronym). > > Commit created with: > perl -p -i -e 's/CMSDKAPBTIMER/CMSDKAPBTimer/g' hw/timer/cmsdk-apb-timer.c include/hw/arm/armsse.h include/hw/timer/cmsdk-apb-timer.h > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Luc Michel <luc@lmichel.fr> > --- > include/hw/arm/armsse.h | 6 +++--- > include/hw/timer/cmsdk-apb-timer.h | 4 ++-- > hw/timer/cmsdk-apb-timer.c | 28 ++++++++++++++-------------- > 3 files changed, 19 insertions(+), 19 deletions(-) > > diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h > index 77f86771c30..83f5e28c16e 100644 > --- a/include/hw/arm/armsse.h > +++ b/include/hw/arm/armsse.h > @@ -153,9 +153,9 @@ struct ARMSSE { > TZPPC apb_ppc0; > TZPPC apb_ppc1; > TZMPC mpc[IOTS_NUM_MPC]; > - CMSDKAPBTIMER timer0; > - CMSDKAPBTIMER timer1; > - CMSDKAPBTIMER s32ktimer; > + CMSDKAPBTimer timer0; > + CMSDKAPBTimer timer1; > + CMSDKAPBTimer s32ktimer; > qemu_or_irq ppc_irq_orgate; > SplitIRQ sec_resp_splitter; > SplitIRQ ppc_irq_splitter[NUM_PPCS]; > diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-apb-timer.h > index 0d80b2a48cd..baa009bb2da 100644 > --- a/include/hw/timer/cmsdk-apb-timer.h > +++ b/include/hw/timer/cmsdk-apb-timer.h > @@ -18,9 +18,9 @@ > #include "qom/object.h" > > #define TYPE_CMSDK_APB_TIMER "cmsdk-apb-timer" > -OBJECT_DECLARE_SIMPLE_TYPE(CMSDKAPBTIMER, CMSDK_APB_TIMER) > +OBJECT_DECLARE_SIMPLE_TYPE(CMSDKAPBTimer, CMSDK_APB_TIMER) > > -struct CMSDKAPBTIMER { > +struct CMSDKAPBTimer { > /*< private >*/ > SysBusDevice parent_obj; > > diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c > index f85f1309f37..ae9c5422540 100644 > --- a/hw/timer/cmsdk-apb-timer.c > +++ b/hw/timer/cmsdk-apb-timer.c > @@ -67,14 +67,14 @@ static const int timer_id[] = { > 0x0d, 0xf0, 0x05, 0xb1, /* CID0..CID3 */ > }; > > -static void cmsdk_apb_timer_update(CMSDKAPBTIMER *s) > +static void cmsdk_apb_timer_update(CMSDKAPBTimer *s) > { > qemu_set_irq(s->timerint, !!(s->intstatus & R_INTSTATUS_IRQ_MASK)); > } > > static uint64_t cmsdk_apb_timer_read(void *opaque, hwaddr offset, unsigned size) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); > uint64_t r; > > switch (offset) { > @@ -106,7 +106,7 @@ static uint64_t cmsdk_apb_timer_read(void *opaque, hwaddr offset, unsigned size) > static void cmsdk_apb_timer_write(void *opaque, hwaddr offset, uint64_t value, > unsigned size) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); > > trace_cmsdk_apb_timer_write(offset, value, size); > > @@ -181,7 +181,7 @@ static const MemoryRegionOps cmsdk_apb_timer_ops = { > > static void cmsdk_apb_timer_tick(void *opaque) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); > > if (s->ctrl & R_CTRL_IRQEN_MASK) { > s->intstatus |= R_INTSTATUS_IRQ_MASK; > @@ -191,7 +191,7 @@ static void cmsdk_apb_timer_tick(void *opaque) > > static void cmsdk_apb_timer_reset(DeviceState *dev) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(dev); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(dev); > > trace_cmsdk_apb_timer_reset(); > s->ctrl = 0; > @@ -206,7 +206,7 @@ static void cmsdk_apb_timer_reset(DeviceState *dev) > static void cmsdk_apb_timer_init(Object *obj) > { > SysBusDevice *sbd = SYS_BUS_DEVICE(obj); > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(obj); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(obj); > > memory_region_init_io(&s->iomem, obj, &cmsdk_apb_timer_ops, > s, "cmsdk-apb-timer", 0x1000); > @@ -216,7 +216,7 @@ static void cmsdk_apb_timer_init(Object *obj) > > static void cmsdk_apb_timer_realize(DeviceState *dev, Error **errp) > { > - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(dev); > + CMSDKAPBTimer *s = CMSDK_APB_TIMER(dev); > > if (s->pclk_frq == 0) { > error_setg(errp, "CMSDK APB timer: pclk-frq property must be set"); > @@ -239,17 +239,17 @@ static const VMStateDescription cmsdk_apb_timer_vmstate = { > .version_id = 1, > .minimum_version_id = 1, > .fields = (VMStateField[]) { > - VMSTATE_PTIMER(timer, CMSDKAPBTIMER), > - VMSTATE_UINT32(ctrl, CMSDKAPBTIMER), > - VMSTATE_UINT32(value, CMSDKAPBTIMER), > - VMSTATE_UINT32(reload, CMSDKAPBTIMER), > - VMSTATE_UINT32(intstatus, CMSDKAPBTIMER), > + VMSTATE_PTIMER(timer, CMSDKAPBTimer), > + VMSTATE_UINT32(ctrl, CMSDKAPBTimer), > + VMSTATE_UINT32(value, CMSDKAPBTimer), > + VMSTATE_UINT32(reload, CMSDKAPBTimer), > + VMSTATE_UINT32(intstatus, CMSDKAPBTimer), > VMSTATE_END_OF_LIST() > } > }; > > static Property cmsdk_apb_timer_properties[] = { > - DEFINE_PROP_UINT32("pclk-frq", CMSDKAPBTIMER, pclk_frq, 0), > + DEFINE_PROP_UINT32("pclk-frq", CMSDKAPBTimer, pclk_frq, 0), > DEFINE_PROP_END_OF_LIST(), > }; > > @@ -266,7 +266,7 @@ static void cmsdk_apb_timer_class_init(ObjectClass *klass, void *data) > static const TypeInfo cmsdk_apb_timer_info = { > .name = TYPE_CMSDK_APB_TIMER, > .parent = TYPE_SYS_BUS_DEVICE, > - .instance_size = sizeof(CMSDKAPBTIMER), > + .instance_size = sizeof(CMSDKAPBTimer), > .instance_init = cmsdk_apb_timer_init, > .class_init = cmsdk_apb_timer_class_init, > }; > -- > 2.20.1 > --
diff --git a/include/hw/arm/armsse.h b/include/hw/arm/armsse.h index 77f86771c30..83f5e28c16e 100644 --- a/include/hw/arm/armsse.h +++ b/include/hw/arm/armsse.h @@ -153,9 +153,9 @@ struct ARMSSE { TZPPC apb_ppc0; TZPPC apb_ppc1; TZMPC mpc[IOTS_NUM_MPC]; - CMSDKAPBTIMER timer0; - CMSDKAPBTIMER timer1; - CMSDKAPBTIMER s32ktimer; + CMSDKAPBTimer timer0; + CMSDKAPBTimer timer1; + CMSDKAPBTimer s32ktimer; qemu_or_irq ppc_irq_orgate; SplitIRQ sec_resp_splitter; SplitIRQ ppc_irq_splitter[NUM_PPCS]; diff --git a/include/hw/timer/cmsdk-apb-timer.h b/include/hw/timer/cmsdk-apb-timer.h index 0d80b2a48cd..baa009bb2da 100644 --- a/include/hw/timer/cmsdk-apb-timer.h +++ b/include/hw/timer/cmsdk-apb-timer.h @@ -18,9 +18,9 @@ #include "qom/object.h" #define TYPE_CMSDK_APB_TIMER "cmsdk-apb-timer" -OBJECT_DECLARE_SIMPLE_TYPE(CMSDKAPBTIMER, CMSDK_APB_TIMER) +OBJECT_DECLARE_SIMPLE_TYPE(CMSDKAPBTimer, CMSDK_APB_TIMER) -struct CMSDKAPBTIMER { +struct CMSDKAPBTimer { /*< private >*/ SysBusDevice parent_obj; diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c index f85f1309f37..ae9c5422540 100644 --- a/hw/timer/cmsdk-apb-timer.c +++ b/hw/timer/cmsdk-apb-timer.c @@ -67,14 +67,14 @@ static const int timer_id[] = { 0x0d, 0xf0, 0x05, 0xb1, /* CID0..CID3 */ }; -static void cmsdk_apb_timer_update(CMSDKAPBTIMER *s) +static void cmsdk_apb_timer_update(CMSDKAPBTimer *s) { qemu_set_irq(s->timerint, !!(s->intstatus & R_INTSTATUS_IRQ_MASK)); } static uint64_t cmsdk_apb_timer_read(void *opaque, hwaddr offset, unsigned size) { - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); uint64_t r; switch (offset) { @@ -106,7 +106,7 @@ static uint64_t cmsdk_apb_timer_read(void *opaque, hwaddr offset, unsigned size) static void cmsdk_apb_timer_write(void *opaque, hwaddr offset, uint64_t value, unsigned size) { - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); trace_cmsdk_apb_timer_write(offset, value, size); @@ -181,7 +181,7 @@ static const MemoryRegionOps cmsdk_apb_timer_ops = { static void cmsdk_apb_timer_tick(void *opaque) { - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(opaque); + CMSDKAPBTimer *s = CMSDK_APB_TIMER(opaque); if (s->ctrl & R_CTRL_IRQEN_MASK) { s->intstatus |= R_INTSTATUS_IRQ_MASK; @@ -191,7 +191,7 @@ static void cmsdk_apb_timer_tick(void *opaque) static void cmsdk_apb_timer_reset(DeviceState *dev) { - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(dev); + CMSDKAPBTimer *s = CMSDK_APB_TIMER(dev); trace_cmsdk_apb_timer_reset(); s->ctrl = 0; @@ -206,7 +206,7 @@ static void cmsdk_apb_timer_reset(DeviceState *dev) static void cmsdk_apb_timer_init(Object *obj) { SysBusDevice *sbd = SYS_BUS_DEVICE(obj); - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(obj); + CMSDKAPBTimer *s = CMSDK_APB_TIMER(obj); memory_region_init_io(&s->iomem, obj, &cmsdk_apb_timer_ops, s, "cmsdk-apb-timer", 0x1000); @@ -216,7 +216,7 @@ static void cmsdk_apb_timer_init(Object *obj) static void cmsdk_apb_timer_realize(DeviceState *dev, Error **errp) { - CMSDKAPBTIMER *s = CMSDK_APB_TIMER(dev); + CMSDKAPBTimer *s = CMSDK_APB_TIMER(dev); if (s->pclk_frq == 0) { error_setg(errp, "CMSDK APB timer: pclk-frq property must be set"); @@ -239,17 +239,17 @@ static const VMStateDescription cmsdk_apb_timer_vmstate = { .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { - VMSTATE_PTIMER(timer, CMSDKAPBTIMER), - VMSTATE_UINT32(ctrl, CMSDKAPBTIMER), - VMSTATE_UINT32(value, CMSDKAPBTIMER), - VMSTATE_UINT32(reload, CMSDKAPBTIMER), - VMSTATE_UINT32(intstatus, CMSDKAPBTIMER), + VMSTATE_PTIMER(timer, CMSDKAPBTimer), + VMSTATE_UINT32(ctrl, CMSDKAPBTimer), + VMSTATE_UINT32(value, CMSDKAPBTimer), + VMSTATE_UINT32(reload, CMSDKAPBTimer), + VMSTATE_UINT32(intstatus, CMSDKAPBTimer), VMSTATE_END_OF_LIST() } }; static Property cmsdk_apb_timer_properties[] = { - DEFINE_PROP_UINT32("pclk-frq", CMSDKAPBTIMER, pclk_frq, 0), + DEFINE_PROP_UINT32("pclk-frq", CMSDKAPBTimer, pclk_frq, 0), DEFINE_PROP_END_OF_LIST(), }; @@ -266,7 +266,7 @@ static void cmsdk_apb_timer_class_init(ObjectClass *klass, void *data) static const TypeInfo cmsdk_apb_timer_info = { .name = TYPE_CMSDK_APB_TIMER, .parent = TYPE_SYS_BUS_DEVICE, - .instance_size = sizeof(CMSDKAPBTIMER), + .instance_size = sizeof(CMSDKAPBTimer), .instance_init = cmsdk_apb_timer_init, .class_init = cmsdk_apb_timer_class_init, };
The state struct for the CMSDK APB timer device doesn't follow our usual naming convention of camelcase -- "CMSDK" and "APB" are both acronyms, but "TIMER" is not so should not be all-uppercase. Globally rename the struct to "CMSDKAPBTimer" (bringing it into line with CMSDKAPBWatchdog and CMSDKAPBDualTimer; CMSDKAPBUART remains as-is because "UART" is an acronym). Commit created with: perl -p -i -e 's/CMSDKAPBTIMER/CMSDKAPBTimer/g' hw/timer/cmsdk-apb-timer.c include/hw/arm/armsse.h include/hw/timer/cmsdk-apb-timer.h Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- include/hw/arm/armsse.h | 6 +++--- include/hw/timer/cmsdk-apb-timer.h | 4 ++-- hw/timer/cmsdk-apb-timer.c | 28 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 19 deletions(-) -- 2.20.1