Changeset 78f01ff9 in mainline for uspace/lib/usb/src/hcdrv.c

Timestamp:

2010-11-28T22:25:01Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4570779, c39544a

Parents:

36bcf84f (diff), 1f43c8f (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 vojtechhorky/

File:

• uspace/lib/usb/src/hcdrv.c (modified) (3 diffs)

uspace/lib/usb/src/hcdrv.c

@@ -54 +54 @@
 };
 
-int usb_add_hc_device(device_t *dev)
-{
+static usb_hc_device_t *usb_hc_device_create(device_t *dev) {
         usb_hc_device_t *hc_dev = malloc(sizeof (usb_hc_device_t));
+
         list_initialize(&hc_dev->link);
+        list_initialize(&hc_dev->hubs);
+        list_initialize(&hc_dev->attached_devices);
         hc_dev->transfer_ops = NULL;
 
@@ -63 +65 @@
         dev->ops = &usb_device_ops;
         hc_dev->generic->driver_data = hc_dev;
+
+        return hc_dev;
+}
+
+int usb_add_hc_device(device_t *dev)
+{
+        usb_hc_device_t *hc_dev = usb_hc_device_create(dev);
 
         int rc = hc_driver->add_hc(hc_dev);
@@ -78 +87 @@
         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", false);
+        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;
 }