openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

timer/arm_mptimer: QOM cast cleanup 

Introduce type constant and cast macro and rename
ARMMPTimerState::busdev to enforce its use.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
This commit is contained in:
Andreas Färber 2013-06-30 19:37:10 +02:00 committed by Andreas Färber
parent 5126fec766
commit 68653fd671
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
hw/timer/arm_mptimer.c
View File

@ -41,8 +41,15 @@ typedef struct {
MemoryRegion iomem; MemoryRegion iomem;
} TimerBlock; } TimerBlock;
#define TYPE_ARM_MPTIMER "arm_mptimer"
#define ARM_MPTIMER(obj) \
OBJECT_CHECK(ARMMPTimerState, (obj), TYPE_ARM_MPTIMER)
typedef struct { typedef struct {
SysBusDevice busdev; /*< private >*/
SysBusDevice parent_obj;
/*< public >*/
uint32_t num_cpu; uint32_t num_cpu;
TimerBlock timerblock[MAX_CPUS]; TimerBlock timerblock[MAX_CPUS];
MemoryRegion iomem; MemoryRegion iomem;
@ -210,9 +217,9 @@ static void timerblock_reset(TimerBlock *tb)
static void arm_mptimer_reset(DeviceState *dev) static void arm_mptimer_reset(DeviceState *dev)
{ {
ARMMPTimerState *s = ARMMPTimerState *s = ARM_MPTIMER(dev);
FROM_SYSBUS(ARMMPTimerState, SYS_BUS_DEVICE(dev));
int i; int i;
for (i = 0; i < ARRAY_SIZE(s->timerblock); i++) { for (i = 0; i < ARRAY_SIZE(s->timerblock); i++) {
timerblock_reset(&s->timerblock[i]); timerblock_reset(&s->timerblock[i]);
} }
@ -220,8 +227,9 @@ static void arm_mptimer_reset(DeviceState *dev)
static int arm_mptimer_init(SysBusDevice *dev) static int arm_mptimer_init(SysBusDevice *dev)
{ {
ARMMPTimerState *s = FROM_SYSBUS(ARMMPTimerState, dev); ARMMPTimerState *s = ARM_MPTIMER(dev);
int i; int i;
if (s->num_cpu < 1 || s->num_cpu > MAX_CPUS) { if (s->num_cpu < 1 || s->num_cpu > MAX_CPUS) {
hw_error("%s: num-cpu must be between 1 and %d\n", __func__, MAX_CPUS); hw_error("%s: num-cpu must be between 1 and %d\n", __func__, MAX_CPUS);
} }
@ -294,7 +302,7 @@ static void arm_mptimer_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo arm_mptimer_info = { static const TypeInfo arm_mptimer_info = {
.name = "arm_mptimer", .name = TYPE_ARM_MPTIMER,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(ARMMPTimerState), .instance_size = sizeof(ARMMPTimerState),
.class_init = arm_mptimer_class_init, .class_init = arm_mptimer_class_init,