Changeset a2afd8f in mainline for uspace/drv/hid

Timestamp:

2017-11-13T18:07:46Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

0dd4779

Parents:

56763a4

Message:

Move ADB keyboard and mouse support to separate drivers.

Location:

uspace/drv/hid

Files:

• adb-kbd/Makefile (added)
• adb-kbd/adb-kbd.c (added)
• adb-kbd/adb-kbd.h (added)
• adb-kbd/adb-kbd.ma (added)
• adb-kbd/ctl.c (moved) (moved from uspace/srv/hid/input/ctl/apple.c ) (2 diffs)
• adb-kbd/ctl.h (added)
• adb-kbd/main.c (added)
• adb-mouse/Makefile (added)
• adb-mouse/adb-mouse.c (added)
• adb-mouse/adb-mouse.h (moved) (moved from uspace/srv/hid/input/proto/adb.c ) (2 diffs)
• adb-mouse/adb-mouse.ma (added)
• adb-mouse/main.c (added)

uspace/drv/hid/adb-kbd/ctl.c

@@ -27 +27 @@
  */
 
-/** @addtogroup kbd_ctl
- * @ingroup input
- * @{
- */
 /**
  * @file
- * @brief Apple ADB keyboard controller driver.
- */
-
+ * @brief Apple ADB keyboard controller
+ */
+
+#include <errno.h>
 #include <io/console.h>
 #include <io/keycode.h>
-#include "../kbd.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
-};
+
+#include "ctl.h"
 
 #define KBD_KEY_RELEASE  0x80
@@ -185 +171 @@
 };
 
-static kbd_dev_t *kbd_dev;
-
-static int apple_ctl_init(kbd_dev_t *kdev)
+/** Translate ADB keyboard scancode into keyboard event.
+ *
+ * @param scancode Scancode
+ * @param rtype Place to store type of keyboard event (press or release)
+ * @param rkey Place to store key code
+ *
+ * @return EOK on success, ENOENT if no translation exists
+ */
+int adb_kbd_key_translate(sysarg_t scancode, kbd_event_type_t *rtype,
+    unsigned int *rkey)
 {
-        kbd_dev = kdev;
-        return 0;
-}
-
-static void apple_ctl_parse(sysarg_t scancode)
-{
-        kbd_event_type_t type;
-        
+        kbd_event_type_t etype;
+        unsigned int key;
+
         if (scancode & KBD_KEY_RELEASE) {
                 scancode &= ~KBD_KEY_RELEASE;
-                type = KEY_RELEASE;
-        } else
-                type = KEY_PRESS;
-        
+                etype = KEY_RELEASE;
+        } else {
+                etype = KEY_PRESS;
+        }
+
         if (scancode >= sizeof(scanmap) / sizeof(unsigned int))
-                return;
-        
-        unsigned int key = scanmap[scancode];
-        if (key != 0)
-                kbd_push_event(kbd_dev, type, key);
+                return ENOENT;
+
+        key = scanmap[scancode];
+        if (key == 0)
+                return ENOENT;
+
+        *rtype = etype;
+        *rkey = key;
+        return EOK;
 }
 
-static void apple_ctl_set_ind(kbd_dev_t *kdev, unsigned mods)
-{
-        (void) mods;
-}
-
 /** @}
  */

uspace/drv/hid/adb-mouse/adb-mouse.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2011 Martin Decky
+ * Copyright (c) 2017 Jiri Svoboda
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mouse_proto
- * @ingroup input
- * @{
- */
-/**
- * @file
- * @brief ADB protocol driver.
+/** @file ADB mouse driver
  */
 
+#ifndef ADB_MOUSE_H
+#define ADB_MOUSE_H
+
+#include <async.h>
+#include <ddf/driver.h>
 #include <stdbool.h>
-#include "../mouse.h"
-#include "../mouse_port.h"
-#include "../mouse_proto.h"
 
-static mouse_dev_t *mouse_dev;
-static bool b1_pressed;
-static bool b2_pressed;
+/** ADB mouse */
+typedef struct {
+        ddf_dev_t *dev;
+        async_sess_t *parent_sess;
+        ddf_fun_t *fun;
+        async_sess_t *client_sess;
+        bool b1_pressed;
+        bool b2_pressed;
+} adb_mouse_t;
 
-static int adb_proto_init(mouse_dev_t *mdev)
-{
-        mouse_dev = mdev;
-        b1_pressed = false;
-        b2_pressed = false;
-        
-        return 0;
-}
+extern int adb_mouse_add(adb_mouse_t *);
+extern int adb_mouse_remove(adb_mouse_t *);
+extern int adb_mouse_gone(adb_mouse_t *);
 
-/** Process mouse data */
-static void adb_proto_parse(sysarg_t data)
-{
-        bool b1, b2;
-        uint16_t udx, udy;
-        int dx, dy;
-        
-        /* Extract fields. */
-        b1 = ((data >> 15) & 1) == 0;
-        udy = (data >> 8) & 0x7f;
-        b2 = ((data >> 7) & 1) == 0;
-        udx = data & 0x7f;
-        
-        /* Decode 7-bit two's complement signed values. */
-        dx = (udx & 0x40) ? (udx - 0x80) : udx;
-        dy = (udy & 0x40) ? (udy - 0x80) : udy;
-        
-        if (b1 != b1_pressed) {
-                mouse_push_event_button(mouse_dev, 1, b1);
-                b1_pressed = b1;
-        }
-        
-        if (b2 != b2_pressed) {
-                mouse_push_event_button(mouse_dev, 2, b2);
-                b1_pressed = b1;
-        }
-        
-        if (dx != 0 || dy != 0)
-                mouse_push_event_move(mouse_dev, dx, dy, 0);
-}
+#endif
 
-mouse_proto_ops_t adb_proto = {
-        .parse = adb_proto_parse,
-        .init = adb_proto_init
-};
-
-/**
- * @}
+/** @}
  */