Changeset 96b02eb9 in mainline for kernel/generic/include/ipc

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)

Location:

kernel/generic/include/ipc

Files:

• event.h (modified) (3 diffs)
• ipc.h (modified) (3 diffs)
• ipcrsc.h (modified) (1 diff)
• irq.h (modified) (2 diffs)
• sysipc.h (modified) (1 diff)

kernel/generic/include/ipc/event.h

@@ -48 +48 @@
         answerbox_t *answerbox;
         /** Method to be used for the notification. */
-        unative_t method;
+        sysarg_t method;
         /** Counter. */
         size_t counter;
@@ -54 +54 @@
 
 extern void event_init(void);
-extern unative_t sys_event_subscribe(unative_t, unative_t);
+extern sysarg_t sys_event_subscribe(sysarg_t, sysarg_t);
 extern bool event_is_subscribed(event_type_t);
 extern void event_cleanup_answerbox(answerbox_t *);
@@ -71 +71 @@
         event_notify((e), (a1), (a2), (a3), (a4), (a5))
 
-extern void event_notify(event_type_t, unative_t, unative_t, unative_t,
-    unative_t, unative_t);
+extern void event_notify(event_type_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t, sysarg_t);
 
 #endif

kernel/generic/include/ipc/ipc.h

@@ -311 +311 @@
 
 typedef struct {
-        unative_t args[IPC_CALL_LEN];
+        sysarg_t args[IPC_CALL_LEN];
         phone_t *phone;
 } ipc_data_t;
@@ -331 +331 @@
         
         /** Private data to internal IPC. */
-        unative_t priv;
+        sysarg_t priv;
         
         /** Data passed from/to userspace. */
@@ -368 +368 @@
 
 extern void ipc_cleanup(void);
-extern void ipc_backsend_err(phone_t *, call_t *, unative_t);
+extern void ipc_backsend_err(phone_t *, call_t *, sysarg_t);
 extern void ipc_answerbox_slam_phones(answerbox_t *, bool);
 extern void ipc_cleanup_call_list(link_t *);

kernel/generic/include/ipc/ipcrsc.h

@@ -39 +39 @@
 #include <ipc/ipc.h>
 
-extern call_t * get_call(unative_t callid);
+extern call_t * get_call(sysarg_t callid);
 extern int phone_alloc(task_t *t);
 extern void phone_connect(int phoneid, answerbox_t *box);

kernel/generic/include/ipc/irq.h

@@ -44 +44 @@
 #include <adt/list.h>
 
-extern int ipc_irq_register(answerbox_t *, inr_t, devno_t, unative_t,
+extern int ipc_irq_register(answerbox_t *, inr_t, devno_t, sysarg_t,
     irq_code_t *);
 
@@ -75 +75 @@
         ipc_irq_send_msg((irq), (a1), (a2), (a3), (a4), (a5))
 
-extern void ipc_irq_send_msg(irq_t *, unative_t, unative_t, unative_t, unative_t,
-    unative_t);
+extern void ipc_irq_send_msg(irq_t *, sysarg_t, sysarg_t, sysarg_t, sysarg_t,
+    sysarg_t);
 
 #endif

kernel/generic/include/ipc/sysipc.h

@@ -40 +40 @@
 #include <typedefs.h>
 
-extern 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);
-extern unative_t sys_ipc_call_sync_slow(unative_t phoneid, ipc_data_t *question,
+extern 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);
+extern sysarg_t sys_ipc_call_sync_slow(sysarg_t phoneid, ipc_data_t *question,
     ipc_data_t *reply);
-extern 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);
-extern unative_t sys_ipc_call_async_slow(unative_t phoneid, ipc_data_t *data);
-extern unative_t sys_ipc_answer_fast(unative_t callid, unative_t retval, 
-    unative_t arg1, unative_t arg2, unative_t arg3, unative_t arg4);
-extern unative_t sys_ipc_answer_slow(unative_t callid, ipc_data_t *data);
-extern unative_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
+extern 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);
+extern sysarg_t sys_ipc_call_async_slow(sysarg_t phoneid, ipc_data_t *data);
+extern sysarg_t sys_ipc_answer_fast(sysarg_t callid, sysarg_t retval, 
+    sysarg_t arg1, sysarg_t arg2, sysarg_t arg3, sysarg_t arg4);
+extern sysarg_t sys_ipc_answer_slow(sysarg_t callid, ipc_data_t *data);
+extern sysarg_t sys_ipc_wait_for_call(ipc_data_t *calldata, uint32_t usec,
     unsigned int nonblocking);
-extern unative_t sys_ipc_poke(void);
-extern unative_t sys_ipc_forward_fast(unative_t callid, unative_t phoneid,
-    unative_t method, unative_t arg1, unative_t arg2, unsigned int mode);
-extern unative_t sys_ipc_forward_slow(unative_t callid, unative_t phoneid,
+extern sysarg_t sys_ipc_poke(void);
+extern sysarg_t sys_ipc_forward_fast(sysarg_t callid, sysarg_t phoneid,
+    sysarg_t method, sysarg_t arg1, sysarg_t arg2, unsigned int mode);
+extern sysarg_t sys_ipc_forward_slow(sysarg_t callid, sysarg_t phoneid,
     ipc_data_t *data, unsigned int mode);
-extern unative_t sys_ipc_hangup(unative_t phoneid);
-extern unative_t sys_ipc_register_irq(inr_t inr, devno_t devno, unative_t method,
+extern sysarg_t sys_ipc_hangup(sysarg_t phoneid);
+extern sysarg_t sys_ipc_register_irq(inr_t inr, devno_t devno, sysarg_t method,
     irq_code_t *ucode);
-extern unative_t sys_ipc_unregister_irq(inr_t inr, devno_t devno);
-extern unative_t sys_ipc_connect_kbox(sysarg64_t *task_id);
+extern sysarg_t sys_ipc_unregister_irq(inr_t inr, devno_t devno);
+extern sysarg_t sys_ipc_connect_kbox(sysarg64_t *task_id);
 
 #endif