haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

serial: QOM'ify ISA serial

Browse source 
Introduce type constant and cast macro to obsolete DO_UPCAST().

Prepares for ISA realizefn.

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Message-id: 1367093935-29091-16-git-send-email-afaerber@suse.de
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Andreas Färber 2013-04-27 22:18:50 +02:00 committed by Anthony Liguori
parent 399f05a6e1
commit eeceb0849d
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
hw/char/serial-isa.c
View file

@ -26,8 +26,11 @@
#include "hw/char/serial.h" #include "hw/char/serial.h"
#include "hw/isa/isa.h" #include "hw/isa/isa.h"
#define ISA_SERIAL(obj) OBJECT_CHECK(ISASerialState, (obj), TYPE_ISA_SERIAL)
typedef struct ISASerialState { typedef struct ISASerialState {
ISADevice dev; ISADevice parent_obj;
uint32_t index; uint32_t index;
uint32_t iobase; uint32_t iobase;
uint32_t isairq; uint32_t isairq;
@ -44,7 +47,7 @@ static const int isa_serial_irq[MAX_SERIAL_PORTS] = {
static int serial_isa_initfn(ISADevice *dev) static int serial_isa_initfn(ISADevice *dev)
{ {
static int index; static int index;
ISASerialState *isa = DO_UPCAST(ISASerialState, dev, dev); ISASerialState *isa = ISA_SERIAL(dev);
SerialState *s = &isa->state; SerialState *s = &isa->state;
if (isa->index == -1) { if (isa->index == -1) {
@ -100,7 +103,7 @@ static void serial_isa_class_initfn(ObjectClass *klass, void *data)
} }
static const TypeInfo serial_isa_info = { static const TypeInfo serial_isa_info = {
.name = "isa-serial", .name = TYPE_ISA_SERIAL,
.parent = TYPE_ISA_DEVICE, .parent = TYPE_ISA_DEVICE,
.instance_size = sizeof(ISASerialState), .instance_size = sizeof(ISASerialState),
.class_init = serial_isa_class_initfn, .class_init = serial_isa_class_initfn,
@ -117,7 +120,7 @@ bool serial_isa_init(ISABus *bus, int index, CharDriverState *chr)
{ {
ISADevice *dev; ISADevice *dev;
dev = isa_try_create(bus, "isa-serial"); dev = isa_try_create(bus, TYPE_ISA_SERIAL);
if (!dev) { if (!dev) {
return false; return false;
} }

1
include/hw/char/serial.h
View file

@ -96,6 +96,7 @@ SerialState *serial_mm_init(MemoryRegion *address_space,
CharDriverState *chr, enum device_endian end); CharDriverState *chr, enum device_endian end);
/* serial-isa.c */ /* serial-isa.c */
#define TYPE_ISA_SERIAL "isa-serial"
bool serial_isa_init(ISABus *bus, int index, CharDriverState *chr); bool serial_isa_init(ISABus *bus, int index, CharDriverState *chr);
#endif #endif