SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

hw/intc: QOM'ify lm32_pic.c

Browse Source 
Drop the old SysBus init function and use instance_init

Signed-off-by: xiaoqiang zhao <zxq_yx_007@163.com>
Acked-by: Michael Walle <michael@walle.cc>
Tested-by: Michael Walle <michael@walle.cc>
Signed-off-by: Michael Walle <michael@walle.cc>
This commit is contained in:
xiaoqiang zhao 2016-03-30 18:09:27 +08:00 committed by Michael Walle
parent 165b244b98
commit 5e502d31db
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/intc/lm32_pic.c
View File

@ -152,17 +152,16 @@ static void pic_reset(DeviceState *d)
} }
} }
static int lm32_pic_init(SysBusDevice *sbd) static void lm32_pic_init(Object *obj)
{ {
DeviceState *dev = DEVICE(sbd); DeviceState *dev = DEVICE(obj);
LM32PicState *s = LM32_PIC(dev); LM32PicState *s = LM32_PIC(obj);
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
qdev_init_gpio_in(dev, irq_handler, 32); qdev_init_gpio_in(dev, irq_handler, 32);
sysbus_init_irq(sbd, &s->parent_irq); sysbus_init_irq(sbd, &s->parent_irq);
pic = s; pic = s;
return 0;
} }
static const VMStateDescription vmstate_lm32_pic = { static const VMStateDescription vmstate_lm32_pic = {
@ -181,9 +180,7 @@ static const VMStateDescription vmstate_lm32_pic = {
static void lm32_pic_class_init(ObjectClass *klass, void *data) static void lm32_pic_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 = lm32_pic_init;
dc->reset = pic_reset; dc->reset = pic_reset;
dc->vmsd = &vmstate_lm32_pic; dc->vmsd = &vmstate_lm32_pic;
} }
@ -192,6 +189,7 @@ static const TypeInfo lm32_pic_info = {
.name = TYPE_LM32_PIC, .name = TYPE_LM32_PIC,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(LM32PicState), .instance_size = sizeof(LM32PicState),
.instance_init = lm32_pic_init,
.class_init = lm32_pic_class_init, .class_init = lm32_pic_class_init,
}; };