Changeset a2a5529 in mainline for kernel/genarch

Timestamp:

2008-11-11T07:50:04Z (17 years ago)

Author:

Jakub Vana <jakub.vana@…>

Branches:

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

Children:

59e4864

Parents:

b24786a3

Message:

Support for serial port console on IA64 as a compensation for keyboard - based on SPARC ns16550 driver

Location:

kernel/genarch

Files:

• include/kbd/ns16550.h (modified) (1 diff)
• src/kbd/key.c (modified) (1 diff)
• src/kbd/ns16550.c (modified) (9 diffs)

kernel/genarch/include/kbd/ns16550.h

@@ -49 +49 @@
 extern void ns16550_irq_handler(irq_t *irq, void *arg, ...);
 
+#include <arch/types.h>
+#ifndef ia64
+#include <arch/drivers/kbd.h>
+#endif
+/* NS16550 registers */
+#define RBR_REG         0       /** Receiver Buffer Register. */
+#define IER_REG         1       /** Interrupt Enable Register. */
+#define IIR_REG         2       /** Interrupt Ident Register (read). */
+#define FCR_REG         2       /** FIFO control register (write). */
+#define LCR_REG         3       /** Line Control register. */
+#define LSR_REG         5       /** Line Status Register. */
+
+#define IER_ERBFI       0x01    /** Enable Receive Buffer Full Interrupt. */
+
+#define LCR_DLAB        0x80    /** Divisor Latch Access bit. */
+
+/** Structure representing the ns16550 device. */
+typedef struct {
+        devno_t devno;
+        volatile ioport_t io_port;      /** Memory mapped registers of the ns16550. */
+} ns16550_t;
+
+static inline uint8_t ns16550_rbr_read(ns16550_t *dev)
+{
+        return inb(dev->io_port+RBR_REG);
+}
+static inline void ns16550_rbr_write(ns16550_t *dev, uint8_t v)
+{
+        outb(dev->io_port+RBR_REG,v);
+}
+
+static inline uint8_t ns16550_ier_read(ns16550_t *dev)
+{
+        return inb(dev->io_port+IER_REG);
+}
+
+static inline void ns16550_ier_write(ns16550_t *dev, uint8_t v)
+{
+        outb(dev->io_port+IER_REG,v);
+}
+
+static inline uint8_t ns16550_iir_read(ns16550_t *dev)
+{
+        return inb(dev->io_port+IIR_REG);
+}
+
+static inline void ns16550_fcr_write(ns16550_t *dev, uint8_t v)
+{
+        outb(dev->io_port+FCR_REG,v);
+}
+
+static inline uint8_t ns16550_lcr_read(ns16550_t *dev)
+{
+        return inb(dev->io_port+LCR_REG);
+}
+
+static inline void ns16550_lcr_write(ns16550_t *dev, uint8_t v)
+{
+        outb(dev->io_port+LCR_REG,v);
+}
+
+static inline uint8_t ns16550_lsr_read(ns16550_t *dev)
+{
+        return inb(dev->io_port+LSR_REG);
+}
+
+
+
 #endif
 

kernel/genarch/src/kbd/key.c

@@ -40 +40 @@
 #include <genarch/kbd/scanc_pc.h>
 #endif
+
+#if (defined(sparc64))
 #if (defined(CONFIG_Z8530) || defined(CONFIG_NS16550))
 #include <genarch/kbd/scanc_sun.h>
 #endif
+#endif
+
 #include <synch/spinlock.h>
 #include <console/chardev.h>

kernel/genarch/src/kbd/ns16550.c

@@ -39 +39 @@
 #include <genarch/kbd/scanc.h>
 #include <genarch/kbd/scanc_sun.h>
+#ifndef ia64
 #include <arch/drivers/kbd.h>
 #include <arch/drivers/ns16550.h>
+#endif
 #include <ddi/irq.h>
 #include <ipc/irq.h>
@@ -110 +112 @@
  * @param vaddr Virtual address of device's registers.
  */
-void ns16550_init(devno_t devno, inr_t inr, uintptr_t vaddr)
+void ns16550_init(devno_t devno, inr_t inr, ioport_t port)
 {
         chardev_initialize("ns16550_kbd", &kbrd, &ops);
@@ -116 +118 @@
         
         ns16550.devno = devno;
-        ns16550.reg = (uint8_t *) vaddr;
+        ns16550.io_port = port;
         
         irq_initialize(&ns16550_irq);
@@ -126 +128 @@
         
         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, vaddr);
+        sysinfo_set_item_val("kbd.address.virtual", NULL, port);
+
+#ifdef ia64
+        uint8_t c;
+        c=ns16550_lcr_read(&ns16550);
+        ns16550_lcr_write(&ns16550,0x80|c);
+        ns16550_rbr_write(&ns16550,0x0c);
+        ns16550_ier_write(&ns16550,0x00);
+        ns16550_lcr_write(&ns16550,c);
+#endif
         
         ns16550_grab();
@@ -152 +165 @@
 {
 }
+
 
 char ns16550_key_read(chardev_t *d)
@@ -162 +176 @@
                         ;
                 x = ns16550_rbr_read(&ns16550);
+#ifndef ia64
                 if (x != IGNORE_CODE) {
                         if (x & KEY_RELEASE)
@@ -168 +183 @@
                                 active_read_key_pressed(x);
                 }
+#else
+        extern chardev_t kbrd;
+        if(x!=0x0d)
+        {
+            if(x==0x7f) x='\b';
+            chardev_push_character(&kbrd,x);
+        }    
+#endif          
+
         }
         return ch;
@@ -202 +226 @@
                 
                 x = ns16550_rbr_read(&ns16550);
+#ifndef ia64
                 if (x != IGNORE_CODE) {
                         if (x & KEY_RELEASE)
@@ -208 +233 @@
                                 key_pressed(x);
                 }
+#else
+        extern chardev_t kbrd;
+        if(x!=0x0d)
+        {
+            if(x==0x7f) x='\b';
+            chardev_push_character(&kbrd,x);
+        }    
+#endif          
+
         }
 }