From patchwork Mon Nov 30 19:36:54 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thadeu Lima de Souza Cascardo X-Patchwork-Id: 39861 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 D4B08100949 for ; Tue, 1 Dec 2009 09:26:12 +1100 (EST) Received: from localhost ([127.0.0.1]:50878 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFEh7-0002oi-Mt for incoming@patchwork.ozlabs.org; Mon, 30 Nov 2009 17:26:09 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFC3b-0006Hu-90 for qemu-devel@nongnu.org; Mon, 30 Nov 2009 14:37:11 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFC3W-0006Bt-8N for qemu-devel@nongnu.org; Mon, 30 Nov 2009 14:37:10 -0500 Received: from [199.232.76.173] (port=42965 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFC3W-0006Bf-1t for qemu-devel@nongnu.org; Mon, 30 Nov 2009 14:37:06 -0500 Received: from liberdade.minaslivre.org ([72.232.254.139]:35122) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFC3V-0002iL-Iz for qemu-devel@nongnu.org; Mon, 30 Nov 2009 14:37:05 -0500 Received: from vespa.holoscopio.com (unknown [201.80.130.211]) by liberdade.minaslivre.org (Postfix) with ESMTPSA id 4D8552601B; Mon, 30 Nov 2009 17:34:44 -0200 (BRST) Received: by vespa.holoscopio.com (Postfix, from userid 1000) id 811DAC5E0; Mon, 30 Nov 2009 17:36:56 -0200 (BRST) From: Thadeu Lima de Souza Cascardo To: qemu-devel@nongnu.org Date: Mon, 30 Nov 2009 17:36:54 -0200 Message-Id: <1259609814-16224-1-git-send-email-cascardo@holoscopio.com> X-Mailer: git-send-email 1.6.3.3 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) X-Mailman-Approved-At: Mon, 30 Nov 2009 17:25:14 -0500 Cc: Thadeu Lima de Souza Cascardo Subject: [Qemu-devel] [PATCH 1/2] ide: Use some already defined page macros instead of constants 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 Some PAGE constants were used instead of the macros we already have defined in internal.h. Signed-off-by: Thadeu Lima de Souza Cascardo --- hw/ide/core.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 7b1ff8f..b551adf 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1236,7 +1236,7 @@ static void ide_atapi_cmd(IDEState *s) switch(action) { case 0: /* current values */ switch(code) { - case 0x01: /* error recovery */ + case GPMODE_R_W_ERROR_PAGE: /* error recovery */ cpu_to_ube16(&buf[0], 16 + 6); buf[2] = 0x70; buf[3] = 0; @@ -1255,7 +1255,7 @@ static void ide_atapi_cmd(IDEState *s) buf[15] = 0x00; ide_atapi_cmd_reply(s, 16, max_len); break; - case 0x2a: + case GPMODE_CAPABILITIES_PAGE: cpu_to_ube16(&buf[0], 28 + 6); buf[2] = 0x70; buf[3] = 0;