[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 14/34] m48t59: QOM'ify ISA M48T59 NVRAM
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [RFC 14/34] m48t59: QOM'ify ISA M48T59 NVRAM |
Date: |
Mon, 26 Nov 2012 01:12:26 +0100 |
Introduce type constant and cast macro to obsolete DO_UPCAST() and
container_of().
Prepares for ISA realizefn.
Signed-off-by: Andreas Färber <address@hidden>
---
hw/m48t59.c | 37 ++++++++++++++++++++++---------------
1 Datei geändert, 22 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)
diff --git a/hw/m48t59.c b/hw/m48t59.c
index 7da7e7c..6d2f9cf 100644
--- a/hw/m48t59.c
+++ b/hw/m48t59.c
@@ -72,8 +72,13 @@ struct M48t59State {
uint8_t lock;
};
+#define TYPE_ISA_M48T59 "m48t59_isa"
+#define M48T59_ISA(obj) \
+ OBJECT_CHECK(M48t59ISAState, (obj), TYPE_ISA_M48T59)
+
typedef struct M48t59ISAState {
- ISADevice busdev;
+ ISADevice parent_obj;
+
M48t59State state;
MemoryRegion io;
} M48t59ISAState;
@@ -608,7 +613,7 @@ static void m48t59_reset_common(M48t59State *NVRAM)
static void m48t59_reset_isa(DeviceState *d)
{
- M48t59ISAState *isa = container_of(d, M48t59ISAState, busdev.qdev);
+ M48t59ISAState *isa = M48T59_ISA(d);
M48t59State *NVRAM = &isa->state;
m48t59_reset_common(NVRAM);
@@ -665,20 +670,22 @@ M48t59State *m48t59_init_isa(ISABus *bus, uint32_t
io_base, uint16_t size,
int model)
{
M48t59ISAState *d;
- ISADevice *dev;
+ ISADevice *isadev;
+ DeviceState *dev;
M48t59State *s;
- dev = isa_create(bus, "m48t59_isa");
- qdev_prop_set_uint32(&dev->qdev, "model", model);
- qdev_prop_set_uint32(&dev->qdev, "size", size);
- qdev_prop_set_uint32(&dev->qdev, "io_base", io_base);
- qdev_init_nofail(&dev->qdev);
- d = DO_UPCAST(M48t59ISAState, busdev, dev);
+ isadev = isa_create(bus, TYPE_ISA_M48T59);
+ dev = DEVICE(isadev);
+ qdev_prop_set_uint32(dev, "model", model);
+ qdev_prop_set_uint32(dev, "size", size);
+ qdev_prop_set_uint32(dev, "io_base", io_base);
+ qdev_init_nofail(dev);
+ d = M48T59_ISA(isadev);
s = &d->state;
memory_region_init_io(&d->io, &m48t59_io_ops, s, "m48t59", 4);
if (io_base != 0) {
- isa_register_ioport(dev, &d->io, io_base);
+ isa_register_ioport(isadev, &d->io, io_base);
}
return s;
@@ -698,7 +705,7 @@ static void m48t59_init_common(M48t59State *s)
static int m48t59_init_isa1(ISADevice *dev)
{
- M48t59ISAState *d = DO_UPCAST(M48t59ISAState, busdev, dev);
+ M48t59ISAState *d = M48T59_ISA(dev);
M48t59State *s = &d->state;
isa_init_irq(dev, &s->IRQ, 8);
@@ -728,7 +735,7 @@ static Property m48t59_isa_properties[] = {
DEFINE_PROP_END_OF_LIST(),
};
-static void m48t59_init_class_isa1(ObjectClass *klass, void *data)
+static void m48t59_isa_class_init(ObjectClass *klass, void *data)
{
DeviceClass *dc = DEVICE_CLASS(klass);
ISADeviceClass *ic = ISA_DEVICE_CLASS(klass);
@@ -738,11 +745,11 @@ static void m48t59_init_class_isa1(ObjectClass *klass,
void *data)
dc->props = m48t59_isa_properties;
}
-static TypeInfo m48t59_isa_info = {
- .name = "m48t59_isa",
+static const TypeInfo m48t59_isa_info = {
+ .name = TYPE_ISA_M48T59,
.parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(M48t59ISAState),
- .class_init = m48t59_init_class_isa1,
+ .class_init = m48t59_isa_class_init,
};
static Property m48t59_properties[] = {
--
1.7.10.4
- [Qemu-devel] [RFC 12/34] i8259: QOM cleanups, (continued)
- [Qemu-devel] [RFC 12/34] i8259: QOM cleanups, Andreas Färber, 2012/11/25
- [Qemu-devel] [RFC 06/34] applesmc: QOM'ify, Andreas Färber, 2012/11/25
- [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 <=
- [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, 2012/11/25
- [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