Changes in / [4144630:2cb6571] in mainline

Files:

• kernel/generic/include/ipc/ipc.h (modified) (1 diff)
• uspace/drv/uhci/main.c (modified) (1 diff)
• uspace/lib/usb/include/usb/hcdhubd.h (modified) (1 diff)
• uspace/lib/usb/src/hcdhubd.c (modified) (3 diffs)
• uspace/lib/usb/src/localdrv.c (modified) (1 diff)
• uspace/lib/usb/src/usbdrv.c (modified) (1 diff)

kernel/generic/include/ipc/ipc.h

@@ -45 +45 @@
 /** Maximum active async calls per thread */
 #ifdef CONFIG_DEBUG
-        #define IPC_MAX_ASYNC_CALLS  4
+        #define IPC_MAX_ASYNC_CALLS  16
 #else
         #define IPC_MAX_ASYNC_CALLS  4000

uspace/drv/uhci/main.c

@@ -77 +77 @@
         /*
          * We need to announce the presence of our root hub.
-         * Commented out until the problem which causes the whole task to
-         * block is solved.
          */
-        //usb_hcd_add_root_hub(device);
+        usb_hcd_add_root_hub(device);
 
         return EOK;

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

@@ -191 +191 @@
  */
 
+device_t *usb_hc_connect(device_t *);
 
 int usb_hc_async_interrupt_out(usb_hc_device_t *, usb_target_t,

uspace/lib/usb/src/hcdhubd.c

@@ -107 +107 @@
 int usb_hcd_add_root_hub(usb_hc_device_t *dev) {
         char *id;
-        int rc = asprintf(&id, "usb&hc=%s&hub", dev->generic->name);
+        int rc = asprintf(&id, "usb&hc=%s&hub", hc_driver->name);
         if (rc <= 0) {
                 return rc;
@@ -133 +133 @@
         int rc;
 
+        async_usleep(1000);
+
         device_t *child = create_device();
         match_id_t *match_id = NULL;
@@ -196 +198 @@
         printf("%s: about to add child device `%s' (%s)\n", hc_driver->name,
                         name, match_id);
+
+        /*
+         * Seems that creating fibril which postpones the action
+         * is the best solution.
+         */
+        create_fibril = true;
 
         struct child_device_info *child_info

uspace/lib/usb/src/localdrv.c

@@ -39 +39 @@
 #include <errno.h>
 
+/** Find host controller when handled by current task.
+ *
+ * @param dev Device asking for connection.
+ * @return Device structure corresponding to parent host controller.
+ * @retval NULL Corresponding host controller not found.
+ */
+device_t *usb_hc_connect(device_t *dev)
+{
+        /*
+         * FIXME: this will not work when some hub on the path is
+         * not driven by the same task.
+         */
+        device_t *parent = dev;
+        while (parent->parent != NULL) {
+                parent = parent->parent;
+        }
+        
+        if (dev == parent) {
+                printf("FIXME in %s:%d encountered!\n", __FILE__, __LINE__);
+                parent = NULL;
+        }
+
+        return parent;
+}
+
 /** Information about pending transaction on HC. */
 typedef struct {

uspace/lib/usb/src/usbdrv.c

@@ -55 +55 @@
 /** Connect to host controller the device is physically attached to.
  *
- * @param handle Device handle.
+ * @param dev Device asking for connection.
  * @param flags Connection flags (blocking connection).
  * @return Phone to corresponding HC or error code.