From patchwork Tue Dec 14 00:34:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Graf X-Patchwork-Id: 75443 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 207BC1007D2 for ; Tue, 14 Dec 2010 11:36:23 +1100 (EST) Received: from localhost ([127.0.0.1]:60360 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PSIsN-0002ZQ-O6 for incoming@patchwork.ozlabs.org; Mon, 13 Dec 2010 19:36:19 -0500 Received: from [140.186.70.92] (port=50858 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PSIqv-0002VR-SL for qemu-devel@nongnu.org; Mon, 13 Dec 2010 19:34:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PSIqt-0001d7-AX for qemu-devel@nongnu.org; Mon, 13 Dec 2010 19:34:49 -0500 Received: from cantor.suse.de ([195.135.220.2]:33160 helo=mx1.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PSIqt-0001cM-0Z for qemu-devel@nongnu.org; Mon, 13 Dec 2010 19:34:47 -0500 Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.221.2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.suse.de (Postfix) with ESMTP id 4EE8C94033; Tue, 14 Dec 2010 01:34:45 +0100 (CET) From: Alexander Graf To: QEMU-devel Developers Date: Tue, 14 Dec 2010 01:34:33 +0100 Message-Id: <1292286883-20157-2-git-send-email-agraf@suse.de> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1292286883-20157-1-git-send-email-agraf@suse.de> References: <1292286883-20157-1-git-send-email-agraf@suse.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 Cc: Kevin Wolf , Joerg Roedel , Paul Brook , Blue Swirl , Gerd Hoffmann , Stefan Hajnoczi , tj@kernel.org, Roland Elek , Sebastian Herbszt Subject: [Qemu-devel] [PATCH 01/11] ide: split ide command interpretation off X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org The ATA command interpretation code can be used for PATA and SATA interfaces alike. So let's split it out into a separate function. Signed-off-by: Alexander Graf --- v6 -> v7: - use bus instead of opaque (stefanha) --- hw/ide/core.c | 20 ++++++++++++++------ hw/ide/internal.h | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 430350f..ac4ee71 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1791,9 +1791,6 @@ static void ide_clear_hob(IDEBus *bus) void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) { IDEBus *bus = opaque; - IDEState *s; - int n; - int lba48 = 0; #ifdef DEBUG_IDE printf("IDE: write addr=0x%x val=0x%02x\n", addr, val); @@ -1854,17 +1851,29 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) default: case 7: /* command */ + ide_exec_cmd(bus, val); + break; + } +} + + +void ide_exec_cmd(IDEBus *bus, uint32_t val) +{ + IDEState *s; + int n; + int lba48 = 0; + #if defined(DEBUG_IDE) printf("ide: CMD=%02x\n", val); #endif s = idebus_active_if(bus); /* ignore commands to non existant slave */ if (s != bus->ifs && !s->bs) - break; + return; /* Only DEVICE RESET is allowed while BSY or/and DRQ are set */ if ((s->status & (BUSY_STAT|DRQ_STAT)) && val != WIN_DEVICE_RESET) - break; + return; switch(val) { case WIN_IDENTIFY: @@ -2355,7 +2364,6 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) ide_set_irq(s->bus); break; } - } } uint32_t ide_ioport_read(void *opaque, uint32_t addr1) diff --git a/hw/ide/internal.h b/hw/ide/internal.h index 71af66f..029c76c 100644 --- a/hw/ide/internal.h +++ b/hw/ide/internal.h @@ -567,6 +567,8 @@ void ide_init2_with_non_qdev_drives(IDEBus *bus, DriveInfo *hd0, DriveInfo *hd1, qemu_irq irq); void ide_init_ioport(IDEBus *bus, int iobase, int iobase2); +void ide_exec_cmd(IDEBus *bus, uint32_t val); + /* hw/ide/qdev.c */ void ide_bus_new(IDEBus *idebus, DeviceState *dev, int bus_id); IDEDevice *ide_create_drive(IDEBus *bus, int unit, DriveInfo *drive);