Changeset 2133e02 in mainline for uspace/srv

Timestamp:

2015-08-18T20:14:05Z (10 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

Location:

uspace/srv

Files:

• fs/cdfs/cdfs.c (modified) (1 diff)
• fs/exfat/exfat.c (modified) (1 diff)
• fs/ext4fs/ext4fs.c (modified) (1 diff)
• fs/fat/fat.c (modified) (1 diff)
• fs/locfs/locfs.c (modified) (1 diff)
• fs/mfs/mfs.c (modified) (1 diff)
• fs/tmpfs/tmpfs.c (modified) (1 diff)
• fs/udf/udf.c (modified) (1 diff)
• hid/input/input.c (modified) (1 diff)
• ns/clonable.c (modified) (1 diff)
• ns/ns.c (modified) (4 diffs)
• ns/service.c (modified) (5 diffs)

uspace/srv/fs/cdfs/cdfs.c

@@ -74 +74 @@
         
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_VFS, 0, 0);
+            SERVICE_VFS, 0);
         if (!vfs_sess) {
                 printf("%s: Unable to connect to VFS\n", NAME);

uspace/srv/fs/exfat/exfat.c

@@ -76 +76 @@
 
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_VFS, 0, 0);
+            SERVICE_VFS, 0);
         if (!vfs_sess) {
                 printf(NAME ": failed to connect to VFS\n");

uspace/srv/fs/ext4fs/ext4fs.c

@@ -66 +66 @@
         
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_VFS, 0, 0);
+            SERVICE_VFS, 0);
         if (!vfs_sess) {
                 printf("%s: Failed to connect to VFS\n", NAME);

uspace/srv/fs/fat/fat.c

@@ -76 +76 @@
         
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_VFS, 0, 0);
+            SERVICE_VFS, 0);
         if (!vfs_sess) {
                 printf(NAME ": failed to connect to VFS\n");

uspace/srv/fs/locfs/locfs.c

@@ -78 +78 @@
         
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_VFS, 0, 0);
+            SERVICE_VFS, 0);
         if (!vfs_sess) {
                 printf("%s: Unable to connect to VFS\n", NAME);

uspace/srv/fs/mfs/mfs.c

@@ -74 +74 @@
 
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_VFS, 0, 0);
+            SERVICE_VFS, 0);
 
         if (!vfs_sess) {

uspace/srv/fs/tmpfs/tmpfs.c

@@ -81 +81 @@
         
         async_sess_t *vfs_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-            SERVICE_VFS, 0, 0);
+            SERVICE_VFS, 0);
         if (!vfs_sess) {
                 printf(NAME ": Unable to connect to VFS\n");

uspace/srv/fs/udf/udf.c

@@ -74 +74 @@
         
         async_sess_t *vfs_sess =
-            service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_VFS, 0, 0);
+            service_connect_blocking(EXCHANGE_SERIALIZE, SERVICE_VFS, 0);
         if (!vfs_sess) {
                 log_msg(LOG_DEFAULT, LVL_FATAL, "Failed to connect to VFS");

uspace/srv/hid/input/input.c

@@ -746 +746 @@
                 while (irc_sess == NULL)
                         irc_sess = service_connect_blocking(EXCHANGE_SERIALIZE,
-                            SERVICE_IRC, 0, 0);
+                            SERVICE_IRC, 0);
         }
         

uspace/srv/ns/clonable.c

@@ -94 +94 @@
         ipc_answer_0(callid, EOK);
         
-        ipc_forward_fast(csr->callid, phone, IPC_GET_ARG2(csr->call),
+        ipc_forward_fast(csr->callid, phone, IPC_GET_ARG1(csr->call),
             IPC_GET_ARG3(csr->call), 0, IPC_FF_NONE);
         

uspace/srv/ns/ns.c

@@ -39 +39 @@
 #include <ipc/ns.h>
 #include <ipc/services.h>
+#include <abi/ipc/interfaces.h>
 #include <stdio.h>
 #include <errno.h>
@@ -74 +75 @@
                 sysarg_t retval;
                 
+                iface_t iface;
                 service_t service;
                 sysarg_t phone;
@@ -82 +84 @@
                         break;
                 case IPC_M_CONNECT_TO_ME:
-                        service = IPC_GET_ARG1(call);
+                        iface = IPC_GET_ARG1(call);
+                        service = IPC_GET_ARG2(call);
                         phone = IPC_GET_ARG5(call);
+                        
+                        (void) iface;
                         
                         /*
@@ -96 +101 @@
                         break;
                 case IPC_M_CONNECT_ME_TO:
-                        service = IPC_GET_ARG1(call);
+                        iface = IPC_GET_ARG1(call);
+                        service = IPC_GET_ARG2(call);
+                        
+                        (void) iface;
                         
                         /*

uspace/srv/ns/service.c

@@ -39 +39 @@
 #include "service.h"
 #include "ns.h"
-
 
 /** Service hash table item. */
@@ -84 +83 @@
         sysarg_t service;        /**< Number of the service. */
         ipc_callid_t callid;     /**< Call ID waiting for the connection */
-        sysarg_t arg2;           /**< Second argument */
+        sysarg_t iface;          /**< Interface argument */
         sysarg_t arg3;           /**< Third argument */
 } pending_conn_t;
@@ -112 +111 @@
                 
                 hashed_service_t *hs = hash_table_get_inst(link, hashed_service_t, link);
-                (void) ipc_forward_fast(pr->callid, hs->phone, pr->arg2,
-                    pr->arg3, 0, IPC_FF_NONE);
+                (void) ipc_forward_fast(pr->callid, hs->phone, pr->iface, pr->arg3, 0,
+                    IPC_FF_NONE);
                 
                 list_remove(&pr->link);
@@ -174 +173 @@
                         pr->service = service;
                         pr->callid = callid;
-                        pr->arg2 = IPC_GET_ARG2(*call);
+                        pr->iface = IPC_GET_ARG1(*call);
                         pr->arg3 = IPC_GET_ARG3(*call);
                         list_append(&pr->link, &pending_conn);
                         return;
                 }
+                
                 retval = ENOENT;
                 goto out;
@@ -184 +184 @@
         
         hashed_service_t *hs = hash_table_get_inst(link, hashed_service_t, link);
-        (void) ipc_forward_fast(callid, hs->phone, IPC_GET_ARG2(*call),
+        (void) ipc_forward_fast(callid, hs->phone, IPC_GET_ARG1(*call),
             IPC_GET_ARG3(*call), 0, IPC_FF_NONE);
         return;