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

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
 #include <kbd_port.h>
 
-static void apple_ctl_parse_scancode(int scancode);
-static int apple_ctl_init(kbd_port_ops_t *kbd_port);
-static void apple_ctl_set_ind(unsigned mods);
+static void apple_ctl_parse_scancode(int);
+static int apple_ctl_init(kbd_dev_t *);
+static void apple_ctl_set_ind(unsigned);
 
 kbd_ctl_ops_t apple_ctl = {
@@ -54 +54 @@
 #define KBD_KEY_RELEASE         0x80
 
+static kbd_dev_t *kbd_dev;
+
 static int scanmap[];
 
-static int apple_ctl_init(kbd_port_ops_t *kbd_port)
+static int apple_ctl_init(kbd_dev_t *kdev)
 {
-        (void) kbd_port;
+        kbd_dev = kdev;
         return 0;
 }
@@ -79 +81 @@
         key = scanmap[scancode];
         if (key != 0)
-                kbd_push_ev(type, key);
+                kbd_push_ev(kbd_dev, type, key);
 }