Changeset 5b0ae4be in mainline

Timestamp:

2009-02-22T15:51:40Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

691eb52

Parents:

f9f9a13

Message:

The kernel i8042 driver should be instance-neutral.

Location:

kernel

Files:

• arch/amd64/src/amd64.c (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (1 diff)
• arch/ia64/src/ia64.c (modified) (3 diffs)
• genarch/include/kbd/i8042.h (modified) (2 diffs)
• genarch/src/kbd/i8042.c (modified) (3 diffs)

kernel/arch/amd64/src/amd64.c

@@ -175 +175 @@
 {
         /* keyboard controller */
-        i8042_init(device_assign_devno(), IRQ_KBD, device_assign_devno(), IRQ_MOUSE);
+        (void) i8042_init((i8042_t *) I8042_BASE, device_assign_devno(),
+            IRQ_KBD);
 }
 

kernel/arch/ia32/src/ia32.c

@@ -126 +126 @@
 {
         devno_t kbd = device_assign_devno();
-        devno_t mouse = device_assign_devno();
         /* keyboard controller */
-        i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
+        (void) i8042_init((i8042_t *) I8042_BASE, kbd, IRQ_KBD);
 }
 

kernel/arch/ia64/src/ia64.c

@@ -167 +167 @@
              NULL);
 #else
-        devno_t mouse = device_assign_devno();
-        i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
+        (void) i8042_init((i8042_t *)I8042_BASE, kbd, IRQ_KBD);
 #endif
 #endif
@@ -223 +222 @@
 #ifdef SKI
         ski_kbd_grab();
-#else
-#ifdef CONFIG_NS16550
-        ns16550_grab();
-#else
-        i8042_grab();
-#endif
 #endif
 }
@@ -239 +232 @@
 #ifdef SKI
         ski_kbd_release();
-#else
-#ifdef CONFIG_NS16550
-        ns16550_release();
-#else
-        i8042_release();
-#endif
 #endif
 }

kernel/genarch/include/kbd/i8042.h

@@ -36 +36 @@
 #define KERN_I8042_H_
 
+#include <ddi/irq.h>
 #include <arch/types.h>
 #include <typedefs.h>
@@ -47 +48 @@
 
 typedef struct i8042_instance {
+        devno_t devno;
+        irq_t irq;
         i8042_t *i8042;
 } i8042_instance_t;
 
-extern void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr);
+extern bool i8042_init(i8042_t *, devno_t, inr_t);
 
 #endif

kernel/genarch/src/kbd/i8042.c

@@ -90 +90 @@
 };
 
-/** Structure for i8042's IRQ. */
-static irq_t i8042_kbd_irq;
-static irq_t i8042_mouse_irq;
-
 static irq_ownership_t i8042_claim(irq_t *irq)
 {
@@ -126 +122 @@
 
 /** Initialize i8042. */
-void
-i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno,
-    inr_t mouse_inr)
+bool
+i8042_init(i8042_t *dev, devno_t devno, inr_t inr)
 {
-        i8042_t *dev = lgcy_i8042_instance.i8042;
+        i8042_instance_t *instance;
 
         chardev_initialize("i8042_kbd", &kbrd, &ops);
         stdin = &kbrd;
         
-        irq_initialize(&i8042_kbd_irq);
-        i8042_kbd_irq.devno = kbd_devno;
-        i8042_kbd_irq.inr = kbd_inr;
-        i8042_kbd_irq.claim = i8042_claim;
-        i8042_kbd_irq.handler = i8042_irq_handler;
-        i8042_kbd_irq.instance = &lgcy_i8042_instance;
-        irq_register(&i8042_kbd_irq);
+        instance = malloc(sizeof(i8042_instance_t), FRAME_ATOMIC);
+        if (!instance)
+                return false;
         
-        irq_initialize(&i8042_mouse_irq);
-        i8042_mouse_irq.devno = mouse_devno;
-        i8042_mouse_irq.inr = mouse_inr;
-        i8042_mouse_irq.claim = i8042_claim;
-        i8042_mouse_irq.handler = i8042_irq_handler;
-        i8042_mouse_irq.instance = &lgcy_i8042_instance;
-        irq_register(&i8042_mouse_irq);
+        instance->devno = devno;
+        instance->i8042 = dev;
         
-        trap_virtual_enable_irqs(1 << kbd_inr);
-        trap_virtual_enable_irqs(1 << mouse_inr);
+        irq_initialize(&instance->irq);
+        instance->irq.devno = devno;
+        instance->irq.inr = inr;
+        instance->irq.claim = i8042_claim;
+        instance->irq.handler = i8042_irq_handler;
+        instance->irq.instance = instance;
+        irq_register(&instance->irq);
+        
+        trap_virtual_enable_irqs(1 << inr);
         
         /*
@@ -165 +158 @@
          */
         sysinfo_set_item_val("kbd", NULL, true);
-        sysinfo_set_item_val("kbd.devno", NULL, kbd_devno);
-        sysinfo_set_item_val("kbd.inr", NULL, kbd_inr);
+        sysinfo_set_item_val("kbd.devno", NULL, devno);
+        sysinfo_set_item_val("kbd.inr", NULL, inr);
 #ifdef KBD_LEGACY
         sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
 #endif
-        sysinfo_set_item_val("mouse", NULL, true);
-        sysinfo_set_item_val("mouse.devno", NULL, mouse_devno);
-        sysinfo_set_item_val("mouse.inr", NULL, mouse_inr);
+
+        return true;
 }