Changeset 5944244 in mainline for uspace/drv/uhci-hcd/iface.c


Ignore:
Timestamp:
2011-02-01T23:25:48Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1f5c1e61
Parents:
c56dbe0
Message:

Refactoring uhci_ functions are called on uhci_t not device_t

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci-hcd/iface.c

    rc56dbe0 r5944244  
    4444{
    4545        assert(dev);
    46         uhci_t *hc = (uhci_t *)dev->driver_data;
     46        uhci_t *hc = dev_to_uhci(dev);
    4747        assert(hc);
    4848        *address = usb_address_keeping_find(&hc->address_manager, handle);
    … …  
    5555{
    5656        assert(dev);
    57         uhci_t *hc = (uhci_t *)dev->driver_data;
     57        uhci_t *hc = dev_to_uhci(dev);
    5858        assert(hc);
    5959        usb_address_keeping_reserve_default(&hc->address_manager);
    … …  
    6464{
    6565        assert(dev);
    66         uhci_t *hc = (uhci_t *)dev->driver_data;
     66        uhci_t *hc = dev_to_uhci(dev);
    6767        assert(hc);
    6868        usb_address_keeping_release_default(&hc->address_manager);
    … …  
    7373{
    7474        assert(dev);
    75         uhci_t *hc = (uhci_t *)dev->driver_data;
     75        uhci_t *hc = dev_to_uhci(dev);
    7676        assert(hc);
    7777        *address = usb_address_keeping_request(&hc->address_manager);
    … …  
    8585{
    8686        assert(dev);
    87         uhci_t *hc = (uhci_t *)dev->driver_data;
     87        uhci_t *hc = dev_to_uhci(dev);
    8888        assert(hc);
    8989        usb_address_keeping_devman_bind(&hc->address_manager, address, handle);
    … …  
    9494{
    9595        assert(dev);
    96         uhci_t *hc = (uhci_t *)dev->driver_data;
     96        uhci_t *hc = dev_to_uhci(dev);
    9797        assert(hc);
    9898        usb_address_keeping_release_default(&hc->address_manager);
    … …  
    104104    usbhc_iface_transfer_out_callback_t callback, void *arg)
    105105{
    106         return uhci_transfer(dev, target, USB_TRANSFER_INTERRUPT, 0, USB_PID_OUT,
     106        assert(dev);
     107        uhci_t *hc = dev_to_uhci(dev);
     108        assert(hc);
     109        return uhci_transfer(hc, dev, target, USB_TRANSFER_INTERRUPT, 0, USB_PID_OUT,
    107110                data, size, callback, NULL, arg);
    108111}
    … …  
    112115    usbhc_iface_transfer_in_callback_t callback, void *arg)
    113116{
    114         return uhci_transfer(dev, target, USB_TRANSFER_INTERRUPT, 0, USB_PID_IN,
     117        assert(dev);
     118        uhci_t *hc = dev_to_uhci(dev);
     119        assert(hc);
     120        return uhci_transfer(hc, dev, target, USB_TRANSFER_INTERRUPT, 0, USB_PID_IN,
    115121                data, size, NULL, callback, arg);
    116122}
    … …  
    120126    usbhc_iface_transfer_out_callback_t callback, void *arg)
    121127{
    122         return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_SETUP,
     128        assert(dev);
     129        uhci_t *hc = dev_to_uhci(dev);
     130        assert(hc);
     131        return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_SETUP,
    123132                data, size, callback, NULL, arg);
    124133}
    … …  
    128137    usbhc_iface_transfer_out_callback_t callback, void *arg)
    129138{
    130         return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 1, USB_PID_OUT,
     139        assert(dev);
     140        uhci_t *hc = dev_to_uhci(dev);
     141        assert(hc);
     142        return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 1, USB_PID_OUT,
    131143                data, size, callback, NULL, arg);
    132144}
    … …  
    135147    usbhc_iface_transfer_in_callback_t callback, void *arg)
    136148{
    137         return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_IN,
     149        assert(dev);
     150        uhci_t *hc = dev_to_uhci(dev);
     151        assert(hc);
     152        return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_IN,
    138153                NULL, 0, NULL, callback, arg);
    139154}
    … …  
    143158    usbhc_iface_transfer_out_callback_t callback, void *arg)
    144159{
    145         return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_SETUP,
     160        assert(dev);
     161        uhci_t *hc = dev_to_uhci(dev);
     162        assert(hc);
     163        return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_SETUP,
    146164                data, size, callback, NULL, arg);
    147165}
    … …  
    151169    usbhc_iface_transfer_in_callback_t callback, void *arg)
    152170{
    153         return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 1, USB_PID_IN,
     171        assert(dev);
     172        uhci_t *hc = dev_to_uhci(dev);
     173        assert(hc);
     174        return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 1, USB_PID_IN,
    154175                data, size, NULL, callback, arg);
    155176}
    … …  
    158179    usbhc_iface_transfer_out_callback_t callback, void *arg)
    159180{
    160         return uhci_transfer(dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_OUT,
     181        assert(dev);
     182        uhci_t *hc = dev_to_uhci(dev);
     183        assert(hc);
     184        return uhci_transfer(hc, dev, target, USB_TRANSFER_CONTROL, 0, USB_PID_OUT,
    161185                NULL, 0, callback, NULL, arg);
    162186}
Note: See TracChangeset for help on using the changeset viewer.