Changeset 96b02eb9 in mainline for kernel/generic/src/ipc/sysipc.c

Timestamp:

2010-12-14T12:52:38Z (15 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

6b10dab

Parents:

554debd

Message:

more unification of basic types

• use sysarg_t and native_t (unsigned and signed variant) in both kernel and uspace
• remove ipcarg_t in favour of sysarg_t

(no change in functionality)

File:

• kernel/generic/src/ipc/sysipc.c (modified) (32 diffs)

kernel/generic/src/ipc/sysipc.c

@@ -68 +68 @@
  *
  */
-static int phone_get(unative_t phoneid, phone_t **phone)
+static int phone_get(sysarg_t phoneid, phone_t **phone)
 {
         if (phoneid >= IPC_MAX_PHONES)
@@ -84 +84 @@
  *
  */
-static inline bool method_is_system(unative_t method)
+static inline bool method_is_system(sysarg_t method)
 {
         if (method <= IPC_M_LAST_SYSTEM)
@@ -102 +102 @@
  *
  */
-static inline bool method_is_forwardable(unative_t method)
+static inline bool method_is_forwardable(sysarg_t method)
 {
         switch (method) {
@@ -124 +124 @@
  *
  */
-static inline bool method_is_immutable(unative_t method)
+static inline bool method_is_immutable(sysarg_t method)
 {
         switch (method) {
@@ -248 +248 @@
                         /* Set 'phone hash' as arg5 of response */
                         IPC_SET_ARG5(answer->data,
-                            (unative_t) &TASK->phones[phoneid]);
+                            (sysarg_t) &TASK->phones[phoneid]);
                 }
         } else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_ME_TO) {
@@ -399 +399 @@
         }
         case IPC_M_CONNECT_ME:
-                IPC_SET_ARG5(call->data, (unative_t) phone);
+                IPC_SET_ARG5(call->data, (sysarg_t) phone);
                 break;
         case IPC_M_CONNECT_ME_TO: {
@@ -407 +407 @@
                 
                 /* Set arg5 for server */
-                IPC_SET_ARG5(call->data, (unative_t) &TASK->phones[newphid]);
+                IPC_SET_ARG5(call->data, (sysarg_t) &TASK->phones[newphid]);
                 call->flags |= IPC_CALL_CONN_ME_TO;
                 call->priv = newphid;
@@ -541 +541 @@
  *
  */
-unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method,
-    unative_t arg1, unative_t arg2, unative_t arg3, ipc_data_t *data)
+sysarg_t sys_ipc_call_sync_fast(sysarg_t phoneid, sysarg_t method,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, ipc_data_t *data)
 {
         phone_t *phone;
@@ -601 +601 @@
  *
  */
-unative_t sys_ipc_call_sync_slow(unative_t phoneid, ipc_data_t *question,
+sysarg_t sys_ipc_call_sync_slow(sysarg_t phoneid, ipc_data_t *question,
     ipc_data_t *reply)
 {
@@ -613 +613 @@
         if (rc != 0) {
                 ipc_call_free(call);
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         }
         
@@ -677 +677 @@
  *
  */
-unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method,
-    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4)
+sysarg_t sys_ipc_call_async_fast(sysarg_t phoneid, sysarg_t method,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
         phone_t *phone;
@@ -707 +707 @@
                 ipc_backsend_err(phone, call, res);
         
-        return (unative_t) call;
+        return (sysarg_t) call;
 }
 
@@ -718 +718 @@
  *
  */
-unative_t sys_ipc_call_async_slow(unative_t phoneid, ipc_data_t *data)
+sysarg_t sys_ipc_call_async_slow(sysarg_t phoneid, ipc_data_t *data)
 {
         phone_t *phone;
@@ -732 +732 @@
         if (rc != 0) {
                 ipc_call_free(call);
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         }
         
@@ -742 +742 @@
                 ipc_backsend_err(phone, call, res);
         
-        return (unative_t) call;
+        return (sysarg_t) call;
 }
 
@@ -767 +767 @@
  *
  */
-static unative_t sys_ipc_forward_common(unative_t callid, unative_t phoneid,
-    unative_t method, unative_t arg1, unative_t arg2, unative_t arg3,
-    unative_t arg4, unative_t arg5, unsigned int mode, bool slow)
+static sysarg_t sys_ipc_forward_common(sysarg_t callid, sysarg_t phoneid,
+    sysarg_t method, sysarg_t arg1, sysarg_t arg2, sysarg_t arg3,
+    sysarg_t arg4, sysarg_t arg5, unsigned int mode, bool slow)
 {
         call_t *call = get_call(callid);
@@ -846 +846 @@
  *
  */
-unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
-    unative_t method, unative_t arg1, unative_t arg2, unsigned int mode)
+sysarg_t sys_ipc_forward_fast(sysarg_t callid, sysarg_t phoneid,
+    sysarg_t method, sysarg_t arg1, sysarg_t arg2, unsigned int mode)
 {
         return sys_ipc_forward_common(callid, phoneid, method, arg1, arg2, 0, 0,
@@ -870 +870 @@
  *
  */
-unative_t sys_ipc_forward_slow(unative_t callid, unative_t phoneid,
+sysarg_t sys_ipc_forward_slow(sysarg_t callid, sysarg_t phoneid,
     ipc_data_t *data, unsigned int mode)
 {
@@ -877 +877 @@
             sizeof(newdata.args));
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         return sys_ipc_forward_common(callid, phoneid,
@@ -900 +900 @@
  *
  */
-unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval,
-    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4)
+sysarg_t sys_ipc_answer_fast(sysarg_t callid, sysarg_t retval,
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4)
 {
         /* Do not answer notification callids */
@@ -945 +945 @@
  *
  */
-unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data)
+sysarg_t sys_ipc_answer_slow(sysarg_t callid, ipc_data_t *data)
 {
         /* Do not answer notification callids */
@@ -982 +982 @@
  *
  */
-unative_t sys_ipc_hangup(unative_t phoneid)
+sysarg_t sys_ipc_hangup(sysarg_t phoneid)
 {
         phone_t *phone;
@@ -1008 +1008 @@
  *
  */
-unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
+sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
     unsigned int flags)
 {
@@ -1037 +1037 @@
                 ipc_call_free(call);
                 
-                return ((unative_t) call) | IPC_CALLID_NOTIFICATION;
+                return ((sysarg_t) call) | IPC_CALLID_NOTIFICATION;
         }
         
@@ -1051 +1051 @@
                 ipc_call_free(call);
                 
-                return ((unative_t) call) | IPC_CALLID_ANSWERED;
+                return ((sysarg_t) call) | IPC_CALLID_ANSWERED;
         }
         
@@ -1079 +1079 @@
         }
         
-        return (unative_t) call;
+        return (sysarg_t) call;
 }
 
@@ -1085 +1085 @@
  *
  */
-unative_t sys_ipc_poke(void)
+sysarg_t sys_ipc_poke(void)
 {
         waitq_unsleep(&TASK->answerbox.wq);
@@ -1101 +1101 @@
  *
  */
-unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method,
+sysarg_t sys_ipc_register_irq(inr_t inr, devno_t devno, sysarg_t method,
     irq_code_t *ucode)
 {
@@ -1118 +1118 @@
  *
  */
-unative_t sys_ipc_unregister_irq(inr_t inr, devno_t devno)
+sysarg_t sys_ipc_unregister_irq(inr_t inr, devno_t devno)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))
@@ -1135 +1135 @@
  *
  */
-unative_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg)
+sysarg_t sys_ipc_connect_kbox(sysarg64_t *uspace_taskid_arg)
 {
 #ifdef CONFIG_UDEBUG
@@ -1141 +1141 @@
         int rc = copy_from_uspace(&taskid_arg, uspace_taskid_arg, sizeof(sysarg64_t));
         if (rc != 0)
-                return (unative_t) rc;
+                return (sysarg_t) rc;
         
         LOG("sys_ipc_connect_kbox(%" PRIu64 ")", taskid_arg.value);
@@ -1147 +1147 @@
         return ipc_connect_kbox(taskid_arg.value);
 #else
-        return (unative_t) ENOTSUP;
+        return (sysarg_t) ENOTSUP;
 #endif
 }