Changes in uspace/srv/locsrv/locsrv.c [fafb8e5:0a520db] in mainline

File:

• uspace/srv/locsrv/locsrv.c (modified) (17 diffs)

uspace/srv/locsrv/locsrv.c

@@ -342 +342 @@
         async_get_call(&icall);
 
-        if (ipc_get_imethod(&icall) != LOC_SERVER_REGISTER) {
+        if (IPC_GET_IMETHOD(icall) != LOC_SERVER_REGISTER) {
                 async_answer_0(&icall, EREFUSED);
                 return NULL;
@@ -547 +547 @@
 
         fibril_mutex_lock(&services_list_mutex);
-        svc = loc_service_find_id(ipc_get_arg1(icall));
+        svc = loc_service_find_id(IPC_GET_ARG1(*icall));
         if (svc == NULL) {
                 fibril_mutex_unlock(&services_list_mutex);
@@ -583 +583 @@
         fibril_mutex_lock(&cdir.mutex);
 
-        cat = category_get(&cdir, ipc_get_arg1(icall));
+        cat = category_get(&cdir, IPC_GET_ARG1(*icall));
         if (cat == NULL) {
                 fibril_mutex_unlock(&cdir.mutex);
@@ -623 +623 @@
         fibril_mutex_lock(&services_list_mutex);
 
-        svc = loc_service_find_id(ipc_get_arg1(icall));
+        svc = loc_service_find_id(IPC_GET_ARG1(*icall));
         if (svc == NULL) {
                 fibril_mutex_unlock(&services_list_mutex);
@@ -671 +671 @@
         fibril_mutex_lock(&services_list_mutex);
 
-        svc = loc_service_find_id(ipc_get_arg1(icall));
+        svc = loc_service_find_id(IPC_GET_ARG1(*icall));
         if (svc == NULL) {
                 fibril_mutex_unlock(&services_list_mutex);
@@ -715 +715 @@
          * Get ID from request
          */
-        iface_t iface = ipc_get_arg1(call);
-        service_id_t id = ipc_get_arg2(call);
+        iface_t iface = IPC_GET_ARG1(*call);
+        service_id_t id = IPC_GET_ARG2(*call);
         loc_service_t *svc = loc_service_find_id(id);
 
@@ -726 +726 @@
 
         async_exch_t *exch = async_exchange_begin(svc->server->sess);
-        async_forward_1(call, exch, iface, svc->id, IPC_FF_NONE);
+        async_forward_fast(call, exch, iface, svc->id, 0, IPC_FF_NONE);
         async_exchange_end(exch);
 
@@ -774 +774 @@
          */
         if (svc == NULL) {
-                if (ipc_get_arg1(icall) & IPC_FLAG_BLOCKING) {
+                if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) {
                         /* Blocking lookup */
                         fibril_condvar_wait(&services_list_cv,
@@ -827 +827 @@
          */
         if (namespace == NULL) {
-                if (ipc_get_arg1(icall) & IPC_FLAG_BLOCKING) {
+                if (IPC_GET_ARG1(*icall) & IPC_FLAG_BLOCKING) {
                         /* Blocking lookup */
                         fibril_condvar_wait(&services_list_cv,
@@ -932 +932 @@
 
         loc_namespace_t *namespace =
-            loc_namespace_find_id(ipc_get_arg1(icall));
+            loc_namespace_find_id(IPC_GET_ARG1(*icall));
         if (namespace == NULL) {
                 loc_service_t *svc =
-                    loc_service_find_id(ipc_get_arg1(icall));
+                    loc_service_find_id(IPC_GET_ARG1(*icall));
                 if (svc == NULL)
                         async_answer_1(icall, EOK, LOC_OBJECT_NONE);
@@ -958 +958 @@
 
         loc_namespace_t *namespace =
-            loc_namespace_find_id(ipc_get_arg1(icall));
+            loc_namespace_find_id(IPC_GET_ARG1(*icall));
         if (namespace == NULL)
                 async_answer_0(icall, EEXIST);
@@ -1079 +1079 @@
 
         loc_namespace_t *namespace =
-            loc_namespace_find_id(ipc_get_arg1(icall));
+            loc_namespace_find_id(IPC_GET_ARG1(*icall));
         if (namespace == NULL) {
                 fibril_mutex_unlock(&services_list_mutex);
@@ -1135 +1135 @@
         fibril_mutex_lock(&cdir.mutex);
 
-        category_t *cat = category_get(&cdir, ipc_get_arg1(icall));
+        category_t *cat = category_get(&cdir, IPC_GET_ARG1(*icall));
         if (cat == NULL) {
                 fibril_mutex_unlock(&cdir.mutex);
@@ -1247 +1247 @@
 static void loc_null_destroy(ipc_call_t *icall)
 {
-        sysarg_t i = ipc_get_arg1(icall);
+        sysarg_t i = IPC_GET_ARG1(*icall);
         if (i >= NULL_SERVICES) {
                 async_answer_0(icall, ELIMIT);
@@ -1281 +1281 @@
         errno_t retval;
 
-        svc_id = ipc_get_arg1(icall);
-        cat_id = ipc_get_arg2(icall);
+        svc_id = IPC_GET_ARG1(*icall);
+        cat_id = IPC_GET_ARG2(*icall);
 
         fibril_mutex_lock(&services_list_mutex);
@@ -1419 +1419 @@
                 async_get_call(&call);
 
-                if (!ipc_get_imethod(&call)) {
+                if (!IPC_GET_IMETHOD(call)) {
                         async_answer_0(&call, EOK);
                         break;
                 }
 
-                switch (ipc_get_imethod(&call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case LOC_SERVER_UNREGISTER:
                         if (server == NULL)
@@ -1475 +1475 @@
                 async_get_call(&call);
 
-                if (!ipc_get_imethod(&call)) {
+                if (!IPC_GET_IMETHOD(call)) {
                         async_answer_0(&call, EOK);
                         break;
                 }
 
-                switch (ipc_get_imethod(&call)) {
+                switch (IPC_GET_IMETHOD(call)) {
                 case LOC_SERVICE_GET_ID:
                         loc_service_get_id(&call);