Changeset 0c224b2 in mainline


Ignore:
Timestamp:
2011-07-12T10:32:21Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
7d5708d
Parents:
2fe28ca1
Message:

OHCI: Revert revision 1122.

usb_transfer_batch_t relies on its internal error value,
do not change it unless explicitly requested.

Location:
uspace/lib/usbhost
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/lib/usbhost/include/usb/host/batch.h

    r2fe28ca1 r0c224b2  
    9393void usb_transfer_batch_call_in_and_dispose(usb_transfer_batch_t *instance);
    9494void usb_transfer_batch_call_out_and_dispose(usb_transfer_batch_t *instance);
    95 void usb_transfer_batch_finish_error(usb_transfer_batch_t *instance, int error);
     95void usb_transfer_batch_finish(usb_transfer_batch_t *instance);
    9696void usb_transfer_batch_dispose(usb_transfer_batch_t *instance);
    9797
    98 static inline void usb_transfer_batch_finish(usb_transfer_batch_t *instance)
     98static inline void usb_transfer_batch_finish_error(
     99    usb_transfer_batch_t *instance, int error)
    99100{
    100101        assert(instance);
    101         usb_transfer_batch_finish_error(instance, EOK);
     102        instance->error = error;
     103        usb_transfer_batch_finish(instance);
    102104}
    103105

  • uspace/lib/usbhost/src/batch.c

    r2fe28ca1 r0c224b2  
    105105 *
    106106 */
    107 void usb_transfer_batch_finish_error(usb_transfer_batch_t *instance, int error)
     107void usb_transfer_batch_finish(usb_transfer_batch_t *instance)
    108108{
    109109        assert(instance);
    110110        assert(instance->ep);
    111111        assert(instance->next_step);
    112         instance->error = error;
    113112        endpoint_release(instance->ep);
    114113        instance->next_step(instance);
Note: See TracChangeset for help on using the changeset viewer.