Changeset 692c40cb in mainline for uspace/lib

Timestamp:

2010-05-28T09:04:37Z (16 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/lib

Files:

• c/generic/devman.c (modified) (1 diff)
• c/include/devman.h (modified) (1 diff)
• c/include/ipc/devman.h (modified) (1 diff)
• drv/generic/driver.c (modified) (1 diff)
• drv/include/driver.h (modified) (2 diffs)

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