Changeset d35ac1d in mainline for uspace/lib/drv/generic/driver.c

Timestamp:

2011-01-09T19:52:08Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36f2b3e

Parents:

8871dba

Message:

Rename iface to ops in driver.c

File:

• uspace/lib/drv/generic/driver.c (modified) (10 diffs)

uspace/lib/drv/generic/driver.c

@@ -140 +140 @@
 }
 
-static device_t * driver_get_device(link_t *devices, devman_handle_t handle)
+static device_t *driver_get_device(link_t *devices, devman_handle_t handle)
 {
         device_t *dev = NULL;
@@ -164 +164 @@
         int res = EOK;
         
-        devman_handle_t dev_handle =  IPC_GET_ARG1(*icall);
+        devman_handle_t dev_handle = IPC_GET_ARG1(*icall);
         devman_handle_t parent_dev_handle = IPC_GET_ARG2(*icall);
-    
+        
         device_t *dev = create_device();
         dev->handle = dev_handle;
@@ -177 +177 @@
         
         res = driver->driver_ops->add_device(dev);
-        if (0 == res) {
+        if (res == 0) {
                 printf("%s: new device with handle=%" PRIun " was added.\n",
                     driver->name, dev_handle);
@@ -246 +246 @@
                 ret = (*dev->ops->open)(dev);
         
-        ipc_answer_0(iid, ret); 
+        ipc_answer_0(iid, ret);
         if (EOK != ret)
                 return;
@@ -258 +258 @@
                 
                 switch  (method) {
-                case IPC_M_PHONE_HUNGUP:                
+                case IPC_M_PHONE_HUNGUP:
                         /* close the device */
                         if (NULL != dev->ops && NULL != dev->ops->close)
@@ -264 +264 @@
                         ipc_answer_0(callid, EOK);
                         return;
-                default:                
+                default:
                         /* convert ipc interface id to interface index */
                         
@@ -289 +289 @@
                         /* calling one of the device's interfaces */
                         
-                        /* get the device interface structure */
-                        void *iface = device_get_iface(dev, iface_idx);
-                        if (NULL == iface) {
+                        /* Get the interface ops structure. */
+                        void *ops = device_get_ops(dev, iface_idx);
+                        if (ops == NULL) {
                                 printf("%s: driver_connection_gen error - ",
                                     driver->name);
@@ -304 +304 @@
                          * handling ("remote interface").
                          */
-                        remote_iface_t* rem_iface = get_remote_iface(iface_idx);
+                        remote_iface_t *rem_iface = get_remote_iface(iface_idx);
                         assert(NULL != rem_iface);
 
@@ -325 +325 @@
                          * associated with the device by its driver.
                          */
-                        (*iface_method_ptr)(dev, iface, callid, &call);
+                        (*iface_method_ptr)(dev, ops, callid, &call);
                         break;
                 }
@@ -377 +377 @@
         if (EOK == res)
                 return res;
-        remove_from_devices_list(child);        
+        remove_from_devices_list(child);
         return res;
 }