Changeset 7f1c620 in mainline for generic/src/ipc/sysipc.c

Timestamp:

2006-07-04T17:17:56Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ffa3ef5

Parents:

991779c5

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

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

generic/src/ipc/sysipc.c

@@ -57 +57 @@
 
 /** Return true if the method is a system method */
-static inline int is_system_method(__native method)
+static inline int is_system_method(unative_t method)
 {
         if (method <= IPC_M_LAST_SYSTEM)
@@ -69 +69 @@
  *   it is useless
  */
-static inline int is_forwardable(__native method)
+static inline int is_forwardable(unative_t method)
 {
         if (method == IPC_M_PHONE_HUNGUP || method == IPC_M_AS_AREA_SEND \
@@ -132 +132 @@
                         phone_connect(phoneid,&answer->sender->answerbox);
                         /* Set 'phone identification' as arg3 of response */
-                        IPC_SET_ARG3(answer->data, (__native)&TASK->phones[phoneid]);
+                        IPC_SET_ARG3(answer->data, (unative_t)&TASK->phones[phoneid]);
                 }
         } else if (IPC_GET_METHOD(*olddata) == IPC_M_CONNECT_ME_TO) {
@@ -192 +192 @@
                         return ELIMIT;
                 /* Set arg3 for server */
-                IPC_SET_ARG3(call->data, (__native)&TASK->phones[newphid]);
+                IPC_SET_ARG3(call->data, (unative_t)&TASK->phones[newphid]);
                 call->flags |= IPC_CALL_CONN_ME_TO;
                 call->private = newphid;
@@ -254 +254 @@
            -2 on 'Too many async request, handle answers first
  */
-__native sys_ipc_call_sync_fast(__native phoneid, __native method, 
-                                __native arg1, ipc_data_t *data)
+unative_t sys_ipc_call_sync_fast(unative_t phoneid, unative_t method, 
+                                unative_t arg1, ipc_data_t *data)
 {
         call_t call;
@@ -278 +278 @@
 
 /** Synchronous IPC call allowing to send whole message */
-__native sys_ipc_call_sync(__native phoneid, ipc_data_t *question, 
+unative_t sys_ipc_call_sync(unative_t phoneid, ipc_data_t *question, 
                            ipc_data_t *reply)
 {
@@ -289 +289 @@
         rc = copy_from_uspace(&call.data.args, &question->args, sizeof(call.data.args));
         if (rc != 0)
-                return (__native) rc;
+                return (unative_t) rc;
 
         GET_CHECK_PHONE(phone, phoneid, return ENOENT);
@@ -324 +324 @@
            -2 on 'Too many async request, handle answers first
  */
-__native sys_ipc_call_async_fast(__native phoneid, __native method, 
-                                 __native arg1, __native arg2)
+unative_t sys_ipc_call_async_fast(unative_t phoneid, unative_t method, 
+                                 unative_t arg1, unative_t arg2)
 {
         call_t *call;
@@ -347 +347 @@
                 ipc_backsend_err(phone, call, res);
 
-        return (__native) call;
+        return (unative_t) call;
 }
 
@@ -354 +354 @@
  * @return The same as sys_ipc_call_async
  */
-__native sys_ipc_call_async(__native phoneid, ipc_data_t *data)
+unative_t sys_ipc_call_async(unative_t phoneid, ipc_data_t *data)
 {
         call_t *call;
@@ -370 +370 @@
         if (rc != 0) {
                 ipc_call_free(call);
-                return (__native) rc;
+                return (unative_t) rc;
         }
         if (!(res=request_preprocess(call)))
@@ -377 +377 @@
                 ipc_backsend_err(phone, call, res);
 
-        return (__native) call;
+        return (unative_t) call;
 }
 
@@ -387 +387 @@
  *          arg3 is not rewritten for certain system IPC
  */
-__native sys_ipc_forward_fast(__native callid, __native phoneid,
-                              __native method, __native arg1)
+unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
+                              unative_t method, unative_t arg1)
 {
         call_t *call;
@@ -429 +429 @@
 
 /** Send IPC answer */
-__native sys_ipc_answer_fast(__native callid, __native retval, 
-                             __native arg1, __native arg2)
+unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval, 
+                             unative_t arg1, unative_t arg2)
 {
         call_t *call;
@@ -460 +460 @@
 
 /** Send IPC answer */
-__native sys_ipc_answer(__native callid, ipc_data_t *data)
+unative_t sys_ipc_answer(unative_t callid, ipc_data_t *data)
 {
         call_t *call;
@@ -494 +494 @@
  *
  */
-__native sys_ipc_hangup(int phoneid)
+unative_t sys_ipc_hangup(int phoneid)
 {
         phone_t *phone;
@@ -514 +514 @@
  * @return Callid, if callid & 1, then the call is answer
  */
-__native sys_ipc_wait_for_call(ipc_data_t *calldata, __u32 usec, int flags)
+unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec, int flags)
 {
         call_t *call;
@@ -533 +533 @@
                 ipc_call_free(call);
                 
-                return ((__native)call) | IPC_CALLID_NOTIFICATION;
+                return ((unative_t)call) | IPC_CALLID_NOTIFICATION;
         }
 
@@ -551 +551 @@
                 ipc_call_free(call);
 
-                return ((__native)call) | IPC_CALLID_ANSWERED;
+                return ((unative_t)call) | IPC_CALLID_ANSWERED;
         }
 
@@ -562 +562 @@
                 return 0;
         }
-        return (__native)call;
+        return (unative_t)call;
 }
 
 /** Connect irq handler to task */
-__native sys_ipc_register_irq(int irq, irq_code_t *ucode)
+unative_t sys_ipc_register_irq(int irq, irq_code_t *ucode)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))
@@ -572 +572 @@
 
         if (irq >= IRQ_COUNT || irq <= -IPC_IRQ_RESERVED_VIRTUAL)
-                return (__native) ELIMIT;
+                return (unative_t) ELIMIT;
         
         irq_ipc_bind_arch(irq);
@@ -580 +580 @@
 
 /* Disconnect irq handler from task */
-__native sys_ipc_unregister_irq(int irq)
+unative_t sys_ipc_unregister_irq(int irq)
 {
         if (!(cap_get(TASK) & CAP_IRQ_REG))
@@ -586 +586 @@
 
         if (irq >= IRQ_COUNT || irq <= -IPC_IRQ_RESERVED_VIRTUAL)
-                return (__native) ELIMIT;
+                return (unative_t) ELIMIT;
 
         ipc_irq_unregister(&TASK->answerbox, irq);