Changeset 2133e02 in mainline for uspace/lib/c/generic/loc.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/loc.c (modified) (5 diffs)

uspace/lib/c/generic/loc.c

@@ -147 +147 @@
                         if (loc_supp_block_sess == NULL)
                                 loc_supp_block_sess =
-                                    service_connect_blocking(EXCHANGE_SERIALIZE,
-                                    SERVICE_LOC, LOC_PORT_SUPPLIER, 0);
+                                    service_connect_blocking_iface(EXCHANGE_SERIALIZE,
+                                    LOC_PORT_SUPPLIER, SERVICE_LOC, 0);
                 }
                 
@@ -166 +166 @@
                         if (loc_cons_block_sess == NULL)
                                 loc_cons_block_sess =
-                                    service_connect_blocking(EXCHANGE_SERIALIZE,
-                                    SERVICE_LOC, LOC_PORT_CONSUMER, 0);
+                                    service_connect_blocking_iface(EXCHANGE_SERIALIZE,
+                                    LOC_PORT_CONSUMER, SERVICE_LOC, 0);
                 }
                 
@@ -196 +196 @@
                 if (loc_supplier_sess == NULL)
                         loc_supplier_sess =
-                            service_connect(EXCHANGE_SERIALIZE, SERVICE_LOC,
-                            LOC_PORT_SUPPLIER, 0);
+                            service_connect_iface(EXCHANGE_SERIALIZE, LOC_PORT_SUPPLIER,
+                            SERVICE_LOC, 0);
                 
                 fibril_mutex_unlock(&loc_supplier_mutex);
@@ -210 +210 @@
                 if (loc_consumer_sess == NULL)
                         loc_consumer_sess =
-                            service_connect(EXCHANGE_SERIALIZE, SERVICE_LOC,
-                            LOC_PORT_CONSUMER, 0);
+                            service_connect_iface(EXCHANGE_SERIALIZE, LOC_PORT_CONSUMER,
+                            SERVICE_LOC, 0);
                 
                 fibril_mutex_unlock(&loc_consumer_mutex);
@@ -575 +575 @@
         
         if (flags & IPC_FLAG_BLOCKING)
-                sess = service_connect_blocking(mgmt, SERVICE_LOC,
-                    LOC_CONNECT_TO_SERVICE, handle);
+                sess = service_connect_blocking_iface(mgmt, LOC_CONNECT_TO_SERVICE,
+                    SERVICE_LOC, handle);
         else
-                sess = service_connect(mgmt, SERVICE_LOC,
-                    LOC_CONNECT_TO_SERVICE, handle);
+                sess = service_connect_iface(mgmt, LOC_CONNECT_TO_SERVICE,
+                    SERVICE_LOC, handle);
         
         return sess;