Changeset fcfac420 in mainline for arch/ia32/src/drivers

Timestamp:

2005-12-10T01:02:31Z (20 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

6095342

Parents:

973be64e

Message:

Changed ia32 & amd64 to use exc_register instead of trap_register.

Fixed dependency list building. I hope you all have 'makedepend' installed,
if you don't it's time to install it, as CC -M builds the dependency
list without directory names..and it just does not work.

Location:

arch/ia32/src/drivers

Files:

• i8042.c (modified) (3 diffs)
• i8254.c (modified) (4 diffs)
• i8259.c (modified) (4 diffs)

arch/ia32/src/drivers/i8042.c

@@ -39 +39 @@
 #include <console/console.h>
 #include <macros.h>
+#include <interrupt.h>
 
 /**
@@ -236 +237 @@
 };
 
+static void i8042_interrupt(int n, void *stack);
+
 /** Initialize i8042. */
 void i8042_init(void)
 {
-        trap_register(VECTOR_KBD, i8042_interrupt);
+        exc_register(VECTOR_KBD, "i8042_interrupt", i8042_interrupt);
         trap_virtual_enable_irqs(1<<IRQ_KBD);
         spinlock_initialize(&keylock, "i8042_lock");
@@ -251 +254 @@
  * @param stack Interrupted stack.
  */
-void i8042_interrupt(__u8 n, __native stack[])
+void i8042_interrupt(int n, void *stack)
 {
         __u8 x;

arch/ia32/src/drivers/i8254.c

@@ -40 +40 @@
 #include <arch.h>
 #include <time/delay.h>
+#include <interrupt.h>
 
 /*
@@ -53 +54 @@
 #define MAGIC_NUMBER    1194
 
+static void i8254_interrupt(int n, void *stack);
+
 void i8254_init(void)
 {
@@ -65 +68 @@
         outb(CLK_PORT1, (CLK_CONST/HZ) >> 8);
         pic_enable_irqs(1<<IRQ_CLK);
-        trap_register(VECTOR_CLK, i8254_interrupt);
+        exc_register(VECTOR_CLK, "i8254_clock", i8254_interrupt);
 }
 
@@ -123 +126 @@
 }
 
-void i8254_interrupt(__u8 n, __native stack[])
+void i8254_interrupt(int n, void *stack)
 {
         trap_virtual_eoi();

arch/ia32/src/drivers/i8259.c

@@ -33 +33 @@
 #include <arch.h>
 #include <print.h>
+#include <interrupt.h>
 
 /*
@@ -38 +39 @@
  * Programmable Interrupt Controller for UP systems.
  */
+
+static void pic_spurious(int n, void *stack);
 
 void i8259_init(void)
@@ -68 +71 @@
          * Register interrupt handler for the PIC spurious interrupt.
          */
-        trap_register(VECTOR_PIC_SPUR, pic_spurious);   
+        exc_register(VECTOR_PIC_SPUR, "pic_spurious", pic_spurious);    
 
         /*
@@ -116 +119 @@
 }
 
-void pic_spurious(__u8 n, __native stack[])
+void pic_spurious(int n, void *stack)
 {
         printf("cpu%d: PIC spurious interrupt\n", CPU->id);