From patchwork Tue Apr 12 16:06:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 90824 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 79248B6F1C for ; Wed, 13 Apr 2011 02:07:52 +1000 (EST) Received: from localhost ([::1]:58556 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9g85-0005ex-Jv for incoming@patchwork.ozlabs.org; Tue, 12 Apr 2011 12:07:49 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34188) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9g6w-0004C7-2w for qemu-devel@nongnu.org; Tue, 12 Apr 2011 12:06:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9g6r-0003IZ-9i for qemu-devel@nongnu.org; Tue, 12 Apr 2011 12:06:37 -0400 Received: from mx1.redhat.com ([209.132.183.28]:9700) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9g6q-0003IL-VP for qemu-devel@nongnu.org; Tue, 12 Apr 2011 12:06:33 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3CG6UhI018225 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 Apr 2011 12:06:31 -0400 Received: from localhost (ovpn-113-139.phx2.redhat.com [10.3.113.139]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id p3CG6SxC013214; Tue, 12 Apr 2011 12:06:29 -0400 From: Amit Shah To: qemu list Date: Tue, 12 Apr 2011 21:36:05 +0530 Message-Id: In-Reply-To: References: In-Reply-To: References: X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Kevin Wolf , Juan Quintela , Stefan Hajnoczi , Markus Armbruster , Jes Sorensen , Amit Shah , Paolo Bonzini Subject: [Qemu-devel] [PATCH v5 3/5] atapi: GESN: Use structs for commonly-used field types 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 Instead of using magic numbers, use structs that are more descriptive of the fields being used. Signed-off-by: Amit Shah --- hw/ide/core.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 5b64676..3fa2044 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1088,11 +1088,23 @@ static void handle_get_event_status_notification(IDEState *s, uint8_t *buf, const uint8_t *packet) { + struct { + uint8_t opcode; + uint8_t polled; /* lsb bit is polled; others are reserved */ + uint8_t reserved2[2]; + uint8_t class; + uint8_t reserved3[2]; + uint16_t len; + uint8_t control; + } __attribute__((packed)) *gesn_cdb; + unsigned int max_len; - max_len = ube16_to_cpu(packet + 7); + gesn_cdb = (void *)packet; + max_len = be16_to_cpu(gesn_cdb->len); - if (!(packet[1] & 0x01)) { /* asynchronous mode */ + /* It is fine by the MMC spec to not support async mode operations */ + if (!(gesn_cdb->polled & 0x01)) { /* asynchronous mode */ /* Only polling is supported, asynchronous mode is not. */ ide_atapi_cmd_error(s, SENSE_ILLEGAL_REQUEST, ASC_INV_FIELD_IN_CMD_PACKET);