Changeset d2e0a8cb in mainline

Timestamp:

2007-11-25T10:04:38Z (17 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

be815bc

Parents:

b3cd9eb

Message:

Support for 5 payload arguments for IPC irq notifications and the pseudo code.

Location:

kernel/generic

Files:

• include/ipc/irq.h (modified) (1 diff)
• src/console/klog.c (modified) (1 diff)
• src/ipc/irq.c (modified) (4 diffs)

kernel/generic/include/ipc/irq.h

@@ -47 +47 @@
     unative_t method, irq_code_t *ucode);
 extern void ipc_irq_send_notif(irq_t *irq);
-extern void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2,
-    unative_t a3);
 extern void ipc_irq_unregister(answerbox_t *box, inr_t inr, devno_t devno);
 extern void ipc_irq_cleanup(answerbox_t *box);
+
+/*
+ * User friendly wrappers for ipc_irq_send_msg(). They are in the form
+ * ipc_irq_send_msg_m(), where m is the number of payload arguments.
+ */
+#define ipc_irq_send_msg_1(irq, a1) \
+    ipc_irq_send_msg((irq), (a1), 0, 0, 0, 0)
+#define ipc_irq_send_msg_2(irq, a1, a2) \
+    ipc_irq_send_msg((irq), (a1), (a2), 0, 0, 0)
+#define ipc_irq_send_msg_3(irq, a1, a2, a3) \
+    ipc_irq_send_msg((irq), (a1), (a2), (a3), 0, 0)
+#define ipc_irq_send_msg_4(irq, a1, a2, a3, a4) \
+    ipc_irq_send_msg((irq), (a1), (a2), (a3), (a4), 0)
+#define ipc_irq_send_msg_5(irq, a1, a2, a3, a4, a5) \
+    ipc_irq_send_msg((irq), (a1), (a2), (a3), (a4), (a5))
+
+extern void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2,
+    unative_t a3, unative_t a4, unative_t a5);
 
 #endif

kernel/generic/src/console/klog.c

@@ -130 +130 @@
                         goto out;
         }
-        ipc_irq_send_msg(&klog_irq, klogpos, ret, 0);
+        ipc_irq_send_msg_2(&klog_irq, klogpos, ret);
         klogpos += ret;
         if (klogpos >= klogsize)

kernel/generic/src/ipc/irq.c

@@ -90 +90 @@
                         break;
                 case CMD_MEM_WRITE_2:
-                        *((uint16_t *) code->cmds[i].addr) = code->cmds[i].value;
+                        *((uint16_t *) code->cmds[i].addr) =
+                            code->cmds[i].value;
                         break;
                 case CMD_MEM_WRITE_4:
-                        *((uint32_t *) code->cmds[i].addr) = code->cmds[i].value;
+                        *((uint32_t *) code->cmds[i].addr) =
+                            code->cmds[i].value;
                         break;
                 case CMD_MEM_WRITE_8:
-                        *((uint64_t *) code->cmds[i].addr) = code->cmds[i].value;
+                        *((uint64_t *) code->cmds[i].addr) =
+                            code->cmds[i].value;
                         break;
 #if defined(ia32) || defined(amd64)
@@ -119 +122 @@
                         break;
                 }
-                if (code->cmds[i].dstarg && code->cmds[i].dstarg < 4) {
+                if (code->cmds[i].dstarg && code->cmds[i].dstarg <
+                    IPC_CALL_LEN) {
                         call->data.args[code->cmds[i].dstarg] = dstval;
                 }
@@ -283 +287 @@
  * @param a2            Driver-specific payload argument.
  * @param a3            Driver-specific payload argument.
- */
-void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2, unative_t a3)
+ * @param a4            Driver-specific payload argument.
+ * @param a5            Driver-specific payload argument.
+ */
+void ipc_irq_send_msg(irq_t *irq, unative_t a1, unative_t a2, unative_t a3,
+    unative_t a4, unative_t a5)
 {
         call_t *call;
@@ -301 +308 @@
                 IPC_SET_ARG2(call->data, a2);
                 IPC_SET_ARG3(call->data, a3);
+                IPC_SET_ARG4(call->data, a4);
+                IPC_SET_ARG5(call->data, a5);
                 /* Put a counter to the message */
                 call->priv = ++irq->notif_cfg.counter;