[alsa-devel] [PATCH 1/4] USB: Add endpoint usage definitions to ch9.h

[Daniel Mack]

On Mon, Sep 12, 2011 at 6:54 PM, Daniel Mack <zonque at gmail.com> wrote:
> The endpoint usage field is described in the USB 2.0 specification,
> chapter 9.6.6.
>
> Also, move the sync type fields block down by some lines to reflect the
> fact that these are also stuffed in bmAttributes.

Greg - can we merge this through the ALSA tree?


Daniel


> Signed-off-by: Daniel Mack <zonque at gmail.com>
> Cc: Greg Kroah-Hartman <gregkh at suse.de>
> Cc: Takashi Iwai <tiwai at suse.de>
> ---
>  include/linux/usb/ch9.h |   17 +++++++++++------
>  1 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/include/linux/usb/ch9.h b/include/linux/usb/ch9.h
> index 0fd3fbd..f302535 100644
> --- a/include/linux/usb/ch9.h
> +++ b/include/linux/usb/ch9.h
> @@ -377,12 +377,6 @@ struct usb_endpoint_descriptor {
>  #define USB_ENDPOINT_NUMBER_MASK       0x0f    /* in bEndpointAddress */
>  #define USB_ENDPOINT_DIR_MASK          0x80
>
> -#define USB_ENDPOINT_SYNCTYPE          0x0c
> -#define USB_ENDPOINT_SYNC_NONE         (0 << 2)
> -#define USB_ENDPOINT_SYNC_ASYNC                (1 << 2)
> -#define USB_ENDPOINT_SYNC_ADAPTIVE     (2 << 2)
> -#define USB_ENDPOINT_SYNC_SYNC         (3 << 2)
> -
>  #define USB_ENDPOINT_XFERTYPE_MASK     0x03    /* in bmAttributes */
>  #define USB_ENDPOINT_XFER_CONTROL      0
>  #define USB_ENDPOINT_XFER_ISOC         1
> @@ -390,6 +384,17 @@ struct usb_endpoint_descriptor {
>  #define USB_ENDPOINT_XFER_INT          3
>  #define USB_ENDPOINT_MAX_ADJUSTABLE    0x80
>
> +#define USB_ENDPOINT_SYNCTYPE          0x0c
> +#define USB_ENDPOINT_SYNC_NONE         (0 << 2)
> +#define USB_ENDPOINT_SYNC_ASYNC                (1 << 2)
> +#define USB_ENDPOINT_SYNC_ADAPTIVE     (2 << 2)
> +#define USB_ENDPOINT_SYNC_SYNC         (3 << 2)
> +
> +#define USB_ENDPOINT_USAGE_MASK                0x30
> +#define USB_ENDPOINT_USAGE_DATA                0x00
> +#define USB_ENDPOINT_USAGE_FEEDBACK    0x10
> +#define USB_ENDPOINT_USAGE_IMPLICIT_FB 0x20    /* Implicit feedback Data endpoint */
> +
>  /*-------------------------------------------------------------------------*/
>
>  /**
> --
> 1.7.5.4
>
>