Changeset b0f00a9 in mainline for uspace/srv/hid/input/port/ns16550.c

Timestamp:

2011-11-06T22:21:05Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

898e847

Parents:

2bdf8313 (diff), 7b5f4c9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/hid/input/port/ns16550.c (moved) (moved from uspace/srv/hid/kbd/port/ns16550.c ) (4 diffs)

uspace/srv/hid/input/port/ns16550.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +39 @@
 #include <async.h>
 #include <sysinfo.h>
+#include <input.h>
 #include <kbd.h>
 #include <kbd_port.h>
-#include <sun.h>
 #include <ddi.h>
 #include <errno.h>
+
+static int ns16550_port_init(kbd_dev_t *);
+static void ns16550_port_yield(void);
+static void ns16550_port_reclaim(void);
+static void ns16550_port_write(uint8_t data);
+
+kbd_port_ops_t ns16550_port = {
+        .init = ns16550_port_init,
+        .yield = ns16550_port_yield,
+        .reclaim = ns16550_port_reclaim,
+        .write = ns16550_port_write
+};
+
+static kbd_dev_t *kbd_dev;
 
 /* NS16550 registers */
@@ -90 +105 @@
 
 static uintptr_t ns16550_physical;
-static uintptr_t ns16550_kernel; 
+static uintptr_t ns16550_kernel;
 
-int ns16550_port_init(void)
+static kbd_dev_t *kbd_dev;
+
+static int ns16550_port_init(kbd_dev_t *kdev)
 {
         void *vaddr;
-
+        
+        kbd_dev = kdev;
+        
+        sysarg_t ns16550;
+        if (sysinfo_get_value("kbd.type.ns16550", &ns16550) != EOK)
+                return -1;
+        if (!ns16550)
+                return -1;
+        
         if (sysinfo_get_value("kbd.address.physical", &ns16550_physical) != EOK)
                 return -1;
@@ -115 +140 @@
 }
 
+static void ns16550_port_yield(void)
+{
+}
+
+static void ns16550_port_reclaim(void)
+{
+}
+
+static void ns16550_port_write(uint8_t data)
+{
+        (void) data;
+}
+
 static void ns16550_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
-        int scan_code = IPC_GET_ARG2(*call);
-        kbd_push_scancode(scan_code);
+        kbd_push_data(kbd_dev, IPC_GET_ARG2(*call));
         
-        if (irc_service)
-                async_msg_1(irc_phone, IRC_CLEAR_INTERRUPT,
-                    IPC_GET_IMETHOD(*call));
+        if (irc_service) {
+                async_exch_t *exch = async_exchange_begin(irc_sess);
+                async_msg_1(exch, IRC_CLEAR_INTERRUPT, IPC_GET_IMETHOD(*call));
+                async_exchange_end(exch);
+        }
 }