Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 84439d7 in mainline for uspace/srv/devman/devman.c


Ignore:
Timestamp:
2010-12-05T09:34:46Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master
Children:
75732da
Parents:
56b962d (diff), 35537a7 (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 development/

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/devman/devman.c

    r56b962d r84439d7  
    651651       
    652652        /* Send the device to the driver. */
    653         aid_t req = async_send_1(phone, DRIVER_ADD_DEVICE, node->handle,
    654             &answer);
     653        devman_handle_t parent_handle;
     654        if (node->parent) {
     655                parent_handle = node->parent->handle;
     656        } else {
     657                parent_handle = 0;
     658        }
     659        aid_t req = async_send_2(phone, DRIVER_ADD_DEVICE, node->handle,
     660            parent_handle, &answer);
    655661       
    656662        /* Send the device's name to the driver. */
     
    10221028       
    10231029        size_t idx = get_new_class_dev_idx(cl);
    1024         asprintf(&dev_name, "%s%d", base_name, idx);
     1030        asprintf(&dev_name, "%s%zu", base_name, idx);
    10251031       
    10261032        return dev_name;
Note: See TracChangeset for help on using the changeset viewer.