Changeset f1fae414 in mainline for uspace/srv/hid/input/port/msim.c

Timestamp:

2011-06-22T01:34:53Z (13 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

8d7e82c1, cac458f

Parents:

72ec8cc (diff), bf172825 (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/msim.c (moved) (moved from uspace/srv/hid/kbd/port/msim.c ) (6 diffs)

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Josef Cejka
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +43 @@
 #include <errno.h>
 
-irq_cmd_t msim_cmds[] = {
+static int msim_port_init(kbd_dev_t *);
+static void msim_port_yield(void);
+static void msim_port_reclaim(void);
+static void msim_port_write(uint8_t data);
+
+kbd_port_ops_t msim_port = {
+        .init = msim_port_init,
+        .yield = msim_port_yield,
+        .reclaim = msim_port_reclaim,
+        .write = msim_port_write
+};
+
+static kbd_dev_t *kbd_dev;
+
+static irq_cmd_t msim_cmds[] = {
         {
                 .cmd = CMD_PIO_READ_8,
@@ -51 +66 @@
                 .cmd = CMD_ACCEPT
         }
-        
 };
 
-irq_code_t msim_kbd = {
+static irq_code_t msim_kbd = {
         sizeof(msim_cmds) / sizeof(irq_cmd_t),
         msim_cmds
@@ -61 +75 @@
 static void msim_irq_handler(ipc_callid_t iid, ipc_call_t *call);
 
-int kbd_port_init(void)
+static int msim_port_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
+
         sysarg_t vaddr;
         if (sysinfo_get_value("kbd.address.virtual", &vaddr) != EOK)
@@ -78 +94 @@
 }
 
-void kbd_port_yield(void)
+static void msim_port_yield(void)
 {
 }
 
-void kbd_port_reclaim(void)
+static void msim_port_reclaim(void)
 {
 }
 
-void kbd_port_write(uint8_t data)
+static void msim_port_write(uint8_t data)
 {
         (void) data;
@@ -93 +109 @@
 static void msim_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));
 }
 
 /** @}
-*/
+ */