From patchwork Wed Apr 13 12:05:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 90997 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 E26AEB6F70 for ; Wed, 13 Apr 2011 22:05:59 +1000 (EST) Received: from localhost ([::1]:48749 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9ypZ-0007rV-8O for incoming@patchwork.ozlabs.org; Wed, 13 Apr 2011 08:05:57 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53219) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9yms-00031m-TS for qemu-devel@nongnu.org; Wed, 13 Apr 2011 08:03:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9ymj-0003j1-Jx for qemu-devel@nongnu.org; Wed, 13 Apr 2011 08:03:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:14828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9ymj-0003iw-AL for qemu-devel@nongnu.org; Wed, 13 Apr 2011 08:03:01 -0400 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id p3DC30gB005084 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 13 Apr 2011 08:03:00 -0400 Received: from dhcp-5-188.str.redhat.com (dhcp-5-175.str.redhat.com [10.32.5.175]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3DC2n9N032484; Wed, 13 Apr 2011 08:02:59 -0400 From: Kevin Wolf To: anthony@codemonkey.ws Date: Wed, 13 Apr 2011 14:05:13 +0200 Message-Id: <1302696316-26190-8-git-send-email-kwolf@redhat.com> In-Reply-To: <1302696316-26190-1-git-send-email-kwolf@redhat.com> References: <1302696316-26190-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.25 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 07/10] 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 From: Amit Shah Instead of using magic numbers, use structs that are more descriptive of the fields being used. Signed-off-by: Amit Shah Acked-by: Jes Sorensen Acked-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- 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 4e4ade2..f976947 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);