Changeset 3843ecb in mainline for uspace/lib/libdrv/generic

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/generic

Files:

• dev_iface.c (modified) (1 diff)
• driver.c (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);