From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:48245) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd575-0006co-Jx for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:12:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rd56z-0006TJ-P1 for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:12:35 -0500 Received: from smtp191.dfw.emailsrvr.com ([67.192.241.191]:38257) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rd56z-0006T9-Dh for qemu-devel@nongnu.org; Tue, 20 Dec 2011 14:12:29 -0500 Message-ID: <4EF0DE1F.3000506@calxeda.com> Date: Tue, 20 Dec 2011 13:12:31 -0600 From: Mark Langsdorf MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Subject: [Qemu-devel] [PATCH 5/9] ahci: convert ahci_reset to use AHCIState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kwolf@redhat.com From: Rob Herring Use AHCIState instead of AHCIPCIState so the function can be used for non-PCI based AHCI controllers. Signed-off-by: Rob Herring Signed-off-by: Mark Langsdorf --- hw/ide/ahci.c | 14 +++++++------- hw/ide/ich.c | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c index 0af201d..135d0ee 100644 --- a/hw/ide/ahci.c +++ b/hw/ide/ahci.c @@ -336,7 +336,7 @@ static void ahci_mem_write(void *opaque, target_phys_addr_t addr, case HOST_CTL: /* R/W */ if (val & HOST_CTL_RESET) { DPRINTF(-1, "HBA Reset\n"); - ahci_reset(container_of(s, AHCIPCIState, ahci)); + ahci_reset(s); } else { s->control_regs.ghc = (val & 0x3) | HOST_CTL_AHCI_EN; ahci_check_irq(s); @@ -1199,18 +1199,18 @@ void ahci_uninit(AHCIState *s) void ahci_reset(void *opaque) { - struct AHCIPCIState *d = opaque; + struct AHCIState *s = opaque; AHCIPortRegs *pr; int i; - d->ahci.control_regs.irqstatus = 0; - d->ahci.control_regs.ghc = 0; + s->control_regs.irqstatus = 0; + s->control_regs.ghc = 0; - for (i = 0; i < d->ahci.ports; i++) { - pr = &d->ahci.dev[i].port_regs; + for (i = 0; i < s->ports; i++) { + pr = &s->dev[i].port_regs; pr->irq_stat = 0; pr->irq_mask = 0; pr->scr_ctl = 0; - ahci_reset_port(&d->ahci, i); + ahci_reset_port(s, i); } } diff --git a/hw/ide/ich.c b/hw/ide/ich.c index 3f7510f..44363ec 100644 --- a/hw/ide/ich.c +++ b/hw/ide/ich.c @@ -102,7 +102,7 @@ static int pci_ich9_ahci_init(PCIDevice *dev) /* XXX Software should program this register */ d->card.config[0x90] = 1 << 6; /* Address Map Register - AHCI mode */ - qemu_register_reset(ahci_reset, d); + qemu_register_reset(ahci_reset, &d->ahci); msi_init(dev, 0x50, 1, true, false); d->ahci.irq = d->card.irq[0]; @@ -133,7 +133,7 @@ static int pci_ich9_uninit(PCIDevice *dev) d = DO_UPCAST(struct AHCIPCIState, card, dev); msi_uninit(dev); - qemu_unregister_reset(ahci_reset, d); + qemu_unregister_reset(ahci_reset, &d->ahci); ahci_uninit(&d->ahci); return 0; -- 1.7.5.4