Changeset 4570779 in mainline


Ignore:
Timestamp:
2010-12-03T10:41:46Z (14 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:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/generic/include/ipc/ipc.h

    r78f01ff9 r4570779  
    4545/** Maximum active async calls per thread */
    4646#ifdef CONFIG_DEBUG
    47         #define IPC_MAX_ASYNC_CALLS  4
     47        #define IPC_MAX_ASYNC_CALLS  16
    4848#else
    4949        #define IPC_MAX_ASYNC_CALLS  4000
  • uspace/drv/uhci/main.c

    r78f01ff9 r4570779  
    7777        /*
    7878         * We need to announce the presence of our root hub.
    79          * Commented out until the problem which causes the whole task to
    80          * block is solved.
    8179         */
    82         //usb_hcd_add_root_hub(device);
     80        usb_hcd_add_root_hub(device);
    8381
    8482        return EOK;
  • uspace/lib/usb/src/hcdhubd.c

    r78f01ff9 r4570779  
    108108{
    109109        char *id;
    110         int rc = asprintf(&id, "usb&hc=%s&hub", dev->generic->name);
     110        int rc = asprintf(&id, "usb&hc=%s&hub", hc_driver->name);
    111111        if (rc <= 0) {
    112112                return rc;
     
    135135        int rc;
    136136
     137        async_usleep(1000);
     138
    137139        device_t *child = create_device();
    138140        match_id_t *match_id = NULL;
     
    199201        printf("%s: about to add child device `%s' (%s)\n", hc_driver->name,
    200202            name, match_id);
     203
     204        /*
     205         * Seems that creating fibril which postpones the action
     206         * is the best solution.
     207         */
     208        create_fibril = true;
    201209
    202210        struct child_device_info *child_info
Note: See TracChangeset for help on using the changeset viewer.