[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 29/34] i8254: QOM'ify
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC 29/34] i8254: QOM'ify |
Date: |
Mon, 26 Nov 2012 01:12:41 +0100 |
Introduce type constant and avoid DO_UPCAST().
Prepares for PIT realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/i8254.c | 6 +++---
hw/i8254.h | 4 +++-
2 Dateien geändert, 6 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-)
diff --git a/hw/i8254.c b/hw/i8254.c
index bea5f92..2a01217 100644
--- a/hw/i8254.c
+++ b/hw/i8254.c
@@ -265,7 +265,7 @@ static void pit_irq_timer(void *opaque)
static void pit_reset(DeviceState *dev)
{
- PITCommonState *pit = DO_UPCAST(PITCommonState, dev.qdev, dev);
+ PITCommonState *pit = PIT_COMMON(dev);
PITChannelState *s;
pit_reset_common(pit);
@@ -347,8 +347,8 @@ static void pit_class_initfn(ObjectClass *klass, void *data)
dc->props = pit_properties;
}
-static TypeInfo pit_info = {
- .name = "isa-pit",
+static const TypeInfo pit_info = {
+ .name = TYPE_I8254,
.parent = TYPE_PIT_COMMON,
.instance_size = sizeof(PITCommonState),
.class_init = pit_class_initfn,
diff --git a/hw/i8254.h b/hw/i8254.h
index ba6b598..2566bac 100644
--- a/hw/i8254.h
+++ b/hw/i8254.h
@@ -37,12 +37,14 @@ typedef struct PITChannelInfo {
int out;
} PITChannelInfo;
+#define TYPE_I8254 "isa-pit"
+
static inline ISADevice *pit_init(ISABus *bus, int base, int isa_irq,
qemu_irq alt_irq)
{
ISADevice *dev;
- dev = isa_create(bus, "isa-pit");
+ dev = isa_create(bus, TYPE_I8254);
qdev_prop_set_uint32(&dev->qdev, "iobase", base);
qdev_init_nofail(&dev->qdev);
qdev_connect_gpio_out(&dev->qdev, 0,
--
1.7.10.4
- [Qemu-devel] [RFC 07/34] cirrus_vga: QOM'ify ISA Cirrus VGA, (continued)
- [Qemu-devel] [RFC 07/34] cirrus_vga: QOM'ify ISA Cirrus VGA, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 18/34] pc: QOM'ify port 92, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 23/34] sga: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 17/34] parallel: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 21/34] sb16: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 22/34] serial: QOM'ify ISA serial, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 10/34] i82374: QOM'ify, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 08/34] debugcon: QOM'ify ISA debug console, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 14/34] m48t59: QOM'ify ISA M48T59 NVRAM, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 02/34] qbus: QOM'ify qbus_realize(), Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 29/34] i8254: QOM'ify,
Andreas Färber <=
- [Qemu-devel] [RFC 09/34] fdc: QOM'ify ISA floppy controller, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 13/34] ide: QOM'ify ISA IDE, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 24/34] vga-isa: QOM'ify ISA VGA, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 32/34] i8259: QOM'ify some more, Andreas Färber, 2012/11/25
- [Qemu-devel] [PATCH 01/34] qdev: Eliminate qdev_free() in favor of QOM, Andreas Färber, 2012/11/25
- [Qemu-devel] [PATCH 11/34] i8259: Fix PIC_COMMON() macro, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 03/34] qdev: Fold state enum into bool realized, Andreas Färber, 2012/11/25