Changeset 3843ecb in mainline for uspace/lib/libdrv

Timestamp:

2010-04-09T13:54:06Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

892e4e1

Parents:

3a5909f

Message:

device classes as interface sets

Location:

uspace/lib/libdrv

Files:

• generic/dev_iface.c (modified) (1 diff)
• generic/driver.c (modified) (4 diffs)
• include/driver.h (modified) (4 diffs)

uspace/lib/libdrv/generic/dev_iface.c

@@ -45 +45 @@
 };
 
-remote_iface_t* get_remote_iface(dev_inferface_id_t id)
-{
-        assert(is_valid_iface_id(id));
-        
-        int idx = get_iface_index(id);
+remote_iface_t* get_remote_iface(int idx)
+{       
+        assert(is_valid_iface_idx(idx));        
         return remote_ifaces.ifaces[idx];       
 }

uspace/lib/libdrv/generic/driver.c

@@ -177 +177 @@
                 callid = async_get_call(&call);
                 ipcarg_t method = IPC_GET_METHOD(call);
+                int iface_idx;
+                
                 switch  (method) {
                 case IPC_M_PHONE_HUNGUP:
@@ -184 +186 @@
                         ipc_answer_0(callid, EOK);
                         return;
-                default:
-
-                        if (!is_valid_iface_id(method)) {
+                default:                
+                        // convert ipc interface id to interface index
+                        
+                        iface_idx = DEV_IFACE_IDX(method);
+                        
+                        if (!is_valid_iface_idx(iface_idx)) {
                                 // this is not device's interface
                                 printf("%s: driver_connection_gen error - invalid interface id %x.", driver->name, method);
@@ -196 +201 @@
                         
                         // get the device interface structure
-                        void *iface = device_get_iface(dev, method);
+                        void *iface = device_get_iface(dev, iface_idx);
                         if (NULL == iface) {
                                 printf("%s: driver_connection_gen error - ", driver->name);
@@ -205 +210 @@
 
                         // get the corresponding interface for remote request handling ("remote interface")
-                        remote_iface_t* rem_iface = get_remote_iface(method);
+                        remote_iface_t* rem_iface = get_remote_iface(iface_idx);
                         assert(NULL != rem_iface);
 

uspace/lib/libdrv/include/driver.h

@@ -39 +39 @@
 #include <ipc/devman.h>
 #include <ipc/dev_iface.h>
+#include <device/hw_res.h>
 #include <assert.h>
 
@@ -59 +60 @@
 } iface_dipatch_table_t;
 
-static inline int get_iface_index(dev_inferface_id_t id)
+
+static inline bool is_valid_iface_idx(int idx)
 {
-        return id - DEV_IFACE_FIRST;
+        return 0 <= idx && idx < DEV_IFACE_MAX;
 }
 
-static inline bool is_valid_iface_id(dev_inferface_id_t id)
-{
-        return DEV_IFACE_FIRST <= id && id < DEV_IFACE_MAX;
-}
+remote_iface_t* get_remote_iface(int idx);
+remote_iface_func_ptr_t get_remote_method(remote_iface_t *rem_iface, ipcarg_t iface_method_idx);
 
-remote_iface_t* get_remote_iface(dev_inferface_id_t id);
-remote_iface_func_ptr_t get_remote_method(remote_iface_t *rem_iface, ipcarg_t iface_method_idx);
+
+// device class
+
+/** Devices belonging to the same class should implement the same set of interfaces.*/
+typedef struct device_class {
+        /** Unique identification of the class. */
+        int id;
+        /** The table of interfaces implemented by the device. */
+        void *interfaces[DEV_IFACE_COUNT];      
+} device_class_t;
 
 
@@ -89 +97 @@
         /** The device driver's data associated with this device.*/
         void *driver_data;
-        /** The table of interfaces exported by this device. */
-        void *interfaces[DEV_IFACE_COUNT];
+        /** Device class consist of class id and table of interfaces supported by the device.*/
+        device_class_t *class;
         /** Pointer to the previous and next device in the list of devices handled by the driver */
         link_t link;
@@ -146 +154 @@
 }
 
-static inline void device_set_iface (device_t *dev, dev_inferface_id_t id, void *iface)
+static inline void * device_get_iface(device_t *dev, dev_inferface_idx_t idx)
 {
-        assert(is_valid_iface_id(id));
+        assert(is_valid_iface_idx(idx));        
 
-        int idx = get_iface_index(id);
-        dev->interfaces[idx] = iface;
-}
-
-static inline void * device_get_iface(device_t *dev, dev_inferface_id_t id)
-{
-        assert(is_valid_iface_id(id));
-        
-        int idx = get_iface_index(id);
-        return dev->interfaces[idx];    
+        return dev->class->interfaces[idx];     
 }