Changeset 4570779 in mainline

Timestamp:

2010-12-03T10:41:46Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1dd264b, 70c85211

Parents:

78f01ff9 (diff), 7972b51 (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/

Files:

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

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/src/hcdhubd.c

@@ -108 +108 @@
 {
         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;
@@ -135 +135 @@
         int rc;
 
+        async_usleep(1000);
+
         device_t *child = create_device();
         match_id_t *match_id = NULL;
@@ -199 +201 @@
         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