From patchwork Mon Apr 25 09:06:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 92709 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A53EAB6F5F for ; Mon, 25 Apr 2011 19:07:17 +1000 (EST) Received: from localhost ([::1]:48957 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEHlA-0002NI-OE for incoming@patchwork.ozlabs.org; Mon, 25 Apr 2011 05:07:12 -0400 Received: from eggs.gnu.org ([140.186.70.92]:56583) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEHkh-0002MC-Uf for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QEHkg-0001C8-Fe for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:43 -0400 Received: from mail-wy0-f173.google.com ([74.125.82.173]:35500) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QEHkg-0001Be-8Q for qemu-devel@nongnu.org; Mon, 25 Apr 2011 05:06:42 -0400 Received: by mail-wy0-f173.google.com with SMTP id 42so1790864wyb.4 for ; Mon, 25 Apr 2011 02:06:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:subject:date:message-id:x-mailer :in-reply-to:references; bh=9DtcAvSLN29OYMihO6NMaXjGwmr9RRBtkYJgGeO7NGw=; b=GGH+0G6nYotrJYp+x7Aduh/tUHEDdCirM+t/6CUoGKnuBlW1Tc26NPzHQwFW93fqMX dzeB3VJyi8UXwod10/8X3pGwAt9nwL9nxgkR/2CM55QTFIU5zqNngMII4Jx0dh81Xlvo Vs66KOpmnPGZjc/4LJQVBaYwUueb2rsCoKGro= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; b=liI0fuTeCX0SlRDYrcooe/Oxrm+uMvoj7MlM0Y70N/xMOtim5oD/CiLavb748fhhcY 6PksPxitUvQiHs94m1OGMx0u1HpdomeG60lF1XBzSMfxAhI6AaSfavLIFNuQzlJ5EHSU MuzHAFrTLGRsj6Ak8x3QtqlXmgtxgDC6KBb+A= Received: by 10.227.210.200 with SMTP id gl8mr3652229wbb.218.1303722402003; Mon, 25 Apr 2011 02:06:42 -0700 (PDT) Received: from doriath.ww600.siemens.net ([91.213.169.4]) by mx.google.com with ESMTPS id z13sm3157009wbd.46.2011.04.25.02.06.40 (version=SSLv3 cipher=OTHER); Mon, 25 Apr 2011 02:06:41 -0700 (PDT) From: Dmitry Eremin-Solenikov To: qemu-devel@nongnu.org Date: Mon, 25 Apr 2011 13:06:29 +0400 Message-Id: <1303722395-10791-3-git-send-email-dbaryshkov@gmail.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1303722395-10791-1-git-send-email-dbaryshkov@gmail.com> References: <1303722395-10791-1-git-send-email-dbaryshkov@gmail.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 74.125.82.173 Subject: [Qemu-devel] [RESEND][PATCH 3/9] microdrive: qdevify X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 9fbbf0e..7692603 100644 --- a/hw/ide/microdrive.c +++ b/hw/ide/microdrive.c @@ -38,8 +38,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; @@ -529,22 +529,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 577b59f..f00555b 100644 --- a/hw/tosa.c +++ b/hw/tosa.c @@ -59,7 +59,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); } }