diff options
| author | Max Reitz <max@tyndur.org> | 2010-03-14 12:19:03 +0100 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2010-03-31 11:16:52 -0500 |
| commit | f3571b1a5b465ae4fb1f168fc1480a3cff780d83 (patch) | |
| tree | b10e7fa0c8e173cf5553d22ce64f3febe309dc3c /hw/usb-msd.c | |
| parent | 1c47cb16517914144d5b29ac1a67f6d720e7e52e (diff) | |
usb: class specific interface requests
Mass Storage Reset and Get Max LUN are class specific requests, but
they were not marked as such in hw/usb-msd.c, moved therefore
ClassInterfaceRequest and ClassInterfaceOutRequest from hw/usb-net.c
to hw/usb.h.
Furthermore there was a problem in hw/usb-ohci.c when using DEBUG
concerning systems where size_t is a 32 bit integer (printf resulted
in a segmentation fault).
Signed-off-by: Max Reitz <max@tyndur.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'hw/usb-msd.c')
| -rw-r--r-- | hw/usb-msd.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hw/usb-msd.c b/hw/usb-msd.c index e9235eaf67..c1c2537475 100644 --- a/hw/usb-msd.c +++ b/hw/usb-msd.c @@ -327,14 +327,12 @@ static int usb_msd_handle_control(USBDevice *dev, int request, int value, ret = 0; break; /* Class specific requests. */ - case (((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | MassStorageReset): - case MassStorageReset: + case ClassInterfaceOutRequest | 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: + case ClassInterfaceRequest | GetMaxLun: data[0] = 0; ret = 1; break; |