Changeset 25696fea in mainline for uspace/drv/bus/usb/vhc/hub.c

Timestamp:

2011-10-15T20:05:00Z (14 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

22ceff3a

Parents:

1ccc32f (diff), 721d4b6e (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:

• uspace/drv/bus/usb/vhc/hub.c (modified) (2 diffs)

uspace/drv/bus/usb/vhc/hub.c

@@ -81 +81 @@
 }
 
-static int pretend_port_rest(int unused, void *unused2)
+static int pretend_port_rest(void *unused2)
 {
         return EOK;
@@ -114 +114 @@
 
         ddf_fun_t *hub_dev;
-        rc = usb_hc_new_device_wrapper(hc_dev->dev, &hc_conn,
-            USB_SPEED_FULL,
-            pretend_port_rest, 0, NULL,
-            NULL, NULL, &rh_ops, hc_dev, &hub_dev);
+        rc = usb_hc_new_device_wrapper(hc_dev->dev, &hc_conn, USB_SPEED_FULL,
+            pretend_port_rest, NULL, NULL, &rh_ops, hc_dev, &hub_dev);
         if (rc != EOK) {
                 usb_log_fatal("Failed to create root hub: %s.\n",