Changeset 16d71f41 in mainline

Timestamp:

2006-10-27T12:27:24Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

8607db8

Parents:

cea12e9

Message:

ia32: mouse support, mouse regrab is still broken

Location:

kernel

Files:

• arch/ia32/include/interrupt.h (modified) (1 diff)
• arch/ia32/src/ia32.c (modified) (1 diff)
• genarch/include/kbd/i8042.h (modified) (1 diff)
• genarch/src/kbd/i8042.c (modified) (6 diffs)

kernel/arch/ia32/include/interrupt.h

@@ -53 +53 @@
 #define IRQ_PIC1                2
 #define IRQ_PIC_SPUR    7
+#define IRQ_MOUSE               12
 
 /* this one must have four least significant bits set to ones */

kernel/arch/ia32/src/ia32.c

@@ -129 +129 @@
 {
         /* keyboard controller */
-        i8042_init(device_assign_devno(), IRQ_KBD);
+        i8042_init(device_assign_devno(), IRQ_KBD, device_assign_devno(), IRQ_MOUSE);
 }
 

kernel/genarch/include/kbd/i8042.h

@@ -38 +38 @@
 #include <typedefs.h>
 
-extern void i8042_init(devno_t devno, inr_t inr);
+extern void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr);
 extern void i8042_poll(void);
 extern void i8042_grab(void);

kernel/genarch/src/kbd/i8042.c

@@ -89 +89 @@
 
 /** Structure for i8042's IRQ. */
-static irq_t i8042_irq;
+static irq_t i8042_kbd_irq;
+static irq_t i8042_mouse_irq;
 
 /** Wait until the controller reads its data. */
@@ -108 +109 @@
         i8042_wait();
 
-        spinlock_lock(&i8042_irq.lock);
-        i8042_irq.notif_cfg.notify = false;
-        spinlock_unlock(&i8042_irq.lock);
+        spinlock_lock(&i8042_kbd_irq.lock);
+        i8042_kbd_irq.notif_cfg.notify = false;
+        spinlock_unlock(&i8042_kbd_irq.lock);
+        
+        spinlock_lock(&i8042_mouse_irq.lock);
+        i8042_mouse_irq.notif_cfg.notify = false;
+        spinlock_unlock(&i8042_mouse_irq.lock);
+        
         interrupts_restore(ipl);
 }
@@ -117 +123 @@
 {
         ipl_t ipl = interrupts_disable();
-        spinlock_lock(&i8042_irq.lock);
-        if (i8042_irq.notif_cfg.answerbox)
-                i8042_irq.notif_cfg.notify = true;
-        spinlock_unlock(&i8042_irq.lock);
+        
+        spinlock_lock(&i8042_kbd_irq.lock);
+        if (i8042_kbd_irq.notif_cfg.answerbox)
+                i8042_kbd_irq.notif_cfg.notify = true;
+        spinlock_unlock(&i8042_kbd_irq.lock);
+        
+        spinlock_lock(&i8042_mouse_irq.lock);
+        if (i8042_mouse_irq.notif_cfg.answerbox)
+                i8042_mouse_irq.notif_cfg.notify = true;
+        spinlock_unlock(&i8042_mouse_irq.lock);
+        
         interrupts_restore(ipl);
 }
@@ -129 +142 @@
 }
 
-static void i8042_irq_handler(irq_t *irq, void *arg, ...)
+static void i8042_kbd_irq_handler(irq_t *irq, void *arg, ...)
 {
         if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
@@ -151 +164 @@
 }
 
+static void i8042_mouse_irq_handler(irq_t *irq, void *arg, ...)
+{
+        if (irq->notif_cfg.notify && irq->notif_cfg.answerbox)
+                ipc_irq_send_notif(irq);
+}
+
 /** Initialize i8042. */
-void i8042_init(devno_t devno, inr_t inr)
+void i8042_init(devno_t kbd_devno, inr_t kbd_inr, devno_t mouse_devno, inr_t mouse_inr)
 {
         chardev_initialize("i8042_kbd", &kbrd, &ops);
         stdin = &kbrd;
         
-        irq_initialize(&i8042_irq);
-        i8042_irq.devno = devno;
-        i8042_irq.inr = inr;
-        i8042_irq.claim = i8042_claim;
-        i8042_irq.handler = i8042_irq_handler;
-        irq_register(&i8042_irq);
-        
-        trap_virtual_enable_irqs(1 << inr);
+        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_kbd_irq_handler;
+        irq_register(&i8042_kbd_irq);
+        
+        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_mouse_irq_handler;
+        irq_register(&i8042_mouse_irq);
+        
+        trap_virtual_enable_irqs(1 << kbd_inr);
+        trap_virtual_enable_irqs(1 << mouse_inr);
         
         /*
@@ -176 +203 @@
         
         sysinfo_set_item_val("kbd", NULL, true);
-        sysinfo_set_item_val("kbd.devno", NULL, devno);
-        sysinfo_set_item_val("kbd.inr", NULL, inr);
+        sysinfo_set_item_val("kbd.devno", NULL, kbd_devno);
+        sysinfo_set_item_val("kbd.inr", NULL, kbd_inr);
+        
+        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);
         
         i8042_grab();