Changeset 3b2e387 in mainline for uspace/srv/hid/input/ctl/pc.c

Timestamp:

2011-06-21T19:36:05Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

e3a6c45

Parents:

40f606b (diff), 022d9f67 (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 input server, console and various other improvements

File:

• uspace/srv/hid/input/ctl/pc.c (modified) (3 diffs)

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

@@ -43 +43 @@
 #include <gsp.h>
 
-static void pc_ctl_parse_scancode(int);
+static void pc_ctl_parse(sysarg_t);
 static int pc_ctl_init(kbd_dev_t *);
-static void pc_ctl_set_ind(kbd_dev_t *, unsigned);
+static void pc_ctl_set_ind(kbd_dev_t *, unsigned int);
 
 kbd_ctl_ops_t pc_ctl = {
-        .parse_scancode = pc_ctl_parse_scancode,
+        .parse = pc_ctl_parse,
         .init = pc_ctl_init,
         .set_ind = pc_ctl_set_ind
@@ -215 +215 @@
 }
 
-static void pc_ctl_parse_scancode(int scancode)
+static void pc_ctl_parse(sysarg_t scancode)
 {
         kbd_event_type_t type;
@@ -257 +257 @@
         }
 
-        if ((scancode < 0) || ((size_t) scancode >= map_length))
+        if ((size_t) scancode >= map_length)
                 return;
 
         key = map[scancode];
         if (key != 0)
-                kbd_push_ev(kbd_dev, type, key);
+                kbd_push_event(kbd_dev, type, key);
 }