Changeset cea12e9 in mainline for kernel/arch/ia32/src/drivers/i8254.c

Timestamp:

2006-10-27T11:13:13Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

16d71f41

Parents:

8c84448

Message:

ia32: adopt new IRQ interface, mouse not tested yet

File:

• kernel/arch/ia32/src/drivers/i8254.c (modified) (4 diffs)

kernel/arch/ia32/src/drivers/i8254.c

@@ -50 +50 @@
 #include <arch.h>
 #include <time/delay.h>
-#include <interrupt.h>
+#include <ddi/irq.h>
+#include <ddi/device.h>
 
 #define CLK_PORT1       0x40
@@ -58 +59 @@
 #define MAGIC_NUMBER    1194
 
-static void i8254_interrupt(int n, istate_t *istate);
+static irq_t i8254_irq;
+
+static irq_ownership_t i8254_claim(void)
+{
+        return IRQ_ACCEPT;
+}
+
+static void i8254_irq_handler(irq_t *irq, void *arg, ...)
+{
+        clock();
+}
 
 void i8254_init(void)
 {
+        irq_initialize(&i8254_irq);
+        i8254_irq.devno = device_assign_devno();
+        i8254_irq.inr = IRQ_CLK;
+        i8254_irq.claim = i8254_claim;
+        i8254_irq.handler = i8254_irq_handler;
+        irq_register(&i8254_irq);
+        
         i8254_normal_operation();
 }
@@ -68 +86 @@
 {
         outb(CLK_PORT4, 0x36);
-        pic_disable_irqs(1<<IRQ_CLK);
-        outb(CLK_PORT1, (CLK_CONST/HZ) & 0xf);
-        outb(CLK_PORT1, (CLK_CONST/HZ) >> 8);
-        pic_enable_irqs(1<<IRQ_CLK);
-        exc_register(VECTOR_CLK, "i8254_clock", (iroutine) i8254_interrupt);
+        pic_disable_irqs(1 << IRQ_CLK);
+        outb(CLK_PORT1, (CLK_CONST / HZ) & 0xf);
+        outb(CLK_PORT1, (CLK_CONST / HZ) >> 8);
+        pic_enable_irqs(1 << IRQ_CLK);
 }
 
@@ -130 +147 @@
 }
 
-void i8254_interrupt(int n, istate_t *istate)
-{
-        trap_virtual_eoi();
-        clock();
-}
-
 /** @}
  */