Changeset 1875a0c in mainline for uspace/srv/hid/input/proto/adb.c

Timestamp:

2011-06-21T19:10:20Z (13 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

022d9f67

Parents:

a9d85df

Message:

input server improvements

• integrate legacy port mouse drivers (PS/2, ADB) into the input server (to be on par with the legacy keyboard drivers)
• create generic port/protocol layers for the mouse in the input server
• rename the "hid_in" namespace to "hid" namespace (hid_in/input was rather redundant)
• rename the mouse event IPC messages to be more consistent with the keyboard event messages
• rename input server ops structure members to be more generic (parse_scancode → parse)
• cstyle changes (newlines, comments, printouts)

File:

• uspace/srv/hid/input/proto/adb.c (moved) (moved from uspace/srv/hid/adb_mouse/adb_mouse.h ) (2 diffs)

uspace/srv/hid/input/proto/adb.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2010 Jiri Svoboda
+ * Copyright (c) 2011 Martin Decky
  * All rights reserved.
  *
@@ -27 +27 @@
  */
 
-/** @addtogroup mouse
- * @brief
+/** @addtogroup mouse_proto
+ * @ingroup input
  * @{
  */
-/** @file
+/**
+ * @file
+ * @brief ADB protocol driver.
  */
 
-#ifndef ADB_MOUSE_H_
-#define ADB_MOUSE_H_
+#include <bool.h>
+#include <mouse.h>
+#include <mouse_port.h>
+#include <mouse_proto.h>
 
-#include <sys/types.h>
+static mouse_dev_t *mouse_dev;
+static bool b1_pressed;
+static bool b2_pressed;
 
-#define NAME       "adb_ms"
-#define NAMESPACE  "hid_in"
+static int adb_proto_init(mouse_dev_t *mdev)
+{
+        mouse_dev = mdev;
+        b1_pressed = false;
+        b2_pressed = false;
+        
+        return 0;
+}
 
-extern void mouse_handle_data(uint16_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);
+}
 
-#endif
+mouse_proto_ops_t adb_proto = {
+        .parse = adb_proto_parse,
+        .init = adb_proto_init
+};
 
 /**