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

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

@@ -33 +33 @@
 /**
  * @file
- * @brief       Apple ADB keyboard controller driver.
+ * @brief Apple ADB keyboard controller driver.
  */
 
@@ -42 +42 @@
 #include <kbd_port.h>
 
-static void apple_ctl_parse_scancode(int);
+static void apple_ctl_parse(sysarg_t);
 static int apple_ctl_init(kbd_dev_t *);
-static void apple_ctl_set_ind(kbd_dev_t *, unsigned);
+static void apple_ctl_set_ind(kbd_dev_t *, unsigned int);
 
 kbd_ctl_ops_t apple_ctl = {
-        .parse_scancode = apple_ctl_parse_scancode,
+        .parse = apple_ctl_parse,
         .init = apple_ctl_init,
         .set_ind = apple_ctl_set_ind
@@ -64 +64 @@
 }
 
-static void apple_ctl_parse_scancode(int scancode)
+static void apple_ctl_parse(sysarg_t scancode)
 {
         kbd_event_type_t type;
         unsigned int key;
 
-        if (scancode < 0 || scancode >= 0x100)
+        if (scancode >= 0x100)
                 return;
 
@@ -81 +81 @@
         key = scanmap[scancode];
         if (key != 0)
-                kbd_push_ev(kbd_dev, type, key);
+                kbd_push_event(kbd_dev, type, key);
 }