Changeset db51a6a6 in mainline for uspace/drv/bus/usb/xhci/transfers.c
- Timestamp:
- 2018-01-22T12:20:14Z (6 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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/bus/usb/xhci/transfers.c
rb3c39690 rdb51a6a6 340 340 case XHCI_TRBC_SUCCESS: 341 341 batch->error = EOK; 342 batch->transfer ed_size = batch->buffer_size - TRB_TRANSFER_LENGTH(*trb);342 batch->transferred_size = batch->buffer_size - TRB_TRANSFER_LENGTH(*trb); 343 343 break; 344 344 … … 346 346 usb_log_warning("Transfer ended with data buffer error."); 347 347 batch->error = EAGAIN; 348 batch->transfer ed_size = 0;348 batch->transferred_size = 0; 349 349 break; 350 350 … … 352 352 usb_log_warning("Babble detected during the transfer."); 353 353 batch->error = EAGAIN; 354 batch->transfer ed_size = 0;354 batch->transferred_size = 0; 355 355 break; 356 356 … … 358 358 usb_log_warning("USB Transaction error."); 359 359 batch->error = ESTALL; 360 batch->transfer ed_size = 0;360 batch->transferred_size = 0; 361 361 break; 362 362 … … 364 364 usb_log_error("Invalid transfer parameters."); 365 365 batch->error = EINVAL; 366 batch->transfer ed_size = 0;366 batch->transferred_size = 0; 367 367 break; 368 368 … … 370 370 usb_log_warning("Stall condition detected."); 371 371 batch->error = ESTALL; 372 batch->transfer ed_size = 0;372 batch->transferred_size = 0; 373 373 break; 374 374 … … 376 376 usb_log_error("Split transcation error detected."); 377 377 batch->error = EAGAIN; 378 batch->transfer ed_size = 0;378 batch->transferred_size = 0; 379 379 break; 380 380 … … 386 386 if (batch->dir == USB_DIRECTION_IN) { 387 387 assert(batch->buffer); 388 assert(batch->transfer ed_size <= batch->buffer_size);389 memcpy(batch->buffer, transfer->hc_buffer.virt, batch->transfer ed_size);388 assert(batch->transferred_size <= batch->buffer_size); 389 memcpy(batch->buffer, transfer->hc_buffer.virt, batch->transferred_size); 390 390 } 391 391
Note:
See TracChangeset
for help on using the changeset viewer.