Skip to contentSkip to conversation

hw/usb-msd: fix some usb requests

PATCH Applied Arnaud Patard (Rtp) 3 participants 3 messages Mar 10, 2010 – Mar 17, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hw/usb-msd: fix some usb requests

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.

---

hw/usb-msd.c +5 -3
index bb39b62..bec82f9 100644
@@ -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;
#1 lore raw
Quoted 8 lines · Arnaud Patard (Rtp)

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.

---

I hit this yesterday with msd as well. I suggest moving the ClassInterfaceRequest and ClassInterfaceOutRequest defines from hw/usb-net.c to hw/usb.h and then use those in hw/usb-msd.c for the Class specific requests.

David

#2 lore raw
In reply to Arnaud Patard (Rtp)
Quoted 8 lines · Arnaud Patard (Rtp)

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.

---

Applied. Thanks.

Regards,

Anthony Liguori