Commit f3571b1a authored by Max Reitz's avatar Max Reitz Committed by Anthony Liguori
Browse files

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: default avatarMax Reitz <max@tyndur.org>
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1c47cb16

hw/usb-msd.c

+2 −4
Original line number Diff line number Diff line
@@ -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;

hw/usb-net.c

+0 −5
Original line number Diff line number Diff line
@@ -71,11 +71,6 @@ enum usbstring_idx { 
#define USB_DT_CS_INTERFACE		0x24

#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_GET_ENCAPSULATED_RESPONSE	0x01

#define USB_CDC_REQ_SET_LINE_CODING		0x20

hw/usb-ohci.c

+1 −1
Original line number Diff line number Diff line
@@ -907,7 +907,7 @@ static int ohci_service_td(OHCIState *ohci, struct ohci_ed *ed) 
    flag_r = (td.flags & OHCI_TD_R) != 0;

#ifdef DEBUG_PACKET

    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) {

        DPRINTF("  data:");

hw/usb.h

+4 −0
Original line number Diff line number Diff line
@@ -91,6 +91,10 @@ 
#define EndpointRequest ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)

#define EndpointOutRequest \

        ((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_CLEAR_FEATURE		0x01