Changeset d900699 in mainline for uspace/srv/hid/input/port/z8530.c

Timestamp:

2011-06-17T16:48:53Z (14 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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/z8530.c (moved) (moved from uspace/srv/hid/kbd/port/z8530.c ) (5 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Martin Decky
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +40 @@
 #include <async_obsolete.h>
 #include <sysinfo.h>
+#include <input.h>
 #include <kbd.h>
 #include <kbd_port.h>
-#include <sun.h>
 #include <sys/types.h>
 #include <ddi.h>
 #include <errno.h>
+
+static int z8530_port_init(kbd_dev_t *);
+static void z8530_port_yield(void);
+static void z8530_port_reclaim(void);
+static void z8530_port_write(uint8_t data);
+
+kbd_port_ops_t z8530_port = {
+        .init = z8530_port_init,
+        .yield = z8530_port_yield,
+        .reclaim = z8530_port_reclaim,
+        .write = z8530_port_write
+};
+
+static kbd_dev_t *kbd_dev;
 
 #define CHAN_A_STATUS  4
@@ -77 +92 @@
         }
 };
-        
-irq_code_t z8530_kbd = {
+
+static irq_code_t z8530_kbd = {
         sizeof(z8530_cmds) / sizeof(irq_cmd_t),
         z8530_cmds
@@ -85 +100 @@
 static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 
-int z8530_port_init(void)
+static int z8530_port_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
+        
+        sysarg_t z8530;
+        if (sysinfo_get_value("kbd.type.z8530", &z8530) != EOK)
+                return -1;
+        if (!z8530)
+                return -1;
+        
         sysarg_t kaddr;
         if (sysinfo_get_value("kbd.address.kernel", &kaddr) != EOK)
@@ -104 +127 @@
 }
 
+static void z8530_port_yield(void)
+{
+}
+
+static void z8530_port_reclaim(void)
+{
+}
+
+static void z8530_port_write(uint8_t data)
+{
+        (void) data;
+}
+
 static void z8530_irq_handler(ipc_callid_t iid, ipc_call_t *call)
 {
         int scan_code = IPC_GET_ARG2(*call);
-        kbd_push_scancode(scan_code);
+        kbd_push_scancode(kbd_dev, scan_code);
         
         if (irc_service)