Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

USB: split hub.h into ch11.h and merge-in hcd.h

Browse source 
Base on inputs from Alan Stern, split the hub.h header into:
- new ch11.h header (most of it) containing constants and
  structures from chapter 11 of the USB 2.0 spec.
- a small remaining part being merged into hcd.h.

Signed-of-by: Eric Lescouet <eric@lescouet.org>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Eric Lescouet 2010-04-24 23:38:17 +02:00 committed by Greg Kroah-Hartman
parent d65d7e7ef3
commit d20db4b4e9
2 changed files with 44 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
include/linux/usb/hub.h → include/linux/usb/ch11.h
View file

@ -1,13 +1,14 @@
/*
* This file holds Hub protocol constants and data structures that are
* defined in chapter 11 (Hub Specification) of the USB 2.0 specification.
*
* It is used/shared between the USB core, the HCDs and couple of other USB
* drivers.
*/
#ifndef __LINUX_HUB_H #ifndef __LINUX_HUB_H
#define __LINUX_HUB_H #define __LINUX_HUB_H
/*
* Hub protocol and driver data structures.
*
* Some of these are known to the "virtual root hub" code
* in host controller drivers.
*/
#include <linux/list.h> #include <linux/list.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include <linux/compiler.h> /* likely()/unlikely() */ #include <linux/compiler.h> /* likely()/unlikely() */
@ -162,44 +163,10 @@ enum hub_led_mode {
INDICATOR_ALT_BLINK, INDICATOR_ALT_BLINK_OFF INDICATOR_ALT_BLINK, INDICATOR_ALT_BLINK_OFF
} __attribute__ ((packed)); } __attribute__ ((packed));
struct usb_device;
/* Transaction Translator Think Times, in bits */ /* Transaction Translator Think Times, in bits */
#define HUB_TTTT_8_BITS 0x00 #define HUB_TTTT_8_BITS 0x00
#define HUB_TTTT_16_BITS 0x20 #define HUB_TTTT_16_BITS 0x20
#define HUB_TTTT_24_BITS 0x40 #define HUB_TTTT_24_BITS 0x40
#define HUB_TTTT_32_BITS 0x60 #define HUB_TTTT_32_BITS 0x60
/*
* As of USB 2.0, full/low speed devices are segregated into trees.
* One type grows from USB 1.1 host controllers (OHCI, UHCI etc).
* The other type grows from high speed hubs when they connect to
* full/low speed devices using "Transaction Translators" (TTs).
*
* TTs should only be known to the hub driver, and high speed bus
* drivers (only EHCI for now). They affect periodic scheduling and
* sometimes control/bulk error recovery.
*/
struct usb_tt {
struct usb_device *hub; /* upstream highspeed hub */
int multi; /* true means one TT per port */
unsigned think_time; /* think time in ns */
/* for control/bulk error recovery (CLEAR_TT_BUFFER) */
spinlock_t lock;
struct list_head clear_list; /* of usb_tt_clear */
struct work_struct clear_work;
};
struct usb_tt_clear {
struct list_head clear_list;
unsigned tt;
u16 devinfo;
struct usb_hcd *hcd;
struct usb_host_endpoint *ep;
};
extern int usb_hub_clear_tt_buffer(struct urb *urb);
extern void usb_ep0_reinit(struct usb_device *);
#endif /* __LINUX_HUB_H */ #endif /* __LINUX_HUB_H */

37
include/linux/usb/hcd.h
View file

@ -374,7 +374,42 @@ extern void usb_destroy_configuration(struct usb_device *dev);
* HCD Root Hub support * HCD Root Hub support
*/ */
#include <linux/usb/hub.h> #include <linux/usb/ch11.h>
/*
* As of USB 2.0, full/low speed devices are segregated into trees.
* One type grows from USB 1.1 host controllers (OHCI, UHCI etc).
* The other type grows from high speed hubs when they connect to
* full/low speed devices using "Transaction Translators" (TTs).
*
* TTs should only be known to the hub driver, and high speed bus
* drivers (only EHCI for now). They affect periodic scheduling and
* sometimes control/bulk error recovery.
*/
struct usb_device;
struct usb_tt {
struct usb_device *hub; /* upstream highspeed hub */
int multi; /* true means one TT per port */
unsigned think_time; /* think time in ns */
/* for control/bulk error recovery (CLEAR_TT_BUFFER) */
spinlock_t lock;
struct list_head clear_list; /* of usb_tt_clear */
struct work_struct clear_work;
};
struct usb_tt_clear {
struct list_head clear_list;
unsigned tt;
u16 devinfo;
struct usb_hcd *hcd;
struct usb_host_endpoint *ep;
};
extern int usb_hub_clear_tt_buffer(struct urb *urb);
extern void usb_ep0_reinit(struct usb_device *);
/* (shifted) direction/type/recipient from the USB 2.0 spec, table 9.2 */ /* (shifted) direction/type/recipient from the USB 2.0 spec, table 9.2 */
#define DeviceRequest \ #define DeviceRequest \