Changeset 3b5d1535 in mainline for uspace/drv/uhci-rhd/port.c


Ignore:
Timestamp:
2011-02-23T10:28:21Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
eb48f61
Parents:
e936e8e (diff), eb1a2f4 (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/uhci-rhd/port.c

    re936e8e r3b5d1535  
    5252int uhci_port_init(
    5353  uhci_port_t *port, port_status_t *address, unsigned number,
    54   unsigned usec, device_t *rh, int parent_phone)
     54  unsigned usec, ddf_dev_t *rh, int parent_phone)
    5555{
    5656        assert(port);
    … …  
    187187            USB_SPEED_FULL,
    188188            new_device_enable_port, port->number, port,
    189             &dev_addr, &port->attached_device);
     189            &dev_addr, &port->attached_device, NULL, NULL, NULL);
    190190        if (rc != EOK) {
    191191                usb_log_error("Failed adding new device on port %u: %s.\n",
Note: See TracChangeset for help on using the changeset viewer.