From patchwork Tue Apr 12 14:09:20 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 90810 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 426B5B6F16 for ; Wed, 13 Apr 2011 00:11:36 +1000 (EST) Received: from localhost ([::1]:48257 helo=lists2.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9eJZ-0004it-EV for incoming@patchwork.ozlabs.org; Tue, 12 Apr 2011 10:11:33 -0400 Received: from eggs.gnu.org ([140.186.70.92]:34675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9eI9-0002uq-AU for qemu-devel@nongnu.org; Tue, 12 Apr 2011 10:10:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q9eI7-0004Vm-U4 for qemu-devel@nongnu.org; Tue, 12 Apr 2011 10:10:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10755) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q9eI7-0004Vg-LG for qemu-devel@nongnu.org; Tue, 12 Apr 2011 10:10:03 -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 p3CEA1Et022926 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 Apr 2011 10:10:01 -0400 Received: from localhost (ovpn-113-83.phx2.redhat.com [10.3.113.83]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p3CE9wdt032755; Tue, 12 Apr 2011 10:10:00 -0400 From: Amit Shah To: qemu list Date: Tue, 12 Apr 2011 19:39:20 +0530 Message-Id: <4b1b54743b427f6455495acf78c47969a4ba4395.1302617257.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: 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: Kevin Wolf , Juan Quintela , Stefan Hajnoczi , Markus Armbruster , Amit Shah , Paolo Bonzini Subject: [Qemu-devel] [PATCH v4 4/5] atapi: GESN: Standardise event response handling for future additions 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 Handle GET_EVENT_STATUS_NOTIFICATION's No Event Available response in a generic way so that future additions to the code to handle other response types is easier. Signed-off-by: Amit Shah --- hw/ide/core.c | 25 +++++++++++++++++++------ 1 files changed, 19 insertions(+), 6 deletions(-) diff --git a/hw/ide/core.c b/hw/ide/core.c index 3fa2044..dafc049 100644 --- a/hw/ide/core.c +++ b/hw/ide/core.c @@ -1098,9 +1098,17 @@ static void handle_get_event_status_notification(IDEState *s, uint8_t control; } __attribute__((packed)) *gesn_cdb; - unsigned int max_len; + struct { + uint16_t len; + uint8_t notification_class; + uint8_t supported_events; + } __attribute((packed)) *gesn_event_header; + + unsigned int max_len, used_len; gesn_cdb = (void *)packet; + gesn_event_header = (void *)buf; + max_len = be16_to_cpu(gesn_cdb->len); /* It is fine by the MMC spec to not support async mode operations */ @@ -1111,12 +1119,17 @@ static void handle_get_event_status_notification(IDEState *s, return; } - /* polling */ + /* polling mode operation */ + /* We don't support any event class (yet). */ - cpu_to_ube16(buf, 0x00); /* No event descriptor returned */ - buf[2] = 0x80; /* No Event Available (NEA) */ - buf[3] = 0x00; /* Empty supported event classes */ - ide_atapi_cmd_reply(s, 4, max_len); + gesn_event_header->supported_events = 0; + + gesn_event_header->notification_class = 0x80; /* No event available */ + used_len = sizeof(*gesn_event_header); + + gesn_event_header->len = cpu_to_be16(used_len + - sizeof(*gesn_event_header)); + ide_atapi_cmd_reply(s, used_len, max_len); } static void ide_atapi_cmd(IDEState *s)