Changeset 1f43c8f in mainline

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.

Location:

uspace/lib/usb

Files:

• include/usb/hcdhubd.h (modified) (2 diffs)
• src/hcdhubd.c (modified) (5 diffs)
• src/hcdrv.c (modified) (3 diffs)

uspace/lib/usb/include/usb/hcdhubd.h

@@ -37 +37 @@
 
 #include <adt/list.h>
+#include <bool.h>
 #include <driver.h>
 #include <usb/usb.h>
@@ -175 +176 @@
 int usb_hc_async_wait_for(usb_handle_t);
 
-int usb_hc_add_child_device(device_t *, const char *, const char *);
+int usb_hc_add_child_device(device_t *, const char *, const char *, bool);
 
 #endif

uspace/lib/usb/src/hcdhubd.c

@@ -113 +113 @@
         }
 
-        rc = usb_hc_add_child_device(dev->generic, USB_HUB_DEVICE_NAME, id);
+        rc = usb_hc_add_child_device(dev->generic, USB_HUB_DEVICE_NAME, id, true);
         if (rc != EOK) {
                 free(id);
@@ -153 +153 @@
         add_match_id(&child->match_ids, match_id);
 
+        printf("%s: adding child device `%s' with match \"%s\"\n",
+            hc_driver->name, child->name, match_id->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));
+        printf("%s: child device `%s' registration: %s\n",
+            hc_driver->name, child->name, str_error(rc));
+
         if (rc != EOK) {
                 goto failure;
@@ -175 +178 @@
 leave:
         free(arg);
-        return rc;
+        return EOK;
 }
 
@@ -182 +185 @@
  * driven by the same task, the child adding is done in separate fibril.
  * Not optimal, but it works.
+ * Update: not under all circumstances the new fibril is successful either.
+ * Thus the last parameter to let the caller choose.
  *
  * @param parent Parent device.
  * @param name Device name.
  * @param match_id Match id.
+ * @param create_fibril Whether to run the addition in new fibril.
  * @return Error code.
  */
 int usb_hc_add_child_device(device_t *parent, const char *name,
-    const char *match_id)
-{
+    const char *match_id, bool create_fibril)
+{
+        printf("%s: about to add child device `%s' (%s)\n", hc_driver->name,
+            name, match_id);
+
         struct child_device_info *child_info
             = malloc(sizeof(struct child_device_info));
@@ -198 +207 @@
         child_info->match_id = match_id;
 
-        fid_t fibril = fibril_create(fibril_add_child_device, child_info);
-        if (!fibril) {
-                return ENOMEM;
-        }
-        fibril_add_ready(fibril);
+        if (create_fibril) {
+                fid_t fibril = fibril_create(fibril_add_child_device, child_info);
+                if (!fibril) {
+                        return ENOMEM;
+                }
+                fibril_add_ready(fibril);
+        } else {
+                fibril_add_child_device(child_info);
+        }
 
         return EOK;

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);