Changeset 692c40cb in mainline

Timestamp:

2010-05-28T09:04:37Z (14 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5159ae9

Parents:

c9f3b45c

Message:

Introduce device classes.Device class specifies functional type of the device. Device classes are identified by their string names (actually device class is just a string value). Device classes can be dynamically added. A device can be added to any number of classes.

Location:

uspace

Files:

• lib/c/generic/devman.c (modified) (1 diff)
• lib/c/include/devman.h (modified) (1 diff)
• lib/c/include/ipc/devman.h (modified) (1 diff)
• lib/drv/generic/driver.c (modified) (1 diff)
• lib/drv/include/driver.h (modified) (2 diffs)
• srv/devman/devman.c (modified) (1 diff)
• srv/devman/devman.h (modified) (5 diffs)
• srv/devman/main.c (modified) (4 diffs)
• srv/drivers/ns8250/ns8250.c (modified) (1 diff)

uspace/lib/c/generic/devman.c

@@ -180 +180 @@
 }
 
+int devman_add_device_to_class(device_handle_t dev_handle, const char *class_name)
+{
+        int phone = devman_get_phone(DEVMAN_DRIVER, IPC_FLAG_BLOCKING);
+        
+        if (phone < 0)
+                return phone;
+        
+        async_serialize_start();
+        ipc_call_t answer;
+        aid_t req = async_send_1(phone, DEVMAN_ADD_DEVICE_TO_CLASS, dev_handle, &answer);
+        
+        ipcarg_t retval = async_data_write_start(phone, class_name, str_size(class_name));
+        if (retval != EOK) {
+                async_wait_for(req, NULL);
+                async_serialize_end();
+                return retval;
+        }
+        
+        async_wait_for(req, &retval);
+        async_serialize_end();
+        
+        return retval;  
+}
+
 void devman_hangup_phone(devman_interface_t iface)
 {

uspace/lib/c/include/devman.h

@@ -53 +53 @@
 int devman_device_get_handle(const char *pathname, device_handle_t *handle, unsigned int flags);
 
+int devman_add_device_to_class(device_handle_t dev_handle, const char *class_name);
 
 #endif

uspace/lib/c/include/ipc/devman.h

@@ -129 +129 @@
         DEVMAN_DRIVER_REGISTER = IPC_FIRST_USER_METHOD,
         DEVMAN_ADD_CHILD_DEVICE,
-        DEVMAN_ADD_MATCH_ID
+        DEVMAN_ADD_MATCH_ID,
+        DEVMAN_ADD_DEVICE_TO_CLASS
 
 } driver_to_devman_t;

uspace/lib/drv/generic/driver.c

@@ -49 +49 @@
 #include <errno.h>
 
-#include <devman.h>
-#include <ipc/devman.h>
 #include <ipc/driver.h>
 

uspace/lib/drv/include/driver.h

@@ -38 +38 @@
 #include <adt/list.h>
 #include <ipc/ipc.h>
+#include <devman.h>
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
@@ -286 +287 @@
 }
 
+static inline int add_device_to_class(device_t *dev, const char *class_name)
+{
+        return devman_add_device_to_class(dev->handle, class_name);
+}
+
 #endif
 

uspace/srv/devman/devman.c

@@ -807 +807 @@
  */
 dev_class_info_t * add_device_to_class(node_t *dev, dev_class_t *cl, const char *base_dev_name)
-{
+{       
         dev_class_info_t *info = create_dev_class_info();
-        info->dev_class = cl;
-        info->dev = dev;
-        
-        // add the device to the class
-        fibril_mutex_lock(&cl->mutex);
-        list_append(&info->link, &cl->devices);
-        fibril_mutex_unlock(&cl->mutex);
-        
-        // add the class to the device
-        list_append(&info->dev_classes, &dev->classes);
-        
-        // create unique name for the device within the class
-        info->dev_name = create_dev_name_for_class(cl, base_dev_name);  
+        if (NULL != info) {
+                info->dev_class = cl;
+                info->dev = dev;
+                
+                // add the device to the class
+                fibril_mutex_lock(&cl->mutex);
+                list_append(&info->link, &cl->devices);
+                fibril_mutex_unlock(&cl->mutex);
+                
+                // add the class to the device
+                list_append(&info->dev_classes, &dev->classes);
+                
+                // create unique name for the device within the class
+                info->dev_name = create_dev_name_for_class(cl, base_dev_name);  
+        }
         
         return info;
 }
 
+dev_class_t * get_dev_class(class_list_t *class_list, char *class_name)
+{
+        dev_class_t *cl;
+        fibril_mutex_lock(&class_list->classes_mutex);  
+        cl = find_dev_class_no_lock(class_list, class_name);
+        if (NULL == cl) {
+                cl = create_dev_class();
+                if (NULL != cl) {
+                        cl->name = class_name;  
+                        cl->base_dev_name = "";
+                        add_dev_class_no_lock(class_list, cl);
+                }               
+        }       
+        fibril_mutex_unlock(&class_list->classes_mutex);
+        return cl;
+}
+
+dev_class_t * find_dev_class_no_lock(class_list_t *class_list, const char *class_name)
+{
+        dev_class_t *cl;
+        link_t *link = class_list->classes.next;
+        while (link != &class_list->classes) {
+                cl = list_get_instance(link, dev_class_t, link);
+                if (0 == str_cmp(cl->name, class_name)) {
+                        return cl;
+                }
+        }
+        
+        return NULL;    
+}
+
 /** @}
  */

uspace/srv/devman/devman.h

@@ -158 +158 @@
         link_t link;    
         /** List of dev_class_info structures - one for each device registered by this class.*/
-        link_t devices; 
-        /** Default base name for the device within the class, might be overrided by the driver.*/
+        link_t devices;
+        /** Default base name for the device within the class, might be overrided by the driver.*/      
         const char *base_dev_name;
-        /** Unique numerical identifier appened to the base name of the newly added device.*/
+        /** Unique numerical identifier of the newly added device.*/
         size_t curr_dev_idx;
         /** Synchronize access to the list of devices in this class. */
@@ -185 +185 @@
 } dev_class_info_t;
 
+/** The list of device classes. */
+typedef struct class_list {
+        /** List of classes */
+        link_t classes;
+        /** Fibril mutex for list of classes. */
+        fibril_mutex_t classes_mutex;   
+} class_list_t;
+
 // Match ids and scores
 
@@ -282 +290 @@
 {
         node_t *res = malloc(sizeof(node_t));
+        
         if (res != NULL) {
                 memset(res, 0, sizeof(node_t));
+                list_initialize(&res->children);
+                list_initialize(&res->match_ids.ids);
+                list_initialize(&res->classes);
         }
-        
-        list_initialize(&res->children);
-        list_initialize(&res->match_ids.ids);
         
         return res;
@@ -364 +373 @@
         if (NULL != cl) {
                 memset(cl, 0, sizeof(dev_class_t));
+                list_initialize(&cl->devices);
                 fibril_mutex_initialize(&cl->mutex);
         }
@@ -394 +404 @@
 dev_class_info_t * add_device_to_class(node_t *dev, dev_class_t *cl, const char *base_dev_name);
 
+static inline void init_class_list(class_list_t *class_list)
+{
+        list_initialize(&class_list->classes);
+        fibril_mutex_initialize(&class_list->classes_mutex);
+}
+
+dev_class_t * get_dev_class(class_list_t *class_list, char *class_name);
+dev_class_t * find_dev_class_no_lock(class_list_t *class_list, const char *class_name);
+
+static inline void add_dev_class_no_lock(class_list_t *class_list, dev_class_t *cl)
+{
+        list_append(&cl->link, &class_list->classes);
+}
+
 #endif
 

uspace/srv/devman/main.c

@@ -60 +60 @@
 static driver_list_t drivers_list;
 static dev_tree_t device_tree;
+static class_list_t class_list;
 
 
@@ -240 +241 @@
         // try to find suitable driver and assign it to the device      
         assign_driver(node, &drivers_list);     
+}
+
+static void devman_add_device_to_class(ipc_callid_t callid, ipc_call_t *call)
+{               
+        device_handle_t handle = IPC_GET_ARG1(*call);
+        
+        // Get class name
+        char *class_name;
+        int rc = async_data_write_accept((void **)&class_name, true, 0, 0, 0, 0);
+        if (rc != EOK) {
+                ipc_answer_0(callid, rc);
+                return;
+        }       
+        
+        node_t *dev = find_dev_node(&device_tree, handle);
+        if (NULL == dev) {
+                ipc_answer_0(callid, ENOENT);
+                return;
+        }
+        
+        dev_class_t *cl = get_dev_class(&class_list, class_name);
+        
+        dev_class_info_t *class_info = add_device_to_class(dev, cl, NULL);
+        
+        // TODO register the device's class alias by devmapper
+        
+        printf(NAME ": device '%s' added to class '%s', class name '%s' was asigned to it\n", dev->pathname, class_name, class_info->dev_name);
+        
+        ipc_answer_0(callid, EOK);      
 }
 
@@ -294 +324 @@
                 case DEVMAN_ADD_CHILD_DEVICE:
                         devman_add_child(callid, &call);
+                        break;
+                case DEVMAN_ADD_DEVICE_TO_CLASS:
+                        devman_add_device_to_class(callid, &call);
                         break;
                 default:
@@ -444 +477 @@
         }
 
+        init_class_list(&class_list);
+        
         return true;
 }

uspace/srv/drivers/ns8250/ns8250.c

@@ -760 +760 @@
         dev->class = &ns8250_dev_class;
         
+        add_device_to_class(dev, "serial");
+        
         printf(NAME ": the %s device has been successfully initialized.\n", dev->name);