Changeset 162f919 in mainline

Timestamp:

2006-05-02T21:49:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

cc35e88

Parents:

281224a

Message:

Added means to make a simple action upon interrupt.

Files:

• Makefile (modified) (1 diff)
• arch/amd64/src/interrupt.c (modified) (1 diff)
• generic/include/errno.h (modified) (1 diff)
• generic/include/ipc/ipc.h (modified) (1 diff)
• generic/include/ipc/irq.h (added)
• generic/include/ipc/sysipc.h (modified) (2 diffs)
• generic/src/ipc/ipc.c (modified) (5 diffs)
• generic/src/ipc/irq.c (added)
• generic/src/ipc/sysipc.c (modified) (3 diffs)

Makefile

@@ -157 +157 @@
         generic/src/ipc/sysipc.c \
         generic/src/ipc/ipcrsc.c \
+        generic/src/ipc/irq.c \
         generic/src/security/cap.c
 

arch/amd64/src/interrupt.c

@@ -46 +46 @@
 #include <arch/ddi/ddi.h>
 #include <interrupt.h>
-#include <ipc/sysipc.h>
+#include <ipc/irq.h>
 
 void print_info_errcode(int n, istate_t *istate)

generic/include/errno.h

@@ -42 +42 @@
                         * to close the connection.  */
 #define EEXISTS    -8  /* Entry already exists */
+#define EBADMEM    -9  /* Bad memory pointer */
 
 #endif

generic/include/ipc/ipc.h

@@ -211 +211 @@
 extern void ipc_backsend_err(phone_t *phone, call_t *call, __native err);
 
-extern int ipc_irq_register(answerbox_t *box, int irq);
-extern void ipc_irq_send_notif(int irq);
-extern void ipc_irq_unregister(answerbox_t *box, int irq);
-
 
 extern answerbox_t *ipc_phone_0;

generic/include/ipc/sysipc.h

@@ -31 +31 @@
 
 #include <ipc/ipc.h>
+#include <ipc/irq.h>
 
 __native sys_ipc_call_sync_fast(__native phoneid, __native method, 
@@ -46 +47 @@
                               __native method, __native arg1);
 __native sys_ipc_hangup(int phoneid);
-__native sys_ipc_register_irq(__native irq);
+__native sys_ipc_register_irq(__native irq, irq_code_t *ucode);
 __native sys_ipc_unregister_irq(__native irq);
 
-void irq_ipc_bind_arch(__native irq);
-
 #endif

generic/src/ipc/ipc.c

@@ -45 +45 @@
 #include <proc/thread.h>
 #include <arch/interrupt.h>
+#include <ipc/irq.h>
 
 /* Open channel that is assigned automatically to new tasks */
@@ -50 +51 @@
 
 static slab_cache_t *ipc_call_slab;
-
-typedef struct {
-        SPINLOCK_DECLARE(lock);
-        answerbox_t *box;
-} ipc_irq_t;
-
-static ipc_irq_t *irq_conns = NULL;
-static int irq_conns_size;
 
 /* Initialize new call */
@@ -329 +322 @@
                 spinlock_lock(&box->irq_lock);
 
-                request = list_get_instance(box->answers.next, call_t, list);
+                request = list_get_instance(box->irq_notifs.next, call_t, list);
                 list_remove(&request->list);
 
@@ -371 +364 @@
 }
 
-/** Disconnect all irq's notifications
- *
- * TODO: It may be better to do some linked list, so that
- *       we wouldn't need to go through whole array every cleanup
- */
-static void ipc_irq_cleanup(answerbox_t *box)
-{
-        int i;
-        ipl_t ipl;
-        
-        for (i=0; i < irq_conns_size; i++) {
-                ipl = interrupts_disable();
-                spinlock_lock(&irq_conns[i].lock);
-                if (irq_conns[i].box == box)
-                        irq_conns[i].box = NULL;
-                spinlock_unlock(&irq_conns[i].lock);
-                interrupts_restore(ipl);
-        }
-}
-
 /** Cleans up all IPC communication of the given task
  *
@@ -444 +417 @@
 }
 
-/** Initialize table of interrupt handlers */
-static void ipc_irq_make_table(int irqcount)
-{
-        int i;
-
-        irq_conns_size = irqcount;
-        irq_conns = malloc(irqcount * (sizeof(*irq_conns)), 0);
-        for (i=0; i < irqcount; i++) {
-                spinlock_initialize(&irq_conns[i].lock, "irq_ipc_lock");
-                irq_conns[i].box = NULL;
-        }
-}
-
-void ipc_irq_unregister(answerbox_t *box, int irq)
-{
-        ipl_t ipl;
-
-        ipl = interrupts_disable();
-        spinlock_lock(&irq_conns[irq].lock);
-        if (irq_conns[irq].box == box)
-                irq_conns[irq].box = NULL;
-
-        spinlock_unlock(&irq_conns[irq].lock);
-        interrupts_restore(ipl);
-}
-
-/** Register an answerbox as a receiving end of interrupts notifications */
-int ipc_irq_register(answerbox_t *box, int irq)
-{
-        ipl_t ipl;
-
-        ASSERT(irq_conns);
-
-        ipl = interrupts_disable();
-        spinlock_lock(&irq_conns[irq].lock);
-
-        if (irq_conns[irq].box) {
-                spinlock_unlock(&irq_conns[irq].lock);
-                interrupts_restore(ipl);
-                return EEXISTS;
-        }
-        irq_conns[irq].box = box;
-        spinlock_unlock(&irq_conns[irq].lock);
-        interrupts_restore(ipl);
-
-        return 0;
-}
-
-/** Notify process that an irq had happend
- *
- * We expect interrupts to be disabled
- */
-void ipc_irq_send_notif(int irq)
-{
-        call_t *call;
-
-        ASSERT(irq_conns);
-        spinlock_lock(&irq_conns[irq].lock);
-
-        if (irq_conns[irq].box) {
-                call = ipc_call_alloc(FRAME_ATOMIC);
-                call->flags |= IPC_CALL_NOTIF;
-                IPC_SET_METHOD(call->data, IPC_M_INTERRUPT);
-                IPC_SET_ARG1(call->data, irq);
-
-                spinlock_lock(&irq_conns[irq].box->irq_lock);
-                list_append(&call->list, &irq_conns[irq].box->irq_notifs);
-                spinlock_unlock(&irq_conns[irq].box->irq_lock);
-
-                waitq_wakeup(&irq_conns[irq].box->wq, 0);
-        }
-                
-        spinlock_unlock(&irq_conns[irq].lock);
-}
 
 /** Initilize ipc subsystem */

generic/src/ipc/sysipc.c

@@ -36 +36 @@
 #include <ipc/ipc.h>
 #include <ipc/sysipc.h>
+#include <ipc/irq.h>
 #include <ipc/ipcrsc.h>
 #include <arch/interrupt.h>
@@ -478 +479 @@
 
 /** Connect irq handler to task */
-__native sys_ipc_register_irq(__native irq)
+__native sys_ipc_register_irq(__native irq, irq_code_t *ucode)
 {
         if (irq >= IRQ_COUNT)
@@ -484 +485 @@
 
         irq_ipc_bind_arch(irq);
-        return ipc_irq_register(&TASK->answerbox, irq);
+
+        return ipc_irq_register(&TASK->answerbox, irq, ucode);
 }