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

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.

Location:

uspace/srv/hid/kbd/ctl

Files:

• apple.c (modified) (4 diffs)
• gxe_fb.c (modified) (5 diffs)
• pc.c (modified) (6 diffs)
• stty.c (modified) (5 diffs)
• sun.c (modified) (5 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);
 }
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -44 +44 @@
 #include <stroke.h>
 
-static void gxe_fb_ctl_parse_scancode(int scancode);
-static int gxe_fb_ctl_init(kbd_port_ops_t *kbd_port);
-static void gxe_fb_ctl_set_ind(unsigned mods);
+static void gxe_fb_ctl_parse_scancode(int);
+static int gxe_fb_ctl_init(kbd_dev_t *);
+static void gxe_fb_ctl_set_ind(unsigned);
 
 kbd_ctl_ops_t gxe_fb_ctl = {
@@ -53 +53 @@
         .set_ind = gxe_fb_ctl_set_ind
 };
+
+static kbd_dev_t *kbd_dev;
 
 /** Scancode parser */
@@ -218 +220 @@
 };
 
-static int gxe_fb_ctl_init(kbd_port_ops_t *kbd_port)
+static int gxe_fb_ctl_init(kbd_dev_t *kdev)
 {
-        (void) kbd_port;
+        kbd_dev = kdev;
         ds = 0;
 
@@ -233 +235 @@
         ds = gsp_step(&sp, ds, scancode, &mods, &key);
         if (key != 0) {
-                stroke_sim(mods, key);
+                stroke_sim(kbd_dev, mods, key);
         }
 }

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);
 }
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 #include <stroke.h>
 
-static void stty_ctl_parse_scancode(int scancode);
-static int stty_ctl_init(kbd_port_ops_t *kbd_port);
-static void stty_ctl_set_ind(unsigned mods);
+static void stty_ctl_parse_scancode(int);
+static int stty_ctl_init(kbd_dev_t *);
+static void stty_ctl_set_ind(unsigned);
 
 kbd_ctl_ops_t stty_ctl = {
@@ -52 +52 @@
         .set_ind = stty_ctl_set_ind
 };
+
+static kbd_dev_t *kbd_dev;
 
 /** Scancode parser */
@@ -217 +219 @@
 };
 
-static int stty_ctl_init(kbd_port_ops_t *kbd_port)
+static int stty_ctl_init(kbd_dev_t *kdev)
 {
-        (void) kbd_port;
+        kbd_dev = kdev;
         ds = 0;
 
@@ -232 +234 @@
         ds = gsp_step(&sp, ds, scancode, &mods, &key);
         if (key != 0) {
-                stroke_sim(mods, key);
+                stroke_sim(kbd_dev, mods, key);
         }
 }

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);
 }