Changeset 9be360ee in mainline for uspace/srv/hid/kbd/ctl/pc.c

Timestamp:

2011-06-11T22:06:47Z (15 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/pc.c (modified) (6 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 #include <gsp.h>
 
-static void pc_ctl_parse_scancode(int scancode);
-static int pc_ctl_init(kbd_port_ops_t *kbd_port);
-static void pc_ctl_set_ind(unsigned mods);
+static void pc_ctl_parse_scancode(int);
+static int pc_ctl_init(kbd_dev_t *);
+static void pc_ctl_set_ind(unsigned);
 
 kbd_ctl_ops_t pc_ctl = {
@@ -74 +74 @@
 
 static enum dec_state ds;
-static kbd_port_ops_t *kbd_port;
+static kbd_dev_t *kbd_dev;
 
 static int scanmap_simple[] = {
@@ -208 +208 @@
 };
 
-static int pc_ctl_init(kbd_port_ops_t *kbd_p)
+static int pc_ctl_init(kbd_dev_t *kdev)
 {
-        kbd_port = kbd_p;
+        kbd_dev = kdev;
         ds = ds_s;
         return 0;
@@ -262 +262 @@
         key = map[scancode];
         if (key != 0)
-                kbd_push_ev(type, key);
+                kbd_push_ev(kbd_dev, type, key);
 }
 
@@ -277 +277 @@
                 b = b | LI_SCROLL;
 
-        (*kbd_port->write)(KBD_CMD_SET_LEDS);
-        (*kbd_port->write)(b);
+        (*kbd_dev->port_ops->write)(KBD_CMD_SET_LEDS);
+        (*kbd_dev->port_ops->write)(b);
 }