david/ipxe
david/ipxe
Archived
1
0
Fork 0
Code

[usb] Add USB_INTERRUPT_OUT internal type

Browse Source 
Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2015-05-11 14:56:46 +01:00
parent 86aa959561
commit 0eaa3a34bf
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/drivers/bus/usb.c
View File

@ -265,7 +265,8 @@ int usb_endpoint_described ( struct usb_endpoint *ep,
burst = ( descx ? descx->burst : USB_ENDPOINT_BURST ( sizes ) );
/* Calculate interval */
if ( type == USB_INTERRUPT ) {
if ( ( type & USB_ENDPOINT_ATTR_TYPE_MASK ) ==
USB_ENDPOINT_ATTR_INTERRUPT ) {
if ( port->speed >= USB_SPEED_HIGH ) {
/* 2^(desc->interval-1) is a microframe count */
interval = ( 1 << ( desc->interval - 1 ) );

2
src/drivers/usb/usbhub.c
View File

@ -425,7 +425,7 @@ static int hub_probe ( struct usb_function *func,
/* Locate interrupt endpoint descriptor */
if ( ( rc = usb_endpoint_described ( &hubdev->intr, config, interface,
USB_INTERRUPT, 0 ) ) != 0 ) {
USB_INTERRUPT_IN, 0 ) ) != 0 ) {
DBGC ( hubdev, "HUB %s could not describe interrupt endpoint: "
"%s\n", hubdev->name, strerror ( rc ) );
goto err_endpoint;

2
src/drivers/usb/usbnet.c
View File

@ -185,7 +185,7 @@ static int usbnet_comms_describe ( struct usbnet_device *usbnet,
/* Describe interrupt endpoint */
if ( ( rc = usb_endpoint_described ( &usbnet->intr, config,
desc, USB_INTERRUPT,
desc, USB_INTERRUPT_IN,
0 ) ) != 0 )
continue;

7
src/include/ipxe/usb.h
View File

@ -277,8 +277,11 @@ struct usb_endpoint_descriptor {
/** Bulk IN endpoint (internal) type */
#define USB_BULK_IN ( USB_ENDPOINT_ATTR_BULK | USB_DIR_IN )
/** Interrupt endpoint (internal) type */
#define USB_INTERRUPT ( USB_ENDPOINT_ATTR_INTERRUPT | USB_DIR_IN )
/** Interrupt IN endpoint (internal) type */
#define USB_INTERRUPT_IN ( USB_ENDPOINT_ATTR_INTERRUPT | USB_DIR_IN )
/** Interrupt OUT endpoint (internal) type */
#define USB_INTERRUPT_OUT ( USB_ENDPOINT_ATTR_INTERRUPT | USB_DIR_OUT )
/** USB endpoint MTU */
#define USB_ENDPOINT_MTU(sizes) ( ( (sizes) >> 0 ) & 0x07ff )