Changeset e1e4192 in mainline for uspace/drv


Ignore:
Timestamp:
2012-06-03T20:45:58Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
90478727
Parents:
f7e69f5 (diff), 3123d2a (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

Location:
uspace/drv/bus/usb
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/bus/usb/ehci/res.c

    rf7e69f5 re1e4192  
    109109        return EOK;
    110110}
    111 /*----------------------------------------------------------------------------*/
     111
    112112/** Calls the PCI driver with a request to enable interrupts
    113113 *
    … …  
    127127        return enabled ? EOK : EIO;
    128128}
    129 /*----------------------------------------------------------------------------*/
     129
    130130/** Implements BIOS hands-off routine as described in EHCI spec
    131131 *

  • uspace/drv/bus/usb/uhci/res.c

    rf7e69f5 re1e4192  
    8686        return EOK;
    8787}
    88 /*----------------------------------------------------------------------------*/
     88
    8989/** Call the PCI driver with a request to enable interrupts
    9090 *
    … …  
    105105        return enabled ? EOK : EIO;
    106106}
    107 /*----------------------------------------------------------------------------*/
     107
    108108/** Call the PCI driver with a request to clear legacy support register
    109109 *
Note: See TracChangeset for help on using the changeset viewer.