Revision f3571b1a

b/hw/usb-msd.c
327 327
        ret = 0;
328 328
        break;
329 329
        /* Class specific requests.  */
330
    case (((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | MassStorageReset):
331
    case MassStorageReset:
330
    case ClassInterfaceOutRequest | MassStorageReset:
332 331
        /* Reset state ready for the next CBW.  */
333 332
        s->mode = USB_MSDM_CBW;
334 333
        ret = 0;
335 334
        break;
336
    case (((USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8) | GetMaxLun):
337
    case GetMaxLun:
335
    case ClassInterfaceRequest | GetMaxLun:
338 336
        data[0] = 0;
339 337
        ret = 1;
340 338
        break;
b/hw/usb-net.c
71 71
#define USB_DT_CS_INTERFACE		0x24
72 72
#define USB_DT_CS_ENDPOINT		0x25
73 73

  
74
#define ClassInterfaceRequest		\
75
    ((USB_DIR_IN | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8)
76
#define ClassInterfaceOutRequest	\
77
    ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8)
78

  
79 74
#define USB_CDC_SEND_ENCAPSULATED_COMMAND	0x00
80 75
#define USB_CDC_GET_ENCAPSULATED_RESPONSE	0x01
81 76
#define USB_CDC_REQ_SET_LINE_CODING		0x20
b/hw/usb-ohci.c
907 907
    flag_r = (td.flags & OHCI_TD_R) != 0;
908 908
#ifdef DEBUG_PACKET
909 909
    DPRINTF(" TD @ 0x%.8x %" PRId64 " bytes %s r=%d cbp=0x%.8x be=0x%.8x\n",
910
            addr, len, str, flag_r, td.cbp, td.be);
910
            addr, (int64_t)len, str, flag_r, td.cbp, td.be);
911 911

  
912 912
    if (len > 0 && dir != OHCI_TD_DIR_IN) {
913 913
        DPRINTF("  data:");
b/hw/usb.h
91 91
#define EndpointRequest ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
92 92
#define EndpointOutRequest \
93 93
        ((USB_DIR_OUT|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT)<<8)
94
#define ClassInterfaceRequest \
95
        ((USB_DIR_IN|USB_TYPE_CLASS|USB_RECIP_INTERFACE)<<8)
96
#define ClassInterfaceOutRequest \
97
        ((USB_DIR_OUT|USB_TYPE_CLASS|USB_RECIP_INTERFACE)<<8)
94 98

  
95 99
#define USB_REQ_GET_STATUS		0x00
96 100
#define USB_REQ_CLEAR_FEATURE		0x01

Also available in: Unified diff