Changeset 24ff4df in mainline for uspace/srv/kbd/port/ns16550.c

Timestamp:

2009-02-18T21:47:05Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

96f392c

Parents:

f89979b

Message:

Add some missing ports and controllers (untested). Remove old parts of keyboard driver.

File:

• uspace/srv/kbd/port/ns16550.c (moved) (moved from uspace/srv/kbd/arch/ia64/include/lkbd.h ) (1 diff)

uspace/srv/kbd/port/ns16550.c

@@ -27 +27 @@
  */
 
-/** @addtogroup kbdamd64 amd64
- * @brief       HelenOS ia32 / amd64 arch dependent parts of uspace keyboard and mouse handler.
+/** @addtogroup kbd_port
  * @ingroup  kbd
  * @{
+ */ 
+/** @file
+ * @brief       NS16550 port driver.
  */
 
-/** @file
- * @ingroup kbdia32
- */
+#include <ipc/ipc.h>
+#include <async.h>
+#include <sysinfo.h>
+#include <kbd.h>
+#include <kbd_port.h>
+#include <ddi.h>
 
-#ifndef KBD_ia32_KBD_H_
-#define KBD_ia32_KBD_H_
+/* 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 MCR_REG         4       /** Modem Control Register. */
+#define LSR_REG         5       /** Line Status Register. */
 
-#include <ddi.h>
-#include <libarch/ddi.h>
+irq_cmd_t ns16550_cmds[1] = {
+        { CMD_PORT_READ_1, 0, 0, 2 },
+};
 
-#define i8042_DATA      0x60
-#define i8042_STATUS    0X64
+irq_code_t ns16550_kbd = {
+        1,
+        ns16550_cmds
+};
 
+static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 
-typedef unsigned char u8;
-typedef short u16;
+uint16_t ns16550_port;
 
-static inline void i8042_data_write(u8 data)
+int kbd_port_init(void)
 {
-        outb(i8042_DATA, data);
+        async_set_interrupt_received(ns16550_irq_handler);
+
+        ns16550_port = sysinfo_value("kbd.port");
+        ns16550_kbd.cmds[0].addr = (void *) (ns16550_port + RBR_REG);
+        ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
+            0, &ns16550_kbd);
+        iospace_enable(task_get_id(), ns16550_port, 8);
+
+        return 0;
 }
 
-static inline u8 i8042_data_read(void)
+#define LSR_DATA_READY  0x01
+
+static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
-        return inb(i8042_DATA);
+        int scan_code = IPC_GET_ARG2(*call);
+        kbd_push_scancode(scan_code);
 }
-
-static inline u8 i8042_status_read(void)
-{
-        return inb(i8042_STATUS);
-}
-
-static inline void i8042_command_write(u8 command)
-{
-        outb(i8042_STATUS, command);
-}
-
-#endif
 
 /**
  * @}
- */ 
+ */