d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFp4 //depot/projects/usb@159897

Browse Source 
Add new endpoint direction values for use with usb2_config

Submitted by:	Hans Petter Selasky
This commit is contained in:
Andrew Thompson 2009-04-05 18:20:13 +00:00
parent 63521bbc5a
commit 51ec16035f
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/dev/usb/usb.h
View File

@ -461,8 +461,10 @@ struct usb2_endpoint_descriptor {
uByte bEndpointAddress;
#define UE_GET_DIR(a) ((a) & 0x80)
#define UE_SET_DIR(a,d) ((a) | (((d)&1) << 7))
#define UE_DIR_IN 0x80
#define UE_DIR_OUT 0x00
#define UE_DIR_IN 0x80 /* IN-token endpoint, fixed */
#define UE_DIR_OUT 0x00 /* OUT-token endpoint, fixed */
#define UE_DIR_RX 0xfd /* for internal use only! */
#define UE_DIR_TX 0xfe /* for internal use only! */
#define UE_DIR_ANY 0xff /* for internal use only! */
#define UE_ADDR 0x0f
#define UE_ADDR_ANY 0xff /* for internal use only! */

10
sys/dev/usb/usb_device.c
View File

@ -174,7 +174,15 @@ usb2_get_pipe(struct usb2_device *udev, uint8_t iface_index,
/* setup expected endpoint direction mask and value */
if (setup->direction == UE_DIR_ANY) {
if (setup->direction == UE_DIR_RX) {
ea_mask = (UE_DIR_IN | UE_DIR_OUT);
ea_val = (udev->flags.usb2_mode == USB_MODE_DEVICE) ?
UE_DIR_OUT : UE_DIR_IN;
} else if (setup->direction == UE_DIR_TX) {
ea_mask = (UE_DIR_IN | UE_DIR_OUT);
ea_val = (udev->flags.usb2_mode == USB_MODE_DEVICE) ?
UE_DIR_IN : UE_DIR_OUT;
} else if (setup->direction == UE_DIR_ANY) {
/* match any endpoint direction */
ea_mask = 0;
ea_val = 0;