ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi/esp: QOM'ify some more 

Introduce type constant and avoid DO_UPCAST().

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
[AF: Renamed parent field]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Hu Tao 2013-07-01 18:18:34 +08:00 committed by Andreas Färber
parent 2ce92a1102
commit a71c7ec529
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
hw/scsi/esp.c
View File

@ -578,8 +578,14 @@ const VMStateDescription vmstate_esp = {
} }
}; };
#define TYPE_ESP "esp"
#define ESP(obj) OBJECT_CHECK(SysBusESPState, (obj), TYPE_ESP)
typedef struct { typedef struct {
SysBusDevice busdev; /*< private >*/
SysBusDevice parent_obj;
/*< public >*/
MemoryRegion iomem; MemoryRegion iomem;
uint32_t it_shift; uint32_t it_shift;
ESPState esp; ESPState esp;
@ -623,8 +629,8 @@ void esp_init(hwaddr espaddr, int it_shift,
SysBusESPState *sysbus; SysBusESPState *sysbus;
ESPState *esp; ESPState *esp;
dev = qdev_create(NULL, "esp"); dev = qdev_create(NULL, TYPE_ESP);
sysbus = DO_UPCAST(SysBusESPState, busdev.qdev, dev); sysbus = ESP(dev);
esp = &sysbus->esp; esp = &sysbus->esp;
esp->dma_memory_read = dma_memory_read; esp->dma_memory_read = dma_memory_read;
esp->dma_memory_write = dma_memory_write; esp->dma_memory_write = dma_memory_write;
@ -652,8 +658,7 @@ static const struct SCSIBusInfo esp_scsi_info = {
static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)
{ {
DeviceState *d = opaque; SysBusESPState *sysbus = ESP(opaque);
SysBusESPState *sysbus = container_of(d, SysBusESPState, busdev.qdev);
ESPState *s = &sysbus->esp; ESPState *s = &sysbus->esp;
switch (irq) { switch (irq) {
@ -668,7 +673,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq, int level)
static int sysbus_esp_init(SysBusDevice *dev) static int sysbus_esp_init(SysBusDevice *dev)
{ {
SysBusESPState *sysbus = FROM_SYSBUS(SysBusESPState, dev); SysBusESPState *sysbus = ESP(dev);
ESPState *s = &sysbus->esp; ESPState *s = &sysbus->esp;
sysbus_init_irq(dev, &s->irq); sysbus_init_irq(dev, &s->irq);
@ -687,7 +692,7 @@ static int sysbus_esp_init(SysBusDevice *dev)
static void sysbus_esp_hard_reset(DeviceState *dev) static void sysbus_esp_hard_reset(DeviceState *dev)
{ {
SysBusESPState *sysbus = DO_UPCAST(SysBusESPState, busdev.qdev, dev); SysBusESPState *sysbus = ESP(dev);
esp_hard_reset(&sysbus->esp); esp_hard_reset(&sysbus->esp);
} }
@ -713,7 +718,7 @@ static void sysbus_esp_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo sysbus_esp_info = { static const TypeInfo sysbus_esp_info = {
.name = "esp", .name = TYPE_ESP,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(SysBusESPState), .instance_size = sizeof(SysBusESPState),
.class_init = sysbus_esp_class_init, .class_init = sysbus_esp_class_init,