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

Changeset d1e580a in mainline for uspace/drv/bus/usb/uhci/uhci.c


Ignore:
Timestamp:
2012-07-29T03:07:52Z (9 years ago)
Author:
Sean Bartell <wingedtachikoma@…>
Branches:
lfn, master
Children:
10334c2e
Parents:
d7c8e39f (diff), b2ba418 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes

File:
1 edited

Legend:

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

    rd7c8e39f rd1e580a  
    6565        return dev->driver_data;
    6666}
    67 /*----------------------------------------------------------------------------*/
     67
    6868/** IRQ handling callback, forward status from call to diver structure.
    6969 *
     
    8383        hc_interrupt(&uhci->hc, status);
    8484}
    85 /*----------------------------------------------------------------------------*/
     85
    8686/** Operations supported by the HC driver */
    8787static ddf_dev_ops_t hc_ops = {
    8888        .interfaces[USBHC_DEV_IFACE] = &hcd_iface, /* see iface.h/c */
    8989};
    90 /*----------------------------------------------------------------------------*/
     90
    9191/** Gets handle of the respective hc.
    9292 *
     
    105105        return EOK;
    106106}
    107 /*----------------------------------------------------------------------------*/
     107
    108108/** USB interface implementation used by RH */
    109109static usb_iface_t usb_iface = {
    110110        .get_hc_handle = usb_iface_get_hc_handle,
    111111};
    112 /*----------------------------------------------------------------------------*/
     112
    113113/** Get root hub hw resources (I/O registers).
    114114 *
     
    123123        return &rh->resource_list;
    124124}
    125 /*----------------------------------------------------------------------------*/
     125
    126126/** Interface to provide the root hub driver with hw info */
    127127static hw_res_ops_t hw_res_iface = {
     
    129129        .enable_interrupt = NULL,
    130130};
    131 /*----------------------------------------------------------------------------*/
     131
    132132/** RH function support for uhci_rhd */
    133133static ddf_dev_ops_t rh_ops = {
     
    135135        .interfaces[HW_RES_DEV_IFACE] = &hw_res_iface
    136136};
    137 /*----------------------------------------------------------------------------*/
     137
    138138/** Initialize hc and rh DDF structures and their respective drivers.
    139139 *
Note: See TracChangeset for help on using the changeset viewer.