Changeset 323a5aaf in mainline for kernel/genarch/src

Timestamp:

2008-11-30T12:17:56Z (17 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

0ad9e47

Parents:

57e76cb

Message:

Legacy IRQ support, uspace NS16550 support, some minor changes

File:

• kernel/genarch/src/kbd/ns16550.c (modified) (3 diffs)

kernel/genarch/src/kbd/ns16550.c

@@ -39 +39 @@
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_sun.h>
+#include <arch/drivers/kbd.h>
 #ifndef ia64
-#include <arch/drivers/kbd.h>
 #include <arch/drivers/ns16550.h>
 #endif
@@ -131 +131 @@
         ns16550_irq.cir_arg = cir_arg;
         irq_register(&ns16550_irq);
+
+
+        while ((ns16550_lsr_read(&ns16550) & LSR_DATA_READY)) 
+                ns16550_rbr_read(&ns16550);
+
         
         sysinfo_set_item_val("kbd", NULL, true);
-#ifndef ia64
         sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
-#endif
         sysinfo_set_item_val("kbd.devno", NULL, devno);
         sysinfo_set_item_val("kbd.inr", NULL, inr);
         sysinfo_set_item_val("kbd.address.virtual", NULL, port);
+        sysinfo_set_item_val("kbd.port", NULL, port);
 
 #ifdef CONFIG_NS16550_INTERRUPT_DRIVEN
@@ -148 +152 @@
 #ifdef ia64
         uint8_t c;
+        // This switches rbr & ier to mode when accept baudrate constant
         c = ns16550_lcr_read(&ns16550);
         ns16550_lcr_write(&ns16550, 0x80 | c);