From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NpIRK-0008KC-PE
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 04:42:54 -0500
Received: from [199.232.76.173] (port=39315 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NpIRJ-0008Jl-MM
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 04:42:53 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <arnaud.patard@rtp-net.org>) id 1NpIRI-0008KF-Cw
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 04:42:53 -0500
Received: from lechat.rtp-net.org ([88.191.19.38]:58071)
	by monty-python.gnu.org with esmtp (Exim 4.60)
	(envelope-from <arnaud.patard@rtp-net.org>) id 1NpIRI-0008K3-2T
	for qemu-devel@nongnu.org; Wed, 10 Mar 2010 04:42:52 -0500
Received: from lechat.rtp-net.org (ip6-localhost [IPv6:::1])
	by lechat.rtp-net.org (Postfix) with ESMTP id 2E4F91007D
	for <qemu-devel@nongnu.org>; Wed, 10 Mar 2010 10:45:13 +0100 (CET)
From: Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org>
Date: Wed, 10 Mar 2010 10:45:12 +0100
Message-ID: <87pr3cmrx3.fsf@lechat.rtp-net.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="=-=-="
Subject: [Qemu-devel] [PATCH] hw/usb-msd: fix some usb requests
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

--=-=-=


The usb-msd device emulation needs some small tweaks in the requests
emulations. For instance, the reset/maxlun requests are class/interface
specific so requests for them with the type class and recipient interface
bits sets have to be handled.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
---

--=-=-=
Content-Type: text/x-diff
Content-Disposition: inline; filename=usb-msd-request-fixes.patch

diff --git a/hw/usb-msd.c b/hw/usb-msd.c
index bb39b62..bec82f9 100644
--- a/hw/usb-msd.c
+++ b/hw/usb-msd.c
@@ -321,17 +321,19 @@ static int usb_msd_handle_control(USBDevice *dev, int request, int value,
         ret = 0;
         break;
     case EndpointOutRequest | USB_REQ_CLEAR_FEATURE:
-        if (value == 0 && index != 0x81) { /* clear ep halt */
-            goto fail;
-        }
+        ret = 0;
+        break;
+    case InterfaceOutRequest | USB_REQ_SET_INTERFACE:
         ret = 0;
         break;
         /* Class specific requests.  */
+    case (((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | MassStorageReset):
     case MassStorageReset:
         /* Reset state ready for the next CBW.  */
         s->mode = USB_MSDM_CBW;
         ret = 0;
         break;
+    case (((USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | GetMaxLun):
     case GetMaxLun:
         data[0] = 0;
         ret = 1;

--=-=-=--