diff options
| author | Michael Brown | 2015-12-07 00:41:26 +0100 |
|---|---|---|
| committer | Michael Brown | 2015-12-07 14:08:23 +0100 |
| commit | eb1fc1e9579a4f70bb28283bf3eadcf493fa0dcb (patch) | |
| tree | 724bea4a4a87fd4625e45ba9811fa0b48c0dc97e /src/drivers/usb | |
| parent | [usb] Use port->disconnected to check for disconnected devices (diff) | |
| download | ipxe-eb1fc1e9579a4f70bb28283bf3eadcf493fa0dcb.tar.gz ipxe-eb1fc1e9579a4f70bb28283bf3eadcf493fa0dcb.tar.xz ipxe-eb1fc1e9579a4f70bb28283bf3eadcf493fa0dcb.zip | |
[usb] Record USB device speed separately from current port speed
Record the speed of a USB device based on the port's speed at the time
that the device was enabled. This allows us to remember the device's
speed even after the device has been disconnected (and so the port's
current speed has changed).
In particular, this allows us to correctly identify the transaction
translator for a low-speed or full-speed device after the device has
been disconnected.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/drivers/usb')
| -rw-r--r-- | src/drivers/usb/ehci.c | 4 | ||||
| -rw-r--r-- | src/drivers/usb/uhci.c | 2 | ||||
| -rw-r--r-- | src/drivers/usb/xhci.c | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/drivers/usb/ehci.c b/src/drivers/usb/ehci.c index f90d6a91..617a43b0 100644 --- a/src/drivers/usb/ehci.c +++ b/src/drivers/usb/ehci.c @@ -970,10 +970,10 @@ static uint32_t ehci_endpoint_characteristics ( struct usb_endpoint *ep ) { chr |= EHCI_CHR_TOGGLE; /* Determine endpoint speed */ - if ( usb->port->speed == USB_SPEED_HIGH ) { + if ( usb->speed == USB_SPEED_HIGH ) { chr |= EHCI_CHR_EPS_HIGH; } else { - if ( usb->port->speed == USB_SPEED_FULL ) { + if ( usb->speed == USB_SPEED_FULL ) { chr |= EHCI_CHR_EPS_FULL; } else { chr |= EHCI_CHR_EPS_LOW; diff --git a/src/drivers/usb/uhci.c b/src/drivers/usb/uhci.c index 4220bef7..528c1be1 100644 --- a/src/drivers/usb/uhci.c +++ b/src/drivers/usb/uhci.c @@ -697,7 +697,7 @@ static int uhci_endpoint_open ( struct usb_endpoint *ep ) { goto err_ring_alloc; endpoint->ring.mtu = ep->mtu; endpoint->ring.flags = UHCI_FL_CERR_MAX; - if ( usb->port->speed < USB_SPEED_FULL ) + if ( usb->speed < USB_SPEED_FULL ) endpoint->ring.flags |= UHCI_FL_LS; endpoint->ring.control = ( UHCI_CONTROL_DEVICE ( usb->address ) | UHCI_CONTROL_ENDPOINT ( ep->address ) ); diff --git a/src/drivers/usb/xhci.c b/src/drivers/usb/xhci.c index 110b4328..67de0a83 100644 --- a/src/drivers/usb/xhci.c +++ b/src/drivers/usb/xhci.c @@ -2753,7 +2753,6 @@ static void xhci_device_close ( struct usb_device *usb ) { static int xhci_device_address ( struct usb_device *usb ) { struct xhci_slot *slot = usb_get_hostdata ( usb ); struct xhci_device *xhci = slot->xhci; - struct usb_port *port = usb->port; struct usb_port *root_port; int psiv; int rc; @@ -2766,7 +2765,7 @@ static int xhci_device_address ( struct usb_device *usb ) { slot->port = root_port->address; /* Calculate protocol speed ID */ - psiv = xhci_port_psiv ( xhci, slot->port, port->speed ); + psiv = xhci_port_psiv ( xhci, slot->port, usb->speed ); if ( psiv < 0 ) { rc = psiv; return rc; |