Changeset 9be360ee in mainline for uspace/srv/hid/kbd/port/chardev.c

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4f3f9659

Parents:

56ad818

Message:

Allow keyboard server to handle more than one driver at the same time.

File:

• uspace/srv/hid/kbd/port/chardev.c (modified) (5 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall);
 
-static int chardev_port_init(void);
+static int chardev_port_init(kbd_dev_t *);
 static void chardev_port_yield(void);
 static void chardev_port_reclaim(void);
@@ -61 +61 @@
 };
 
+static kbd_dev_t *kbd_dev;
 static int dev_phone;
 
@@ -71 +72 @@
 static const unsigned int num_devs = sizeof(in_devs) / sizeof(in_devs[0]);
 
-static int chardev_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++) {
@@ -133 +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: