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

fdc: QOM'ify some more 

Introduce type constant and avoid DO_UPCAST(), container_of(),
and use DEVICE() to avoid accessing parent qdev directly.

Signed-off-by: Hu Tao <hutao@cn.fujitsu.com>
[AF: Renamed parent field and avoided repeated SYS_BUS_DEVICE() casts]
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Hu Tao 2013-07-01 18:18:24 +08:00 committed by Andreas Färber
parent 62d92e432f
commit dd3be74207
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/block/fdc.c
View File

@ -544,8 +544,14 @@ struct FDCtrl {
uint8_t timer1; uint8_t timer1;
}; };
#define TYPE_SYSBUS_FDC "sysbus-fdc"
#define SYSBUS_FDC(obj) OBJECT_CHECK(FDCtrlSysBus, (obj), TYPE_SYSBUS_FDC)
typedef struct FDCtrlSysBus { typedef struct FDCtrlSysBus {
SysBusDevice busdev; /*< private >*/
SysBusDevice parent_obj;
/*< public >*/
struct FDCtrl state; struct FDCtrl state;
} FDCtrlSysBus; } FDCtrlSysBus;
@ -773,7 +779,7 @@ static const VMStateDescription vmstate_fdc = {
static void fdctrl_external_reset_sysbus(DeviceState *d) static void fdctrl_external_reset_sysbus(DeviceState *d)
{ {
FDCtrlSysBus *sys = container_of(d, FDCtrlSysBus, busdev.qdev); FDCtrlSysBus *sys = SYSBUS_FDC(d);
FDCtrl *s = &sys->state; FDCtrl *s = &sys->state;
fdctrl_reset(s, 0); fdctrl_reset(s, 0);
@ -2047,10 +2053,11 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
{ {
FDCtrl *fdctrl; FDCtrl *fdctrl;
DeviceState *dev; DeviceState *dev;
SysBusDevice *sbd;
FDCtrlSysBus *sys; FDCtrlSysBus *sys;
dev = qdev_create(NULL, "sysbus-fdc"); dev = qdev_create(NULL, TYPE_SYSBUS_FDC);
sys = DO_UPCAST(FDCtrlSysBus, busdev.qdev, dev); sys = SYSBUS_FDC(dev);
fdctrl = &sys->state; fdctrl = &sys->state;
fdctrl->dma_chann = dma_chann; /* FIXME */ fdctrl->dma_chann = dma_chann; /* FIXME */
if (fds[0]) { if (fds[0]) {
@ -2060,8 +2067,9 @@ void fdctrl_init_sysbus(qemu_irq irq, int dma_chann,
qdev_prop_set_drive_nofail(dev, "driveB", fds[1]->bdrv); qdev_prop_set_drive_nofail(dev, "driveB", fds[1]->bdrv);
} }
qdev_init_nofail(dev); qdev_init_nofail(dev);
sysbus_connect_irq(&sys->busdev, 0, irq); sbd = SYS_BUS_DEVICE(dev);
sysbus_mmio_map(&sys->busdev, 0, mmio_base); sysbus_connect_irq(sbd, 0, irq);
sysbus_mmio_map(sbd, 0, mmio_base);
} }
void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base, void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
@ -2075,9 +2083,9 @@ void sun4m_fdctrl_init(qemu_irq irq, hwaddr io_base,
qdev_prop_set_drive_nofail(dev, "drive", fds[0]->bdrv); qdev_prop_set_drive_nofail(dev, "drive", fds[0]->bdrv);
} }
qdev_init_nofail(dev); qdev_init_nofail(dev);
sys = DO_UPCAST(FDCtrlSysBus, busdev.qdev, dev); sys = SYSBUS_FDC(dev);
sysbus_connect_irq(&sys->busdev, 0, irq); sysbus_connect_irq(SYS_BUS_DEVICE(sys), 0, irq);
sysbus_mmio_map(&sys->busdev, 0, io_base); sysbus_mmio_map(SYS_BUS_DEVICE(sys), 0, io_base);
*fdc_tc = qdev_get_gpio_in(dev, 0); *fdc_tc = qdev_get_gpio_in(dev, 0);
} }
@ -2145,7 +2153,7 @@ static void isabus_fdc_realize(DeviceState *dev, Error **errp)
static int sysbus_fdc_init1(SysBusDevice *dev) static int sysbus_fdc_init1(SysBusDevice *dev)
{ {
FDCtrlSysBus *sys = DO_UPCAST(FDCtrlSysBus, busdev, dev); FDCtrlSysBus *sys = SYSBUS_FDC(dev);
FDCtrl *fdctrl = &sys->state; FDCtrl *fdctrl = &sys->state;
int ret; int ret;
@ -2153,10 +2161,10 @@ static int sysbus_fdc_init1(SysBusDevice *dev)
"fdc", 0x08); "fdc", 0x08);
sysbus_init_mmio(dev, &fdctrl->iomem); sysbus_init_mmio(dev, &fdctrl->iomem);
sysbus_init_irq(dev, &fdctrl->irq); sysbus_init_irq(dev, &fdctrl->irq);
qdev_init_gpio_in(&dev->qdev, fdctrl_handle_tc, 1); qdev_init_gpio_in(DEVICE(dev), fdctrl_handle_tc, 1);
fdctrl->dma_chann = -1; fdctrl->dma_chann = -1;
qdev_set_legacy_instance_id(&dev->qdev, 0 /* io */, 2); /* FIXME */ qdev_set_legacy_instance_id(DEVICE(dev), 0 /* io */, 2); /* FIXME */
ret = fdctrl_init_common(fdctrl); ret = fdctrl_init_common(fdctrl);
return ret; return ret;
@ -2164,16 +2172,17 @@ static int sysbus_fdc_init1(SysBusDevice *dev)
static int sun4m_fdc_init1(SysBusDevice *dev) static int sun4m_fdc_init1(SysBusDevice *dev)
{ {
FDCtrl *fdctrl = &(FROM_SYSBUS(FDCtrlSysBus, dev)->state); FDCtrlSysBus *sys = SYSBUS_FDC(dev);
FDCtrl *fdctrl = &sys->state;
memory_region_init_io(&fdctrl->iomem, OBJECT(dev), &fdctrl_mem_strict_ops, memory_region_init_io(&fdctrl->iomem, OBJECT(dev), &fdctrl_mem_strict_ops,
fdctrl, "fdctrl", 0x08); fdctrl, "fdctrl", 0x08);
sysbus_init_mmio(dev, &fdctrl->iomem); sysbus_init_mmio(dev, &fdctrl->iomem);
sysbus_init_irq(dev, &fdctrl->irq); sysbus_init_irq(dev, &fdctrl->irq);
qdev_init_gpio_in(&dev->qdev, fdctrl_handle_tc, 1); qdev_init_gpio_in(DEVICE(dev), fdctrl_handle_tc, 1);
fdctrl->sun4m = 1; fdctrl->sun4m = 1;
qdev_set_legacy_instance_id(&dev->qdev, 0 /* io */, 2); /* FIXME */ qdev_set_legacy_instance_id(DEVICE(dev), 0 /* io */, 2); /* FIXME */
return fdctrl_init_common(fdctrl); return fdctrl_init_common(fdctrl);
} }
@ -2254,7 +2263,7 @@ static void sysbus_fdc_class_init(ObjectClass *klass, void *data)
} }
static const TypeInfo sysbus_fdc_info = { static const TypeInfo sysbus_fdc_info = {
.name = "sysbus-fdc", .name = TYPE_SYSBUS_FDC,
.parent = TYPE_SYS_BUS_DEVICE, .parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(FDCtrlSysBus), .instance_size = sizeof(FDCtrlSysBus),
.class_init = sysbus_fdc_class_init, .class_init = sysbus_fdc_class_init,