usb.h.rej

linux得一些常用命令,以及linux环境下的c编程

***************
*** 789,794 ****
  	struct list_head inodes;
  
  	atomic_t refcnt;
  };
  
  /*
--- 789,798 ----
  	struct list_head inodes;
  
  	atomic_t refcnt;
+ 
+ 	u8 otg_port;
+ 	unsigned is_b_host:1;
+ 	unsigned b_hnp_enable:1;
  };
  
  /*
***************
*** 806,811 ****
  	int			multi;	/* true means one TT per port */
  };
  
  
  /* This is arbitrary.
   * From USB 2.0 spec Table 11-13, offset 7, a hub can
--- 810,825 ----
  	int			multi;	/* true means one TT per port */
  };
  
+ /*-------------------------------------------------------------------------*/
+ 
+ /* USB 2.0 defines three speeds, here's how Linux identifies them */
+ 
+ enum usb_device_speed {
+ 	USB_SPEED_UNKNOWN = 0,			/* enumerating */
+ 	USB_SPEED_LOW, USB_SPEED_FULL,		/* usb 1.1 */
+ 	USB_SPEED_HIGH				/* usb 2.0 */
+ };
+ 
  
  /* This is arbitrary.
   * From USB 2.0 spec Table 11-13, offset 7, a hub can
***************
*** 817,827 ****
  	int		devnum;		/* Address on USB bus */
  	char		devpath [16];	/* Use in messages: /port/port/... */
  
- 	enum {
- 		USB_SPEED_UNKNOWN = 0,			/* enumerating */
- 		USB_SPEED_LOW, USB_SPEED_FULL,		/* usb 1.1 */
- 		USB_SPEED_HIGH				/* usb 2.0 */
- 	} speed;
  
  	struct usb_tt	*tt; 		/* low/full speed dev, highspeed hub */
  	int		ttport;		/* device port on that tt hub */
--- 831,837 ----
  	int		devnum;		/* Address on USB bus */
  	char		devpath [16];	/* Use in messages: /port/port/... */
  
+ 	enum usb_device_speed speed;
  
  	struct usb_tt	*tt; 		/* low/full speed dev, highspeed hub */
  	int		ttport;		/* device port on that tt hub */