Changeset 31860b7 in mainline

Timestamp:

2010-11-21T17:30:59Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

8cd1aa5e

Parents:

1fe9bf6 (diff), 0ee648a (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 from ddf_proposal

File:

• uspace/lib/usb/src/hcdhubd.c (modified) (4 diffs)

uspace/lib/usb/src/hcdhubd.c

@@ -39 +39 @@
 #include <errno.h>
 
+#define USB_HUB_DEVICE_NAME "usbhub"
+
 /** List of handled host controllers. */
 static LIST_INITIALIZE(hc_list);
@@ -65 +67 @@
          * was connected.
          */
-        bool is_hc = true;
+        bool is_hc = str_cmp(dev->name, USB_HUB_DEVICE_NAME) != 0;
+        printf("%s: add_device(name=\"%s\")\n", hc_driver->name, dev->name);
 
         if (is_hc) {
@@ -95 +98 @@
                 return EOK;
         } else {
+                printf("%s: hub added, hurrah!\n", hc_driver->name);
                 /*
                  * We are some (probably deeply nested) hub.
@@ -230 +234 @@
                 goto failure;
         }
-        hub->name = "usbhub";
+        hub->name = USB_HUB_DEVICE_NAME;
 
         match_id = create_match_id();