Changeset 6a44ee4 in mainline for uspace/srv/hid/input/ctl/apple.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/apple.c (moved) (moved from uspace/srv/hid/kbd/ctl/apple.c ) (4 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Jiri Svoboda
  * All rights reserved.
  *
@@ -28 +28 @@
 
 /** @addtogroup kbd_ctl
- * @ingroup kbd
+ * @ingroup input
  * @{
  */
 /**
  * @file
- * @brief       Apple ADB keyboard controller driver.
+ * @brief Apple ADB keyboard controller driver.
  */
 
@@ -40 +40 @@
 #include <io/keycode.h>
 #include <kbd_ctl.h>
+#include <kbd_port.h>
+
+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 int);
+
+kbd_ctl_ops_t apple_ctl = {
+        .parse = apple_ctl_parse,
+        .init = apple_ctl_init,
+        .set_ind = apple_ctl_set_ind
+};
 
 #define KBD_KEY_RELEASE         0x80
 
+static kbd_dev_t *kbd_dev;
+
 static int scanmap[];
 
-int kbd_ctl_init(void)
+static int apple_ctl_init(kbd_dev_t *kdev)
 {
+        kbd_dev = kdev;
         return 0;
 }
 
-void kbd_ctl_parse_scancode(int scancode)
+static void apple_ctl_parse(sysarg_t scancode)
 {
-        console_ev_type_t type;
+        kbd_event_type_t type;
         unsigned int key;
 
-        if (scancode < 0 || scancode >= 0x100)
+        if (scancode >= 0x100)
                 return;
 
@@ -67 +81 @@
         key = scanmap[scancode];
         if (key != 0)
-                kbd_push_ev(type, key);
+                kbd_push_event(kbd_dev, type, key);
 }
 
-void kbd_ctl_set_ind(unsigned mods)
+static void apple_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
 {
         (void) mods;