Changeset a32defa in mainline for uspace/srv/devman/main.c

Timestamp:

2010-06-01T20:53:07Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

a6e54c5d

Parents:

ce89036b

Message:

Register devices in the device tree by the device mapper so the device hierarchy can be seen from devfs.

File:

• uspace/srv/devman/main.c (modified) (4 diffs)

uspace/srv/devman/main.c

@@ -240 +240 @@
         
         // try to find suitable driver and assign it to the device
-        assign_driver(node, &drivers_list);     
+        assign_driver(node, &drivers_list, &device_tree);       
 }
 
@@ -247 +247 @@
         // create devmap path and name for the device
         char *devmap_pathname = NULL;
-        asprintf(&devmap_pathname, "%s/%s%s%s", DEVMAP_CLASS_NAMESPACE, cli->dev_class->name, DEVMAP_SEPARATOR, cli->dev_name);
+        asprintf(&devmap_pathname, "%s/%s%c%s", DEVMAP_CLASS_NAMESPACE, cli->dev_class->name, DEVMAP_SEPARATOR, cli->dev_name);
         if (NULL == devmap_pathname) {
                 return;
@@ -254 +254 @@
         // register the device by the device mapper and remember its devmap handle
         devmap_device_register(devmap_pathname, &cli->devmap_handle);   
+        
+        // add device to the hash map of class devices registered by device mapper
+        class_add_devmap_device(&class_list, cli);
         
         free(devmap_pathname);  
@@ -297 +300 @@
 {
         driver_t *driver = (driver_t *)drv;
-        initialize_running_driver(driver);      
+        initialize_running_driver(driver, &device_tree);        
         printf(NAME ": the %s driver was successfully initialized. \n", driver->name);
         return 0;