Changeset 24ff4df in mainline for uspace/srv/kbd/port/sgcn.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/sgcn.c (moved) (moved from uspace/srv/kbd/arch/sparc64/src/sgcn.c ) (5 diffs)

uspace/srv/kbd/port/sgcn.c

@@ -27 +27 @@
  */
 
-/** @addtogroup kbdsparc64 sparc64
- * @brief       Serengeti-specific parts of uspace keyboard handler.
+/** @addtogroup kbd_port
  * @ingroup  kbd
  * @{
  */ 
 /** @file
+ * @brief       Z8350 keyboard port driver.
+ * @brief       SGCN (Serengeti Console) keyboard port driver.
  */
 
-#include <arch/sgcn.h>
 #include <as.h>
 #include <ddi.h>
 #include <ipc/ipc.h>
+#include <async.h>
 #include <kbd.h>
-#include <genarch/nofb.h>
-#include <genarch/kbd.h>
+#include <kbd_port.h>
 #include <sysinfo.h>
 #include <stdio.h>
-#include <futex.h>
 
 /**
@@ -80 +79 @@
 #define SGCN_BUFFER_HEADER      (SGCN_BUFFER(sgcn_buffer_header_t, 0))
 
-extern keybuffer_t keybuffer;
-
 /**
  * Virtual address mapped to SRAM.
@@ -92 +89 @@
 static uintptr_t sram_buffer_offset;
 
+static void sgcn_irq_handler(ipc_callid_t iid, ipc_call_t *call);
+
+
 /**
  * Initializes the SGCN driver.
  * Maps the physical memory (SRAM) and registers the interrupt. 
  */
-void sgcn_init(void)
+int kbd_port_init(void)
 {
+        async_set_interrupt_received(sgcn_irq_handler);
         sram_virt_addr = (uintptr_t) as_get_mappable_page(sysinfo_value("sram.area.size"));
         if (physmem_map((void *) sysinfo_value("sram.address.physical"),
             (void *) sram_virt_addr, sysinfo_value("sram.area.size") / PAGE_SIZE,
-            AS_AREA_READ | AS_AREA_WRITE) != 0)
+            AS_AREA_READ | AS_AREA_WRITE) != 0) {
                 printf("SGCN: uspace driver could not map physical memory.");
+                return -1;
+        }
         
         sram_buffer_offset = sysinfo_value("sram.buffer.offset");
         ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),
                 0, (void *) 0);
+        return 0;
 }
 
@@ -113 +117 @@
  * the buffer. 
  */
-void sgcn_key_pressed(void)
+static void sgcn_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
         char c;
@@ -131 +135 @@
                 buf_ptr = (volatile char *)
                         SGCN_BUFFER(char, SGCN_BUFFER_HEADER->in_rdptr);
-                if (c == '\r') {
-                        c = '\n';
-                }
-                kbd_process_no_fb(&keybuffer, c);
+                kbd_push_scancode(c);
         }
 }