Changeset 1f43c8f in mainline for uspace/lib/usb/src/hcdrv.c

Timestamp:

2010-11-28T22:14:41Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

78f01ff9, 7972b51

Parents:

ba7f671

Message:

Bugfixes and workarounds

Fixed problem when VHC died due to uninitialized list.

Another workaround for devman. Probably another deadlock. Oh, well.

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);
@@ -85 +94 @@
          */
         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");
+        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);