david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pxa2xx_timer: QOM'ify pxa25x-timer and pxa27x-timer

Browse Source 
Introduce type constant for new abstract base type, use QOM casts and
let both non-abstract types inherit from the new base type.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-07-27 15:20:20 +02:00
parent 9c9610b825
commit feea4361b3
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
hw/timer/pxa2xx_timer.c
View File

@ -60,6 +60,10 @@ static int pxa2xx_timer4_freq[8] = {
[5 ... 7] = 0, [5 ... 7] = 0,
}; };
#define TYPE_PXA2XX_TIMER "pxa2xx-timer"
#define PXA2XX_TIMER(obj) \
OBJECT_CHECK(PXA2xxTimerInfo, (obj), TYPE_PXA2XX_TIMER)
typedef struct PXA2xxTimerInfo PXA2xxTimerInfo; typedef struct PXA2xxTimerInfo PXA2xxTimerInfo;
typedef struct { typedef struct {
@ -80,7 +84,8 @@ typedef struct {
} PXA2xxTimer4; } PXA2xxTimer4;
struct PXA2xxTimerInfo { struct PXA2xxTimerInfo {
SysBusDevice busdev; SysBusDevice parent_obj;
MemoryRegion iomem; MemoryRegion iomem;
uint32_t flags; uint32_t flags;
@ -429,10 +434,9 @@ static int pxa25x_timer_post_load(void *opaque, int version_id)
static int pxa2xx_timer_init(SysBusDevice *dev) static int pxa2xx_timer_init(SysBusDevice *dev)
{ {
PXA2xxTimerInfo *s = PXA2XX_TIMER(dev);
int i; int i;
PXA2xxTimerInfo *s;
s = FROM_SYSBUS(PXA2xxTimerInfo, dev);
s->irq_enabled = 0; s->irq_enabled = 0;
s->oldclock = 0; s->oldclock = 0;
s->clock = 0; s->clock = 0;
@ -534,17 +538,14 @@ static Property pxa25x_timer_dev_properties[] = {
static void pxa25x_timer_dev_class_init(ObjectClass *klass, void *data) static void pxa25x_timer_dev_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = pxa2xx_timer_init;
dc->desc = "PXA25x timer"; dc->desc = "PXA25x timer";
dc->vmsd = &vmstate_pxa2xx_timer_regs;
dc->props = pxa25x_timer_dev_properties; dc->props = pxa25x_timer_dev_properties;
} }
static const TypeInfo pxa25x_timer_dev_info = { static const TypeInfo pxa25x_timer_dev_info = {
.name = "pxa25x-timer", .name = "pxa25x-timer",
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_PXA2XX_TIMER,
.instance_size = sizeof(PXA2xxTimerInfo), .instance_size = sizeof(PXA2xxTimerInfo),
.class_init = pxa25x_timer_dev_class_init, .class_init = pxa25x_timer_dev_class_init,
}; };
@ -559,23 +560,38 @@ static Property pxa27x_timer_dev_properties[] = {
static void pxa27x_timer_dev_class_init(ObjectClass *klass, void *data) static void pxa27x_timer_dev_class_init(ObjectClass *klass, void *data)
{ {
DeviceClass *dc = DEVICE_CLASS(klass); DeviceClass *dc = DEVICE_CLASS(klass);
SysBusDeviceClass *k = SYS_BUS_DEVICE_CLASS(klass);
k->init = pxa2xx_timer_init;
dc->desc = "PXA27x timer"; dc->desc = "PXA27x timer";
dc->vmsd = &vmstate_pxa2xx_timer_regs;
dc->props = pxa27x_timer_dev_properties; dc->props = pxa27x_timer_dev_properties;
} }
static const TypeInfo pxa27x_timer_dev_info = { static const TypeInfo pxa27x_timer_dev_info = {
.name = "pxa27x-timer", .name = "pxa27x-timer",
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_PXA2XX_TIMER,
.instance_size = sizeof(PXA2xxTimerInfo), .instance_size = sizeof(PXA2xxTimerInfo),
.class_init = pxa27x_timer_dev_class_init, .class_init = pxa27x_timer_dev_class_init,
}; };
static void pxa2xx_timer_class_init(ObjectClass *oc, void *data)
{
DeviceClass *dc = DEVICE_CLASS(oc);
SysBusDeviceClass *sdc = SYS_BUS_DEVICE_CLASS(oc);
sdc->init = pxa2xx_timer_init;
dc->vmsd = &vmstate_pxa2xx_timer_regs;
}
static const TypeInfo pxa2xx_timer_type_info = {
.name = TYPE_PXA2XX_TIMER,
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(PXA2xxTimerInfo),
.abstract = true,
.class_init = pxa2xx_timer_class_init,
};
static void pxa2xx_timer_register_types(void) static void pxa2xx_timer_register_types(void)
{ {
type_register_static(&pxa2xx_timer_type_info);
type_register_static(&pxa25x_timer_dev_info); type_register_static(&pxa25x_timer_dev_info);
type_register_static(&pxa27x_timer_dev_info); type_register_static(&pxa27x_timer_dev_info);
} }