Switch dscm1xxxx microdrive driver to use qdev infrastructure. --- hw/ide/microdrive.c | 49 +++++++++++++++++++++++++++++++++++++++---------- hw/pcmcia.h | 2 +- hw/spitz.c | 5 ++++- hw/tosa.c | 5 ++++- 4 files changed, 48 insertions(+), 13 deletions(-)
diff --git a/hw/ide/microdrive.c b/hw/ide/microdrive.c index 2ceeb87..167ec09 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -39,8 +39,8 @@ /* DSCM-1XXXX Microdrive hard disk with CF+ II / PCMCIA interface. */ typedef struct { - IDEBus bus; PCMCIACardState card; + IDEBus bus; uint32_t attr_base; uint32_t io_base; @@ -530,22 +530,51 @@ static int dscm1xxxx_detach(void *opaque) return 0; } -PCMCIACardState *dscm1xxxx_init(DriveInfo *bdrv) +PCMCIACardState *dscm1xxxx_init(PCMCIASocket *socket, DriveInfo *bdrv) +{ + DeviceState *dev; + MicroDriveState *md; + + dev = qdev_create(&socket->qbus, "dscm1xxxx"); + qdev_init_nofail(dev); + md = DO_UPCAST(MicroDriveState, card.dev, dev); + + ide_create_drive(&md->bus, 0, bdrv); + md->bus.ifs[0].drive_kind = IDE_CFATA; + md->bus.ifs[0].mdata_size = METADATA_SIZE; + md->bus.ifs[0].mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE); + + return &md->card; +} + +static int dscm1xxxx_initfn(PCMCIACardState *state) { - MicroDriveState *md = (MicroDriveState *) qemu_mallocz(sizeof(MicroDriveState)); + MicroDriveState *md; + md = DO_UPCAST(MicroDriveState, card, state); + md->card.state = md; md->card.attach = dscm1xxxx_attach; md->card.detach = dscm1xxxx_detach; md->card.cis = dscm1xxxx_cis; md->card.cis_len = sizeof(dscm1xxxx_cis); - ide_init2_with_non_qdev_drives(&md->bus, bdrv, NULL, - qemu_allocate_irqs(md_set_irq, md, 1)[0]); - md->bus.ifs[0].drive_kind = IDE_CFATA; - md->bus.ifs[0].mdata_size = METADATA_SIZE; - md->bus.ifs[0].mdata_storage = (uint8_t *) qemu_mallocz(METADATA_SIZE); + ide_bus_new(&md->bus, &state->dev, 0); + qdev_init_gpio_in(&state->dev, md_set_irq, 1); + ide_init2(&md->bus, qdev_get_gpio_in(&state->dev, 0)); - vmstate_register(NULL, -1, &vmstate_microdrive, md); + return 0; +} - return &md->card; +static PCMCIACardInfo dscm1xxxx_info = { + .qdev.name = "dscm1xxxx", + .qdev.desc = "QEMU CF MicroDrive emulation", + .init = dscm1xxxx_initfn, + .qdev.size = sizeof(MicroDriveState), + .qdev.vmsd = &vmstate_microdrive, +}; + +static void dscm1xxxx_register(void) +{ + pcmcia_card_register(&dscm1xxxx_info); } +device_init(dscm1xxxx_register); diff --git a/hw/pcmcia.h b/hw/pcmcia.h index 561d86c..c6b8100 100644 --- a/hw/pcmcia.h +++ b/hw/pcmcia.h @@ -64,4 +64,4 @@ void pcmcia_card_register(PCMCIACardInfo *info); DeviceState *pxa2xx_pcmcia_init(target_phys_addr_t base, uint8_t id); /* dscm1xxxx.c */ -PCMCIACardState *dscm1xxxx_init(DriveInfo *bdrv); +PCMCIACardState *dscm1xxxx_init(PCMCIASocket *socket, DriveInfo *bdrv); diff --git a/hw/spitz.c b/hw/spitz.c index ce19b5a..51cc08c 100644 --- a/hw/spitz.c +++ b/hw/spitz.c @@ -714,7 +714,10 @@ static void spitz_microdrive_attach(PXA2xxState *cpu, int slot) return; bs = dinfo->bdrv; if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) { - md = dscm1xxxx_init(dinfo); + md = dscm1xxxx_init( + DO_UPCAST(PCMCIASocket, qbus, + qdev_get_child_bus(cpu->pcmcia[slot], "pcmcia")), + dinfo); pxa2xx_pcmcia_attach(cpu->pcmcia[slot], md); } } diff --git a/hw/tosa.c b/hw/tosa.c index a988507..1435ea2 100644 --- a/hw/tosa.c +++ b/hw/tosa.c @@ -60,7 +60,10 @@ static void tosa_microdrive_attach(PXA2xxState *cpu) return; bs = dinfo->bdrv; if (bdrv_is_inserted(bs) && !bdrv_is_removable(bs)) { - md = dscm1xxxx_init(dinfo); + md = dscm1xxxx_init( + DO_UPCAST(PCMCIASocket, qbus, + qdev_get_child_bus(cpu->pcmcia[0], "pcmcia")), + dinfo); pxa2xx_pcmcia_attach(cpu->pcmcia[0], md); } } -- 1.7.4.1