Changeset 0c00dac in mainline for uspace/drv

Timestamp:

2011-02-18T13:36:52Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

026d6e2, 50ba203, b6c7da6

Parents:

ec59693 (diff), 6427cf67 (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 low/high speed hack

Location:

uspace/drv

Files:

• uhci-hcd/iface.c (modified) (2 diffs)
• uhci-rhd/port.c (modified) (2 diffs)
• vhc/connhost.c (modified) (2 diffs)

uspace/drv/uhci-hcd/iface.c

@@ -54 +54 @@
 }
 /*----------------------------------------------------------------------------*/
-static int reserve_default_address(device_t *dev)
+static int reserve_default_address(device_t *dev, bool full_speed)
 {
         assert(dev);
@@ -72 +72 @@
 }
 /*----------------------------------------------------------------------------*/
-static int request_address(device_t *dev, usb_address_t *address)
+static int request_address(device_t *dev, bool full_speed,
+    usb_address_t *address)
 {
         assert(dev);

uspace/drv/uhci-rhd/port.c

@@ -140 +140 @@
 
         /* get address of the future device */
-        const usb_address_t usb_address = usb_hc_request_address(&port->hc_connection);
+        const usb_address_t usb_address = usb_hc_request_address(
+            &port->hc_connection, true);
 
         if (usb_address <= 0) {
@@ -150 +151 @@
 
         /* get default address */
-        int ret = usb_hc_reserve_default_address(&port->hc_connection);
+        int ret = usb_hc_reserve_default_address(&port->hc_connection, true);
         if (ret != EOK) {
                 usb_log_error("Failed to reserve default address on port %d.\n",

uspace/drv/vhc/connhost.c

@@ -390 +390 @@
 
 
-static int reserve_default_address(device_t *dev)
+static int reserve_default_address(device_t *dev, bool ignored)
 {
         usb_address_keeping_reserve_default(&addresses);
@@ -402 +402 @@
 }
 
-static int request_address(device_t *dev, usb_address_t *address)
+static int request_address(device_t *dev, bool ignored, usb_address_t *address)
 {
         usb_address_t addr = usb_address_keeping_request(&addresses);