Changeset 2133e02 in mainline for uspace/srv/ns/ns.c

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

File:

• uspace/srv/ns/ns.c (modified) (4 diffs)

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;
                         
                         /*