Changeset 6a8ce16 in mainline

Timestamp:

2015-08-18T18:00:22Z (9 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

84dc30c

Parents:

abf2dfd

Message:

rename services_t to service_t for consistency
cleanup the naming service code

Location:

uspace

Files:

• lib/c/generic/ns.c (modified) (3 diffs)
• lib/c/include/ipc/services.h (modified) (1 diff)
• lib/c/include/ns.h (modified) (1 diff)
• srv/ns/ns.c (modified) (3 diffs)

uspace/lib/c/generic/ns.c

@@ -49 +49 @@
 }
 
-async_sess_t *service_connect(exch_mgmt_t mgmt, services_t service, sysarg_t arg2,
+async_sess_t *service_connect(exch_mgmt_t mgmt, service_t service, sysarg_t arg2,
     sysarg_t arg3)
 {
@@ -73 +73 @@
 }
 
-async_sess_t *service_connect_blocking(exch_mgmt_t mgmt, services_t service,
+async_sess_t *service_connect_blocking(exch_mgmt_t mgmt, service_t service,
     sysarg_t arg2, sysarg_t arg3)
 {
@@ -108 +108 @@
  *
  */
-async_sess_t *service_bind(services_t service, sysarg_t arg1, sysarg_t arg2,
+async_sess_t *service_bind(service_t service, sysarg_t arg1, sysarg_t arg2,
     sysarg_t arg3, async_port_handler_t client_receiver)
 {

uspace/lib/c/include/ipc/services.h

@@ -50 +50 @@
         SERVICE_IRC        = FOURCC('i', 'r', 'c', ' '),
         SERVICE_CLIPBOARD  = FOURCC('c', 'l', 'i', 'p'),
-} services_t;
+} service_t;
 
 #define SERVICE_NAME_CORECFG    "corecfg"

uspace/lib/c/include/ns.h

@@ -42 +42 @@
 
 extern int service_register(sysarg_t);
-extern async_sess_t *service_connect(exch_mgmt_t, services_t, sysarg_t, sysarg_t);
-extern async_sess_t *service_connect_blocking(exch_mgmt_t, services_t, sysarg_t,
+extern async_sess_t *service_connect(exch_mgmt_t, service_t, sysarg_t, sysarg_t);
+extern async_sess_t *service_connect_blocking(exch_mgmt_t, service_t, sysarg_t,
     sysarg_t);
-extern async_sess_t *service_bind(services_t, sysarg_t, sysarg_t, sysarg_t,
+extern async_sess_t *service_bind(service_t, sysarg_t, sysarg_t, sysarg_t,
     async_port_handler_t);
 

uspace/srv/ns/ns.c

@@ -38 +38 @@
 #include <ipc/ipc.h>
 #include <ipc/ns.h>
+#include <ipc/services.h>
 #include <stdio.h>
 #include <errno.h>
@@ -73 +74 @@
                 sysarg_t retval;
                 
+                service_t service;
+                sysarg_t phone;
+                
                 switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_PHONE_HUNGUP:
@@ -78 +82 @@
                         break;
                 case IPC_M_CONNECT_TO_ME:
+                        service = IPC_GET_ARG1(call);
+                        phone = IPC_GET_ARG5(call);
+                        
                         /*
                          * Server requests service registration.
                          */
-                        if (service_clonable(IPC_GET_ARG1(call))) {
-                                register_clonable(IPC_GET_ARG1(call),
-                                    IPC_GET_ARG5(call), &call, callid);
+                        if (service_clonable(service)) {
+                                register_clonable(service, phone, &call, callid);
                                 continue;
-                        } else {
-                                retval = register_service(IPC_GET_ARG1(call),
-                                    IPC_GET_ARG5(call), &call);
-                        }
+                        } else
+                                retval = register_service(service, phone, &call);
+                        
                         break;
                 case IPC_M_CONNECT_ME_TO:
+                        service = IPC_GET_ARG1(call);
+                        
                         /*
                          * Client requests to be connected to a service.
                          */
-                        if (service_clonable(IPC_GET_ARG1(call))) {
-                                connect_to_clonable(IPC_GET_ARG1(call),
-                                    &call, callid);
+                        if (service_clonable(service)) {
+                                connect_to_clonable(service, &call, callid);
                                 continue;
                         } else {
-                                connect_to_service(IPC_GET_ARG1(call), &call,
-                                    callid);
+                                connect_to_service(service, &call, callid);
                                 continue;
                         }