Changeset 6a44ee4 in mainline for uspace/srv/hid/input/ctl/gxe_fb.c

Timestamp:

2011-07-20T15:26:21Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

efcebe1

Parents:

25bef0ff (diff), a701812 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

• uspace/srv/hid/input/ctl/gxe_fb.c (moved) (moved from uspace/srv/hid/kbd/ctl/gxe_fb.c ) (7 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2009 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +28 @@
 
 /** @addtogroup kbd_ctl
- * @ingroup kbd
+ * @ingroup input
  * @{
  */
@@ -40 +40 @@
 #include <io/keycode.h>
 #include <kbd_ctl.h>
+#include <kbd_port.h>
 #include <gsp.h>
 #include <stroke.h>
 
+static void gxe_fb_ctl_parse(sysarg_t);
+static int gxe_fb_ctl_init(kbd_dev_t *);
+static void gxe_fb_ctl_set_ind(kbd_dev_t *, unsigned int);
+
+kbd_ctl_ops_t gxe_fb_ctl = {
+        .parse = gxe_fb_ctl_parse,
+        .init = gxe_fb_ctl_init,
+        .set_ind = gxe_fb_ctl_set_ind
+};
+
+static kbd_dev_t *kbd_dev;
+
 /** Scancode parser */
 static gsp_t sp;
@@ -51 +64 @@
 #include <stdio.h>
 
-int seq_defs[] = {
+static int seq_defs[] = {
         /* Not shifted */
 
@@ -207 +220 @@
 };
 
-int kbd_ctl_init(void)
+static int gxe_fb_ctl_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
         ds = 0;
 
@@ -215 +229 @@
 }
 
-void kbd_ctl_parse_scancode(int scancode)
+static void gxe_fb_ctl_parse(sysarg_t scancode)
 {
         unsigned mods, key;
@@ -221 +235 @@
         ds = gsp_step(&sp, ds, scancode, &mods, &key);
         if (key != 0) {
-                stroke_sim(mods, key);
+                stroke_sim(kbd_dev, mods, key);
         }
 }
 
-void kbd_ctl_set_ind(unsigned mods)
+static void gxe_fb_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
 {
         (void) mods;