Changeset 25d7709 in mainline for arch/ia32/src/drivers

Timestamp:

2006-03-13T20:08:16Z (20 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

631ca4d

Parents:

45d6add

Message:

Nicer ia32 interrupt handlers and structures holding interrupted context data.
Unify the name holding interrupted context data on all architectures to be istate.

Location:

arch/ia32/src/drivers

Files:

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

arch/ia32/src/drivers/i8254.c

@@ -54 +54 @@
 #define MAGIC_NUMBER    1194
 
-static void i8254_interrupt(int n, void *stack);
+static void i8254_interrupt(int n, istate_t *istate);
 
 void i8254_init(void)
@@ -68 +68 @@
         outb(CLK_PORT1, (CLK_CONST/HZ) >> 8);
         pic_enable_irqs(1<<IRQ_CLK);
-        exc_register(VECTOR_CLK, "i8254_clock", i8254_interrupt);
+        exc_register(VECTOR_CLK, "i8254_clock", (iroutine) i8254_interrupt);
 }
 
@@ -126 +126 @@
 }
 
-void i8254_interrupt(int n, void *stack)
+void i8254_interrupt(int n, istate_t *istate)
 {
         trap_virtual_eoi();

arch/ia32/src/drivers/i8259.c

@@ -40 +40 @@
  */
 
-static void pic_spurious(int n, void *stack);
+static void pic_spurious(int n, istate_t *istate);
 
 void i8259_init(void)
@@ -71 +71 @@
          * Register interrupt handler for the PIC spurious interrupt.
          */
-        exc_register(VECTOR_PIC_SPUR, "pic_spurious", pic_spurious);    
+        exc_register(VECTOR_PIC_SPUR, "pic_spurious", (iroutine) pic_spurious); 
 
         /*
@@ -119 +119 @@
 }
 
-void pic_spurious(int n, void *stack)
+void pic_spurious(int n, istate_t *istate)
 {
         printf("cpu%d: PIC spurious interrupt\n", CPU->id);