Changeset 2133e02 in mainline for uspace/lib/c/generic/devman.c

Timestamp:

2015-08-18T20:14:05Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

1a522e5

Parents:

84dc30c

Message:

canonically reserve the first argument of IPC_M_CONNECT_ME_TO for interface type
naming service: service handle in IPC_M_CONNECT_ME_TO needs to be shifted to the second argument
service connections that use the untyped (fallback) port can only provide one additional argument now

File:

• uspace/lib/c/generic/devman.c (modified) (6 diffs)

uspace/lib/c/generic/devman.c

@@ -89 +89 @@
                         if (devman_driver_block_sess == NULL)
                                 devman_driver_block_sess =
-                                    service_connect_blocking(EXCHANGE_PARALLEL,
-                                    SERVICE_DEVMAN, DEVMAN_DRIVER, 0);
+                                    service_connect_blocking_iface(EXCHANGE_PARALLEL,
+                                    DEVMAN_DRIVER, SERVICE_DEVMAN, 0);
                 }
                 
@@ -108 +108 @@
                         if (devman_client_block_sess == NULL)
                                 devman_client_block_sess =
-                                    service_connect_blocking(EXCHANGE_SERIALIZE,
-                                    SERVICE_DEVMAN, DEVMAN_CLIENT, 0);
+                                    service_connect_blocking_iface(EXCHANGE_SERIALIZE,
+                                    DEVMAN_CLIENT, SERVICE_DEVMAN, 0);
                 }
                 
@@ -138 +138 @@
                 if (devman_driver_sess == NULL)
                         devman_driver_sess =
-                            service_connect(EXCHANGE_PARALLEL, SERVICE_DEVMAN,
-                            DEVMAN_DRIVER, 0);
+                            service_connect_iface(EXCHANGE_PARALLEL, DEVMAN_DRIVER,
+                            SERVICE_DEVMAN, 0);
                 
                 fibril_mutex_unlock(&devman_driver_mutex);
@@ -152 +152 @@
                 if (devman_client_sess == NULL)
                         devman_client_sess =
-                            service_connect(EXCHANGE_SERIALIZE, SERVICE_DEVMAN,
-                            DEVMAN_CLIENT, 0);
+                            service_connect_iface(EXCHANGE_SERIALIZE, DEVMAN_CLIENT,
+                            SERVICE_DEVMAN, 0);
                 
                 fibril_mutex_unlock(&devman_client_mutex);
@@ -293 +293 @@
         
         if (flags & IPC_FLAG_BLOCKING)
-                sess = service_connect_blocking(mgmt, SERVICE_DEVMAN,
-                            DEVMAN_CONNECT_TO_DEVICE, handle);
+                sess = service_connect_blocking_iface(mgmt, DEVMAN_CONNECT_TO_DEVICE,
+                    SERVICE_DEVMAN, handle);
         else
-                sess = service_connect(mgmt, SERVICE_DEVMAN,
-                            DEVMAN_CONNECT_TO_DEVICE, handle);
+                sess = service_connect_iface(mgmt, DEVMAN_CONNECT_TO_DEVICE,
+                    SERVICE_DEVMAN, handle);
         
         return sess;
@@ -351 +351 @@
         
         if (flags & IPC_FLAG_BLOCKING)
-                sess = service_connect_blocking(mgmt, SERVICE_DEVMAN,
-                            DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
+                sess = service_connect_blocking_iface(mgmt,
+                            DEVMAN_CONNECT_TO_PARENTS_DEVICE, SERVICE_DEVMAN, handle);
         else
-                sess = service_connect(mgmt, SERVICE_DEVMAN,
-                            DEVMAN_CONNECT_TO_PARENTS_DEVICE, handle);
+                sess = service_connect_iface(mgmt,
+                            DEVMAN_CONNECT_TO_PARENTS_DEVICE, SERVICE_DEVMAN, handle);
         
         return sess;