Changeset db51a6a6 in mainline for uspace/drv/bus/usb/ehci
- Timestamp:
- 2018-01-22T12:20:14Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 998773d
- Parents:
- b3c39690
- git-author:
- Ondřej Hlavatý <aearsis@…> (2018-01-22 12:18:02)
- git-committer:
- Ondřej Hlavatý <aearsis@…> (2018-01-22 12:20:14)
- Location:
- uspace/drv/bus/usb/ehci
- Files:
-
- 3 edited
-
ehci_batch.c (modified) (3 diffs)
-
ehci_bus.c (modified) (1 diff)
-
ehci_rh.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/ehci/ehci_batch.c
rb3c39690 rdb51a6a6 179 179 180 180 /* Assume all data got through */ 181 ehci_batch->base.transfer ed_size = ehci_batch->base.buffer_size;181 ehci_batch->base.transferred_size = ehci_batch->base.buffer_size; 182 182 183 183 /* Check all TDs */ … … 202 202 * we leave the very last(unused) TD behind. 203 203 */ 204 ehci_batch->base.transfer ed_size204 ehci_batch->base.transferred_size 205 205 -= td_remain_size(&ehci_batch->tds[i]); 206 206 } else { … … 215 215 } 216 216 217 assert(ehci_batch->base.transfer ed_size <= ehci_batch->base.buffer_size);217 assert(ehci_batch->base.transferred_size <= ehci_batch->base.buffer_size); 218 218 219 219 if (ehci_batch->base.dir == USB_DIRECTION_IN) 220 220 memcpy(ehci_batch->base.buffer, 221 221 ehci_batch->data_buffer, 222 ehci_batch->base.transfer ed_size);222 ehci_batch->base.transferred_size); 223 223 224 224 /* Clear TD pointers */ -
uspace/drv/bus/usb/ehci/ehci_bus.c
rb3c39690 rdb51a6a6 148 148 if (batch) { 149 149 batch->error = EINTR; 150 batch->transfer ed_size = 0;150 batch->transferred_size = 0; 151 151 usb_transfer_batch_finish(batch); 152 152 } -
uspace/drv/bus/usb/ehci/ehci_rh.c
rb3c39690 rdb51a6a6 146 146 batch->error = virthub_base_request(&instance->base, batch->target, 147 147 batch->dir, (void*) batch->setup.buffer, 148 batch->buffer, batch->buffer_size, &batch->transfer ed_size);148 batch->buffer, batch->buffer_size, &batch->transferred_size); 149 149 if (batch->error == ENAK) { 150 150 usb_log_debug("RH(%p): BATCH(%p) adding as unfinished", … … 180 180 batch->error = virthub_base_request(&instance->base, batch->target, 181 181 batch->dir, (void*) batch->setup.buffer, 182 batch->buffer, batch->buffer_size, &batch->transfer ed_size);182 batch->buffer, batch->buffer_size, &batch->transferred_size); 183 183 usb_transfer_batch_finish(batch); 184 184 }
Note:
See TracChangeset
for help on using the changeset viewer.
