GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libpayload: Fix b0b4a52b70 

The removal of bitfields came with some glitches in the UHCI driver. This
fixes it.

Change-Id: Iba8ea3b56b03c526eca7b6388c019568e00be6f5
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: http://review.coreboot.org/1069
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
This commit is contained in:
Nico Huber 2012-05-16 15:04:27 +02:00 committed by Patrick Georgi
parent ee8a9f6c55
commit cefec0ea8c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
payloads/libpayload/drivers/usb/uhci.c
View File

@ -339,13 +339,13 @@ uhci_control (usbdev_t *dev, direction_t dir, int drlen, void *devreq, int dalen
data += mlen; data += mlen;
} }
tds[count].token = (dir == OUT) ? UHCI_IN : UHCI_OUT | tds[count].token = ((dir == OUT) ? UHCI_IN : UHCI_OUT) |
dev->address << TD_DEVADDR_SHIFT | dev->address << TD_DEVADDR_SHIFT |
endp << TD_EP_SHIFT | endp << TD_EP_SHIFT |
maxlen(0) << TD_MAXLEN_SHIFT | maxlen(0) << TD_MAXLEN_SHIFT |
TD_TOGGLE_DATA1; TD_TOGGLE_DATA1;
tds[count].bufptr = 0; tds[count].bufptr = 0;
tds[0].ctrlsts = (0 << TD_COUNTER_SHIFT) | /* as Linux 2.4.10 does */ tds[count].ctrlsts = (0 << TD_COUNTER_SHIFT) | /* as Linux 2.4.10 does */
(dev->speed?TD_LOWSPEED:0) | (dev->speed?TD_LOWSPEED:0) |
TD_STATUS_ACTIVE; TD_STATUS_ACTIVE;
UHCI_INST (dev->controller)->qh_data->elementlinkptr = UHCI_INST (dev->controller)->qh_data->elementlinkptr =
@ -395,7 +395,7 @@ fill_schedule (td_t *td, endpoint_t *ep, int length, unsigned char *data,
(*toggle & 1) << TD_TOGGLE_SHIFT; (*toggle & 1) << TD_TOGGLE_SHIFT;
td->bufptr = virt_to_phys (data); td->bufptr = virt_to_phys (data);
td->ctrlsts = ((ep->direction == SETUP?3:0) << TD_COUNTER_SHIFT) | td->ctrlsts = ((ep->direction == SETUP?3:0) << TD_COUNTER_SHIFT) |
ep->dev->speed?TD_LOWSPEED:0 | (ep->dev->speed?TD_LOWSPEED:0) |
TD_STATUS_ACTIVE; TD_STATUS_ACTIVE;
*toggle ^= 1; *toggle ^= 1;
} }
@ -495,7 +495,7 @@ uhci_create_intr_queue (endpoint_t *ep, int reqsize, int reqcount, int reqtiming
(ep->toggle & 1) << TD_TOGGLE_SHIFT; (ep->toggle & 1) << TD_TOGGLE_SHIFT;
tds[i].bufptr = virt_to_phys (data); tds[i].bufptr = virt_to_phys (data);
tds[i].ctrlsts = (0 << TD_COUNTER_SHIFT) | tds[i].ctrlsts = (0 << TD_COUNTER_SHIFT) |
ep->dev->speed?TD_LOWSPEED:0 | (ep->dev->speed?TD_LOWSPEED:0) |
TD_STATUS_ACTIVE; TD_STATUS_ACTIVE;
ep->toggle ^= 1; ep->toggle ^= 1;
data += reqsize; data += reqsize;