Changeset ba7f671 in mainline

Timestamp:

2010-11-28T21:37:55Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1f43c8f

Parents:

fb1dca09

Message:

Code clean-up

Unified style for adding child devices.

Location:

uspace

Files:

• drv/usbkbd/usbkbd.ma (modified) (1 diff)
• lib/usb/src/hcdhubd.c (modified) (2 diffs)
• lib/usb/src/hcdrv.c (modified) (1 diff)

uspace/drv/usbkbd/usbkbd.ma

@@ -1 +1 @@
 10 usb&class=hid
+10 usb&hid

uspace/lib/usb/src/hcdhubd.c

@@ -40 +40 @@
 #include <bool.h>
 #include <errno.h>
+#include <str_error.h>
 #include <usb/classes/hub.h>
 
@@ -150 +151 @@
         match_id->id = child_info->match_id;
         match_id->score = 10;
-        printf("adding child device with match \"%s\"\n", match_id->id);
         add_match_id(&child->match_ids, match_id);
 
         rc = child_device_register(child, child_info->parent);
+        printf("%s: adding child device with match \"%s\" (%s)\n",
+            hc_driver->name, match_id->id, str_error(rc));
         if (rc != EOK) {
                 goto failure;

uspace/lib/usb/src/hcdrv.c

@@ -78 +78 @@
         list_append(&hc_dev->link, &hc_list);
 
-        //add keyboard
-        /// @TODO this is not correct code
-
         /*
-         * Announce presence of child device.
+         * FIXME: the following is a workaround to force loading of USB
+         * keyboard driver.
+         * Will be removed as soon as the hub driver is completed and
+         * can detect connected devices.
          */
-        device_t *kbd = NULL;
-        match_id_t *match_id = NULL;
-
-        kbd = create_device();
-        if (kbd == NULL) {
-                printf("ERROR: enomem\n");
-        }
-        kbd->name = USB_KBD_DEVICE_NAME;
-
-        match_id = create_match_id();
-        if (match_id == NULL) {
-                printf("ERROR: enomem\n");
+        printf("%s: trying to add USB HID child device...\n", hc_driver->name);
+        rc = usb_hc_add_child_device(dev, USB_KBD_DEVICE_NAME, "usb&hid");
+        if (rc != EOK) {
+                printf("%s: adding USB HID child failed...\n", hc_driver->name);
         }
 
-        char *id;
-        rc = asprintf(&id, USB_KBD_DEVICE_NAME);
-        if (rc <= 0) {
-                printf("ERROR: enomem\n");
-                return rc;
-        }
-
-        match_id->id = id;
-        match_id->score = 30;
-
-        add_match_id(&kbd->match_ids, match_id);
-
-        rc = child_device_register(kbd, dev);
-        if (rc != EOK) {
-                printf("ERROR: cannot register kbd\n");
-                return rc;
-        }
-
-        printf("%s: registered root hub\n", dev->name);
         return EOK;
 }