Changeset b828907 in mainline for uspace/drv/bus/usb/uhcirh/port.c


Ignore:
Timestamp:
2012-07-20T20:29:54Z (12 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
34bc2fe
Parents:
4cdac68 (diff), 6de2d766 (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/uhcirh/port.c

    r4cdac68 rb828907  
    6363        return pio_read_16(port->address);
    6464}
    65 /*----------------------------------------------------------------------------*/
     65
    6666/** Register writing helper function.
    6767 *
    … …  
    7575        pio_write_16(port->address, val);
    7676}
    77 /*----------------------------------------------------------------------------*/
     77
    7878/** Initialize UHCI root hub port instance.
    7979 *
    … …  
    127127        return EOK;
    128128}
    129 /*----------------------------------------------------------------------------*/
     129
    130130/** Cleanup UHCI root hub port instance.
    131131 *
    … …  
    141141        return;
    142142}
    143 /*----------------------------------------------------------------------------*/
     143
    144144/** Periodically checks port status and reports new devices.
    145145 *
    … …  
    210210        return EOK;
    211211}
    212 /*----------------------------------------------------------------------------*/
     212
    213213/** Callback for enabling port during adding a new device.
    214214 *
    … …  
    247247        return EOK;
    248248}
    249 /*----------------------------------------------------------------------------*/
     249
    250250/** Initialize and report connected device.
    251251 *
    … …  
    282282        return EOK;
    283283}
    284 /*----------------------------------------------------------------------------*/
     284
    285285/** Remove device.
    286286 *
    … …  
    324324        return EOK;
    325325}
    326 /*----------------------------------------------------------------------------*/
     326
    327327/** Enable or disable root hub port.
    328328 *
    … …  
    358358        return EOK;
    359359}
    360 /*----------------------------------------------------------------------------*/
     360
    361361/** Print the port status value in a human friendly way
    362362 *
Note: See TracChangeset for help on using the changeset viewer.