From 0ce5fca3b86e5ab2df1533e3085a2910bdb06d8e Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Tue, 8 May 2012 07:44:01 -0700 Subject: [PATCH] --- yaml --- r: 303997 b: refs/heads/master c: 6538eafc7cb6b2d718d2539bef3158bfaad57468 h: refs/heads/master i: 303995: 451229cc44657831549ba254ebbcd9aa202754cd v: v3 --- [refs] | 2 +- trunk/include/linux/usb/ch9.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index e8b2c598d147..6bf38415513d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dbc33303e457bc9d9179d628951e6b7c7a3f6056 +refs/heads/master: 6538eafc7cb6b2d718d2539bef3158bfaad57468 diff --git a/trunk/include/linux/usb/ch9.h b/trunk/include/linux/usb/ch9.h index 43bce9da7a4d..d1d732c2838d 100644 --- a/trunk/include/linux/usb/ch9.h +++ b/trunk/include/linux/usb/ch9.h @@ -392,6 +392,11 @@ struct usb_endpoint_descriptor { #define USB_ENDPOINT_XFER_INT 3 #define USB_ENDPOINT_MAX_ADJUSTABLE 0x80 +/* The USB 3.0 spec redefines bits 5:4 of bmAttributes as interrupt ep type. */ +#define USB_ENDPOINT_INTRTYPE 0x30 +#define USB_ENDPOINT_INTR_PERIODIC (0 << 4) +#define USB_ENDPOINT_INTR_NOTIFICATION (1 << 4) + #define USB_ENDPOINT_SYNCTYPE 0x0c #define USB_ENDPOINT_SYNC_NONE (0 << 2) #define USB_ENDPOINT_SYNC_ASYNC (1 << 2) @@ -594,6 +599,12 @@ static inline int usb_endpoint_maxp(const struct usb_endpoint_descriptor *epd) return __le16_to_cpu(epd->wMaxPacketSize); } +static inline int usb_endpoint_interrupt_type( + const struct usb_endpoint_descriptor *epd) +{ + return epd->bmAttributes & USB_ENDPOINT_INTRTYPE; +} + /*-------------------------------------------------------------------------*/ /* USB_DT_SS_ENDPOINT_COMP: SuperSpeed Endpoint Companion descriptor */