Changeset 87b4baa in mainline for kernel/generic/src/ipc/irq.c

Timestamp:

2010-12-17T20:16:46Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

424558a

Parents:

463e734 (diff), bbc74af7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• kernel/generic/src/ipc/irq.c (modified) (10 diffs)

kernel/generic/src/ipc/irq.c

@@ -42 +42 @@
  *
  * The structure of a notification message is as follows:
- * - METHOD: method as registered by the SYS_IPC_REGISTER_IRQ syscall
+ * - IMETHOD: interface and method as registered by the SYS_IPC_REGISTER_IRQ
+ *            syscall
  * - ARG1: payload modified by a 'top-half' handler
  * - ARG2: payload modified by a 'top-half' handler
@@ -49 +50 @@
  * - ARG5: payload modified by a 'top-half' handler
  * - in_phone_hash: interrupt counter (may be needed to assure correct order
- *         in multithreaded drivers)
+ *                  in multithreaded drivers)
  *
  * Note on synchronization for ipc_irq_register(), ipc_irq_unregister(),
@@ -130 +131 @@
 /** Register an answerbox as a receiving end for IRQ notifications.
  *
- * @param box    Receiving answerbox.
- * @param inr    IRQ number.
- * @param devno  Device number.
- * @param method Method to be associated with the notification.
- * @param ucode  Uspace pointer to top-half pseudocode.
+ * @param box     Receiving answerbox.
+ * @param inr     IRQ number.
+ * @param devno   Device number.
+ * @param imethod Interface and method to be associated
+ *                with the notification.
+ * @param ucode   Uspace pointer to top-half pseudocode.
  *
  * @return EBADMEM, ENOENT or EEXISTS on failure or 0 on success.
@@ -140 +142 @@
  */
 int ipc_irq_register(answerbox_t *box, inr_t inr, devno_t devno,
-    unative_t method, irq_code_t *ucode)
-{
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) devno
+    sysarg_t imethod, irq_code_t *ucode)
+{
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) devno
         };
         
@@ -167 +169 @@
         irq->notif_cfg.notify = true;
         irq->notif_cfg.answerbox = box;
-        irq->notif_cfg.method = method;
+        irq->notif_cfg.imethod = imethod;
         irq->notif_cfg.code = code;
         irq->notif_cfg.counter = 0;
@@ -213 +215 @@
 int ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno)
 {
-        unative_t key[] = {
-                (unative_t) inr,
-                (unative_t) devno
+        sysarg_t key[] = {
+                (sysarg_t) inr,
+                (sysarg_t) devno
         };
         
@@ -290 +292 @@
                 }
                 
-                unative_t key[2];
+                sysarg_t key[2];
                 key[0] = irq->inr;
                 key[1] = irq->devno;
@@ -444 +446 @@
                 
                 /* Set up args */
-                IPC_SET_METHOD(call->data, irq->notif_cfg.method);
+                IPC_SET_IMETHOD(call->data, irq->notif_cfg.imethod);
                 IPC_SET_ARG1(call->data, irq->notif_cfg.scratch[1]);
                 IPC_SET_ARG2(call->data, irq->notif_cfg.scratch[2]);
@@ -465 +467 @@
  *
  */
-void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2, unative_t a3,
-    unative_t a4, unative_t a5)
+void ipc_irq_send_msg(irq_t *irq, sysarg_t a1, sysarg_t a2, sysarg_t a3,
+    sysarg_t a4, sysarg_t a5)
 {
         irq_spinlock_lock(&irq->lock, true);
@@ -481 +483 @@
                 call->priv = ++irq->notif_cfg.counter;
                 
-                IPC_SET_METHOD(call->data, irq->notif_cfg.method);
+                IPC_SET_IMETHOD(call->data, irq->notif_cfg.imethod);
                 IPC_SET_ARG1(call->data, a1);
                 IPC_SET_ARG2(call->data, a2);