Changeset 1d758fc in mainline for uspace/drv/bus/usb/xhci/transfers.c
- Timestamp:
- 2018-02-12T10:11:47Z (6 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 5fe3f954
- Parents:
- 2f762a7
- git-author:
- Ondřej Hlavatý <aearsis@…> (2018-02-05 03:28:50)
- git-committer:
- Ondřej Hlavatý <aearsis@…> (2018-02-12 10:11:47)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/xhci/transfers.c
r2f762a7 r1d758fc 126 126 static int calculate_trb_count(xhci_transfer_t *transfer) 127 127 { 128 const size_t size = transfer->batch. buffer_size;128 const size_t size = transfer->batch.size; 129 129 return (size + PAGE_SIZE - 1 )/ PAGE_SIZE; 130 130 } … … 184 184 int stage_dir = REQUEST_TYPE_IS_DEVICE_TO_HOST(setup->request_type) 185 185 ? STAGE_IN : STAGE_OUT; 186 size_t remaining = transfer->batch. buffer_size;186 size_t remaining = transfer->batch.size; 187 187 188 188 for (size_t i = 0; i < buffer_count; ++i) { … … 227 227 const size_t buffer_count = calculate_trb_count(transfer); 228 228 xhci_trb_t trbs[buffer_count]; 229 size_t remaining = transfer->batch. buffer_size;229 size_t remaining = transfer->batch.size; 230 230 231 231 for (size_t i = 0; i < buffer_count; ++i) { … … 254 254 const size_t buffer_count = calculate_trb_count(transfer); 255 255 xhci_trb_t trbs[buffer_count + 1]; 256 size_t remaining = transfer->batch. buffer_size;256 size_t remaining = transfer->batch.size; 257 257 258 258 for (size_t i = 0; i < buffer_count; ++i) { … … 278 278 const size_t buffer_count = calculate_trb_count(transfer); 279 279 xhci_trb_t trbs[buffer_count]; 280 size_t remaining = transfer->batch. buffer_size;280 size_t remaining = transfer->batch.size; 281 281 282 282 for (size_t i = 0; i < buffer_count; ++i) { … … 372 372 case XHCI_TRBC_SUCCESS: 373 373 batch->error = EOK; 374 batch->transferred_size = batch-> buffer_size - TRB_TRANSFER_LENGTH(*trb);374 batch->transferred_size = batch->size - TRB_TRANSFER_LENGTH(*trb); 375 375 break; 376 376 … … 416 416 } 417 417 418 assert(batch->transferred_size <= batch-> buffer_size);418 assert(batch->transferred_size <= batch->size); 419 419 420 420 usb_transfer_batch_finish(batch);
Note:
See TracChangeset
for help on using the changeset viewer.