Changeset 9be360ee in mainline for uspace/srv/hid/kbd/ctl/sun.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/ctl/sun.c (modified) (5 diffs)

uspace/srv/hid/kbd/ctl/sun.c

@@ -1 +1 @@
 /*
  * Copyright (c) 2006 Jakub Jermar
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +43 @@
 #include <kbd_port.h>
 
-static void sun_ctl_parse_scancode(int scancode);
-static int sun_ctl_init(kbd_port_ops_t *kbd_port);
-static void sun_ctl_set_ind(unsigned mods);
+static void sun_ctl_parse_scancode(int);
+static int sun_ctl_init(kbd_dev_t *);
+static void sun_ctl_set_ind(unsigned);
 
 kbd_ctl_ops_t sun_ctl = {
@@ -52 +53 @@
 };
 
+static kbd_dev_t *kbd_dev;
+
 #define KBD_KEY_RELEASE         0x80
 #define KBD_ALL_KEYS_UP         0x7f
@@ -57 +60 @@
 static int scanmap_simple[];
 
-static int sun_ctl_init(kbd_port_ops_t *kbd_port)
+static int sun_ctl_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
         return 0;
 }
@@ -82 +86 @@
         key = scanmap_simple[scancode];
         if (key != 0)
-                kbd_push_ev(type, key);
+                kbd_push_ev(kbd_dev, type, key);
 }