Changeset e60293d in mainline

Timestamp:

2006-10-17T15:50:37Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8513ad7

Parents:

79f30e4f

Message:

ppc64: make it compile again

Location:

kernel/arch/ppc64

Files:

• Makefile.inc (modified) (1 diff)
• include/drivers/pic.h (added)
• include/interrupt.h (modified) (1 diff)
• src/drivers/pic.c (added)
• src/interrupt.c (modified) (4 diffs)

kernel/arch/ppc64/Makefile.inc

@@ -70 +70 @@
         arch/$(ARCH)/src/mm/memory_init.c \
         arch/$(ARCH)/src/mm/page.c \
-        arch/$(ARCH)/src/mm/tlb.c
+        arch/$(ARCH)/src/mm/tlb.c \
+        arch/$(ARCH)/src/drivers/pic.c

kernel/arch/ppc64/include/interrupt.h

@@ -38 +38 @@
 #include <arch/exception.h>
 
-#define IRQ_COUNT       1
-#define IVT_ITEMS   15
-#define INT_OFFSET  0
+#define IVT_ITEMS 16
+#define IVT_FIRST 0
 
-#define VECTOR_DECREMENTER 10
+#define VECTOR_DATA_STORAGE 2
+#define VECTOR_INSTRUCTION_STORAGE 3
+#define VECTOR_EXTERNAL 4
+#define VECTOR_DECREMENTER 8
 
 extern void start_decrementer(void);
 extern void interrupt_init(void);
+extern void extint_handler(int n, istate_t *istate);
 
 #endif

kernel/arch/ppc64/src/interrupt.c

@@ -33 +33 @@
  */
 
+#include <ddi/irq.h>
 #include <interrupt.h>
 #include <arch/interrupt.h>
@@ -39 +40 @@
 #include <time/clock.h>
 #include <ipc/sysipc.h>
+#include <arch/drivers/pic.h>
+#include <arch/mm/tlb.h>
+#include <print.h>
 
 
@@ -48 +52 @@
                 : "r" (1000)
         );
+}
+
+
+/** Handler of external interrupts */
+static void exception_external(int n, istate_t *istate)
+{
+        int inum;
+        
+        while ((inum = pic_get_pending()) != -1) {
+                irq_t *irq = irq_dispatch_and_lock(inum);
+                if (irq) {
+                        /*
+                         * The IRQ handler was found.
+                         */
+                        irq->handler(irq, irq->arg);
+                        spinlock_unlock(&irq->lock);
+                } else {
+                        /*
+                         * Spurious interrupt.
+                         */
+#ifdef CONFIG_DEBUG
+                        printf("cpu%d: spurious interrupt (inum=%d)\n", CPU->id, inum);
+#endif
+                }
+                pic_ack_interrupt(inum);
+        }
 }
 
@@ -61 +91 @@
 void interrupt_init(void)
 {
+        exc_register(VECTOR_EXTERNAL, "external", exception_external);
         exc_register(VECTOR_DECREMENTER, "timer", exception_decrementer);
-}
-
-
-/* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(unative_t irq)
-{
-        panic("not implemented\n");
-        /* TODO */
 }