From patchwork Tue Jun 18 08:25:58 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 252133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8272D2C007B for ; Tue, 18 Jun 2013 18:27:29 +1000 (EST) Received: from localhost ([::1]:50857 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UorGB-0008TB-7a for incoming@patchwork.ozlabs.org; Tue, 18 Jun 2013 04:27:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UorFG-0007wX-AU for qemu-devel@nongnu.org; Tue, 18 Jun 2013 04:26:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UorFB-0005km-JX for qemu-devel@nongnu.org; Tue, 18 Jun 2013 04:26:30 -0400 Received: from mx1.redhat.com ([209.132.183.28]:6967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UorFB-0005kd-AV for qemu-devel@nongnu.org; Tue, 18 Jun 2013 04:26:25 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r5I8QOSj018921 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 18 Jun 2013 04:26:24 -0400 Received: from dhcp-200-207.str.redhat.com (ovpn-116-46.ams2.redhat.com [10.36.116.46]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r5I8QHIH020592; Tue, 18 Jun 2013 04:26:23 -0400 From: Kevin Wolf To: qemu-devel@nongnu.org Date: Tue, 18 Jun 2013 10:25:58 +0200 Message-Id: <1371543971-23241-5-git-send-email-kwolf@redhat.com> In-Reply-To: <1371543971-23241-1-git-send-email-kwolf@redhat.com> References: <1371543971-23241-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCH 04/17] ide: Convert cmd_nop commands to ide_cmd_table handler 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 cmd_nop handles all commands that don't really do anything in our implementation except setting status register flags. Signed-off-by: Kevin Wolf --- hw/ide/core.c | 48 +++++++++++++++++------------------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 2df078b..057662d 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1004,6 +1004,11 @@ void ide_ioport_write(void *opaque, uint32_t addr, uint32_t val) } } +static bool cmd_nop(IDEState *s, uint8_t cmd) +{ + return true; +} + static bool cmd_data_set_management(IDEState *s, uint8_t cmd) { switch (s->feature) { @@ -1060,7 +1065,7 @@ static const struct { [CFA_REQ_EXT_ERROR_CODE] = { NULL, CFA_OK }, [WIN_DSM] = { cmd_data_set_management, ALL_OK }, [WIN_DEVICE_RESET] = { NULL, CD_OK }, - [WIN_RECAL] = { NULL, HD_CFA_OK }, + [WIN_RECAL] = { cmd_nop, HD_CFA_OK | SET_DSC}, [WIN_READ] = { NULL, ALL_OK }, [WIN_READ_ONCE] = { NULL, ALL_OK }, [WIN_READ_EXT] = { NULL, HD_CFA_OK }, @@ -1080,13 +1085,13 @@ static const struct { [WIN_SEEK] = { NULL, HD_CFA_OK }, [CFA_TRANSLATE_SECTOR] = { NULL, CFA_OK }, [WIN_DIAGNOSE] = { NULL, ALL_OK }, - [WIN_SPECIFY] = { NULL, HD_CFA_OK }, - [WIN_STANDBYNOW2] = { NULL, ALL_OK }, - [WIN_IDLEIMMEDIATE2] = { NULL, ALL_OK }, - [WIN_STANDBY2] = { NULL, ALL_OK }, - [WIN_SETIDLE2] = { NULL, ALL_OK }, + [WIN_SPECIFY] = { cmd_nop, HD_CFA_OK | SET_DSC }, + [WIN_STANDBYNOW2] = { cmd_nop, ALL_OK }, + [WIN_IDLEIMMEDIATE2] = { cmd_nop, ALL_OK }, + [WIN_STANDBY2] = { cmd_nop, ALL_OK }, + [WIN_SETIDLE2] = { cmd_nop, ALL_OK }, [WIN_CHECKPOWERMODE2] = { NULL, ALL_OK }, - [WIN_SLEEPNOW2] = { NULL, ALL_OK }, + [WIN_SLEEPNOW2] = { cmd_nop, ALL_OK }, [WIN_PACKETCMD] = { NULL, CD_OK }, [WIN_PIDENTIFY] = { NULL, CD_OK }, [WIN_SMART] = { NULL, HD_CFA_OK }, @@ -1100,12 +1105,12 @@ static const struct { [WIN_WRITEDMA] = { NULL, HD_CFA_OK }, [WIN_WRITEDMA_ONCE] = { NULL, HD_CFA_OK }, [CFA_WRITE_MULTI_WO_ERASE] = { NULL, CFA_OK }, - [WIN_STANDBYNOW1] = { NULL, ALL_OK }, - [WIN_IDLEIMMEDIATE] = { NULL, ALL_OK }, - [WIN_STANDBY] = { NULL, ALL_OK }, - [WIN_SETIDLE1] = { NULL, ALL_OK }, + [WIN_STANDBYNOW1] = { cmd_nop, ALL_OK }, + [WIN_IDLEIMMEDIATE] = { cmd_nop, ALL_OK }, + [WIN_STANDBY] = { cmd_nop, ALL_OK }, + [WIN_SETIDLE1] = { cmd_nop, ALL_OK }, [WIN_CHECKPOWERMODE1] = { NULL, ALL_OK }, - [WIN_SLEEPNOW1] = { NULL, ALL_OK }, + [WIN_SLEEPNOW1] = { cmd_nop, ALL_OK }, [WIN_FLUSH_CACHE] = { NULL, ALL_OK }, [WIN_FLUSH_CACHE_EXT] = { NULL, HD_CFA_OK }, [WIN_IDENTIFY] = { cmd_identify, ALL_OK }, @@ -1166,12 +1171,6 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) } switch(val) { - case WIN_SPECIFY: - case WIN_RECAL: - s->error = 0; - s->status = READY_STAT | SEEK_STAT; - ide_set_irq(s->bus); - break; case WIN_SETMULT: if (s->drive_kind == IDE_CFATA && s->nsector == 0) { /* Disable Read and Write Multiple */ @@ -1391,19 +1390,6 @@ void ide_exec_cmd(IDEBus *bus, uint32_t val) case WIN_FLUSH_CACHE_EXT: ide_flush_cache(s); break; - case WIN_STANDBY: - case WIN_STANDBY2: - case WIN_STANDBYNOW1: - case WIN_STANDBYNOW2: - case WIN_IDLEIMMEDIATE: - case WIN_IDLEIMMEDIATE2: - case WIN_SETIDLE1: - case WIN_SETIDLE2: - case WIN_SLEEPNOW1: - case WIN_SLEEPNOW2: - s->status = READY_STAT; - ide_set_irq(s->bus); - break; case WIN_SEEK: /* XXX: Check that seek is within bounds */ s->status = READY_STAT | SEEK_STAT;