Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 6bba41d in mainline


Ignore:
Timestamp:
2011-12-06T12:28:02Z (10 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master
Children:
ad91b80
Parents:
5cfcc64
Message:

uhci: Add and use uhci_batch_abort. Rename uhci_batch_call_dispose ⇒ uhci_batch finish_dispose

Location:
uspace/drv/bus/usb/uhci
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/uhci/hc.c

    r5cfcc64 r6bba41d  
    130130                        uhci_transfer_batch_t *batch =
    131131                            uhci_transfer_batch_from_link(item);
    132                         uhci_transfer_batch_call_dispose(batch);
     132                        uhci_transfer_batch_finish_dispose(batch);
    133133                }
    134134        }
  • uspace/drv/bus/usb/uhci/transfer_list.c

    r5cfcc64 r6bba41d  
    184184                    uhci_transfer_batch_from_link(current);
    185185                transfer_list_remove_batch(instance, batch);
    186                 batch->usb_batch->error = EINTR;
    187                 uhci_transfer_batch_call_dispose(batch);
     186                uhci_transfer_batch_abort(batch);
    188187        }
    189188        fibril_mutex_unlock(&instance->guard);
  • uspace/drv/bus/usb/uhci/uhci_batch.c

    r5cfcc64 r6bba41d  
    5959 * @param[in] uhci_batch Instance to destroy.
    6060 */
    61 void uhci_transfer_batch_call_dispose(uhci_transfer_batch_t *uhci_batch)
     61void uhci_transfer_batch_finish_dispose(uhci_transfer_batch_t *uhci_batch)
    6262{
    6363        assert(uhci_batch);
  • uspace/drv/bus/usb/uhci/uhci_batch.h

    r5cfcc64 r6bba41d  
    6161
    6262uhci_transfer_batch_t * uhci_transfer_batch_get(usb_transfer_batch_t *batch);
    63 void uhci_transfer_batch_call_dispose(uhci_transfer_batch_t *uhci_batch);
     63void uhci_transfer_batch_finish_dispose(uhci_transfer_batch_t *uhci_batch);
    6464bool uhci_transfer_batch_is_complete(uhci_transfer_batch_t *uhci_batch);
    6565
     
    8282}
    8383/*----------------------------------------------------------------------------*/
     84static inline void uhci_transfer_batch_abort(
     85    uhci_transfer_batch_t *uhci_batch)
     86{
     87        assert(uhci_batch);
     88        assert(uhci_batch->usb_batch);
     89        uhci_batch->usb_batch->error = EINTR;
     90        uhci_batch->usb_batch->transfered_size = 0;
     91        uhci_transfer_batch_finish_dispose(uhci_batch);
     92}
     93/*----------------------------------------------------------------------------*/
    8494static inline uhci_transfer_batch_t *uhci_transfer_batch_from_link(link_t *l)
    8595{
Note: See TracChangeset for help on using the changeset viewer.