motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-27 12:02:04 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

i8259: QOM'ify some more

Browse source 
Introduce type constant.

Prepares for PIC realizefn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2012-11-25 22:35:49 +01:00
parent a15d09127b
commit d1eebf4e3d
1 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

23
hw/intc/i8259.c
View file

@ -41,6 +41,8 @@
//#define DEBUG_IRQ_LATENCY //#define DEBUG_IRQ_LATENCY
//#define DEBUG_IRQ_COUNT //#define DEBUG_IRQ_COUNT
#define TYPE_I8259 "isa-i8259"
#if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT) #if defined(DEBUG_PIC) || defined(DEBUG_IRQ_COUNT)
static int irq_level[16]; static int irq_level[16];
#endif #endif
@ -448,25 +450,28 @@ void irq_info(Monitor *mon, const QDict *qdict)
qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq) qemu_irq *i8259_init(ISABus *bus, qemu_irq parent_irq)
{ {
qemu_irq *irq_set; qemu_irq *irq_set;
ISADevice *dev; DeviceState *dev;
ISADevice *isadev;
int i; int i;
irq_set = g_malloc(ISA_NUM_IRQS * sizeof(qemu_irq)); irq_set = g_malloc(ISA_NUM_IRQS * sizeof(qemu_irq));
dev = i8259_init_chip("isa-i8259", bus, true); isadev = i8259_init_chip(TYPE_I8259, bus, true);
dev = DEVICE(isadev);
qdev_connect_gpio_out(&dev->qdev, 0, parent_irq); qdev_connect_gpio_out(dev, 0, parent_irq);
for (i = 0 ; i < 8; i++) { for (i = 0 ; i < 8; i++) {
irq_set[i] = qdev_get_gpio_in(&dev->qdev, i); irq_set[i] = qdev_get_gpio_in(dev, i);
} }
isa_pic = &dev->qdev; isa_pic = dev;
dev = i8259_init_chip("isa-i8259", bus, false); isadev = i8259_init_chip(TYPE_I8259, bus, false);
dev = DEVICE(isadev);
qdev_connect_gpio_out(&dev->qdev, 0, irq_set[2]); qdev_connect_gpio_out(dev, 0, irq_set[2]);
for (i = 0 ; i < 8; i++) { for (i = 0 ; i < 8; i++) {
irq_set[i + 8] = qdev_get_gpio_in(&dev->qdev, i); irq_set[i + 8] = qdev_get_gpio_in(dev, i);
} }
slave_pic = PIC_COMMON(dev); slave_pic = PIC_COMMON(dev);
@ -484,7 +489,7 @@ static void i8259_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo i8259_info = { static const TypeInfo i8259_info = {
.name = "isa-i8259", .name = TYPE_I8259,
.instance_size = sizeof(PICCommonState), .instance_size = sizeof(PICCommonState),
.parent = TYPE_PIC_COMMON, .parent = TYPE_PIC_COMMON,
.class_init = i8259_class_init, .class_init = i8259_class_init,