Changeset db51a6a6 in mainline for uspace/drv/bus/usb/ohci
- 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/ohci
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/ohci/ohci_batch.c
rb3c39690 rdb51a6a6 187 187 188 188 /* Assume all data got through */ 189 ohci_batch->base.transfer ed_size = ohci_batch->base.buffer_size;189 ohci_batch->base.transferred_size = ohci_batch->base.buffer_size; 190 190 191 191 /* Assume we will leave the last(unused) TD behind */ … … 213 213 * we leave the very last(unused) TD behind. 214 214 */ 215 ohci_batch->base.transfer ed_size215 ohci_batch->base.transferred_size 216 216 -= td_remain_size(ohci_batch->tds[i]); 217 217 } else { … … 244 244 } 245 245 } 246 assert(ohci_batch->base.transfer ed_size <=246 assert(ohci_batch->base.transferred_size <= 247 247 ohci_batch->base.buffer_size); 248 248 … … 254 254 memcpy(ohci_batch->base.buffer, 255 255 ohci_batch->device_buffer + setup_size, 256 ohci_batch->base.transfer ed_size);256 ohci_batch->base.transferred_size); 257 257 258 258 /* Store the remaining TD */ -
uspace/drv/bus/usb/ohci/ohci_bus.c
rb3c39690 rdb51a6a6 152 152 if (batch) { 153 153 batch->error = EINTR; 154 batch->transfer ed_size = 0;154 batch->transferred_size = 0; 155 155 usb_transfer_batch_finish(batch); 156 156 } -
uspace/drv/bus/usb/ohci/ohci_rh.c
rb3c39690 rdb51a6a6 180 180 batch->error = virthub_base_request(&instance->base, batch->target, 181 181 batch->dir, &batch->setup.packet, 182 batch->buffer, batch->buffer_size, &batch->transfer ed_size);182 batch->buffer, batch->buffer_size, &batch->transferred_size); 183 183 if (batch->error == ENAK) { 184 184 /* This is safe because only status change interrupt transfers … … 208 208 batch->error = virthub_base_request(&instance->base, batch->target, 209 209 batch->dir, &batch->setup.packet, 210 batch->buffer, batch->buffer_size, &batch->transfer ed_size);210 batch->buffer, batch->buffer_size, &batch->transferred_size); 211 211 usb_transfer_batch_finish(batch); 212 212 }
Note:
See TracChangeset
for help on using the changeset viewer.