Changeset d900699 in mainline for uspace/srv/hid/input/port/chardev.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/chardev.c (moved) (moved from uspace/srv/hid/kbd/port/chardev.c ) (7 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <async.h>
 #include <async_obsolete.h>
+#include <input.h>
 #include <kbd_port.h>
 #include <kbd.h>
@@ -45 +46 @@
 #include <stdio.h>
 
-#define NAME  "kbd/chardev"
+static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
-static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall);
+static int chardev_port_init(kbd_dev_t *);
+static void chardev_port_yield(void);
+static void chardev_port_reclaim(void);
+static void chardev_port_write(uint8_t data);
 
+kbd_port_ops_t chardev_port = {
+        .init = chardev_port_init,
+        .yield = chardev_port_yield,
+        .reclaim = chardev_port_reclaim,
+        .write = chardev_port_write
+};
+
+static kbd_dev_t *kbd_dev;
 static int dev_phone;
 
@@ -59 +71 @@
 static const unsigned int num_devs = sizeof(in_devs) / sizeof(in_devs[0]);
 
-int kbd_port_init(void)
+static int chardev_port_init(kbd_dev_t *kdev)
 {
         devmap_handle_t handle;
         unsigned int i;
         int rc;
+        
+        kbd_dev = kdev;
         
         for (i = 0; i < num_devs; i++) {
@@ -83 +97 @@
         
         /* NB: The callback connection is slotted for removal */
-        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events) != 0) {
+        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events,
+            NULL) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return -1;
@@ -91 +106 @@
 }
 
-void kbd_port_yield(void)
+static void chardev_port_yield(void)
 {
 }
 
-void kbd_port_reclaim(void)
+static void chardev_port_reclaim(void)
 {
 }
 
-void kbd_port_write(uint8_t data)
+static void chardev_port_write(uint8_t data)
 {
         async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
 }
 
-static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall)
+static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
         /* Ignore parameters, the connection is already opened */
@@ -121 +136 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case CHAR_NOTIF_BYTE:
-                        kbd_push_scancode(IPC_GET_ARG1(call));
+                        kbd_push_scancode(kbd_dev, IPC_GET_ARG1(call));
                         break;
                 default: