mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

usb: class specific interface requests

Browse Source 
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>
This commit is contained in:
Max Reitz 2010-03-14 12:19:03 +01:00 committed by Anthony Liguori
parent 1c47cb1651
commit f3571b1a5b
4 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/usb-msd.c
View File

@ -327,14 +327,12 @@ static int usb_msd_handle_control(USBDevice *dev, int request, int value,
ret = 0; ret = 0;
break; break;
/* Class specific requests. */ /* Class specific requests. */
case (((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | MassStorageReset): case ClassInterfaceOutRequest | MassStorageReset:
case MassStorageReset:
/* Reset state ready for the next CBW. */ /* Reset state ready for the next CBW. */
s->mode = USB_MSDM_CBW; s->mode = USB_MSDM_CBW;
ret = 0; ret = 0;
break; break;
case (((USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | GetMaxLun): case ClassInterfaceRequest | GetMaxLun:
case GetMaxLun:
data[0] = 0; data[0] = 0;
ret = 1; ret = 1;
break; break;

5
hw/usb-net.c
View File

@ -71,11 +71,6 @@ enum usbstring_idx {
#define USB_DT_CS_INTERFACE 0x24 #define USB_DT_CS_INTERFACE 0x24
#define USB_DT_CS_ENDPOINT 0x25 #define USB_DT_CS_ENDPOINT 0x25
#define ClassInterfaceRequest \
((USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8)
#define ClassInterfaceOutRequest \
((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8)
#define USB_CDC_SEND_ENCAPSULATED_COMMAND 0x00 #define USB_CDC_SEND_ENCAPSULATED_COMMAND 0x00
#define USB_CDC_GET_ENCAPSULATED_RESPONSE 0x01 #define USB_CDC_GET_ENCAPSULATED_RESPONSE 0x01
#define USB_CDC_REQ_SET_LINE_CODING 0x20 #define USB_CDC_REQ_SET_LINE_CODING 0x20

2
hw/usb-ohci.c
View File

@ -907,7 +907,7 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed)
flag_r = (td.flags & OHCI_TD_R) != 0; flag_r = (td.flags & OHCI_TD_R) != 0;
#ifdef DEBUG_PACKET #ifdef DEBUG_PACKET
DPRINTF(" TD @ 0x%.8x %" PRId64 " bytes %s r=%d cbp=0x%.8x be=0x%.8x\n", DPRINTF(" TD @ 0x%.8x %" PRId64 " bytes %s r=%d cbp=0x%.8x be=0x%.8x\n",
addr, len, str, flag_r, td.cbp, td.be); addr, (int64_t)len, str, flag_r, td.cbp, td.be);
if (len > 0 && dir != OHCI_TD_DIR_IN) { if (len > 0 && dir != OHCI_TD_DIR_IN) {
DPRINTF(" data:"); DPRINTF(" data:");

4
hw/usb.h
View File

@ -91,6 +91,10 @@
#define EndpointRequest ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8) #define EndpointRequest ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
#define EndpointOutRequest \ #define EndpointOutRequest \
((USB_DIR_OUT|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8) ((USB_DIR_OUT|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
#define ClassInterfaceRequest \
((USB_DIR_IN|USB_TYPE_CLASS|USB_RECIP_INTERFACE)<<8)
#define ClassInterfaceOutRequest \
((USB_DIR_OUT|USB_TYPE_CLASS|USB_RECIP_INTERFACE)<<8)
#define USB_REQ_GET_STATUS 0x00 #define USB_REQ_GET_STATUS 0x00
#define USB_REQ_CLEAR_FEATURE 0x01 #define USB_REQ_CLEAR_FEATURE 0x01