Changeset 03362fbd in mainline for uspace/srv/hid/input/input.c

Timestamp:

2013-02-09T23:14:45Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

22dfd38

Parents:

b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:

• uspace/srv/hid/input/input.c (moved) (moved from uspace/srv/hid/input/generic/input.c ) (8 diffs)

uspace/srv/hid/input/input.c

@@ -38 +38 @@
 
 #include <adt/list.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <fibril_synch.h>
 #include <ipc/services.h>
@@ -54 +54 @@
 #include <io/keycode.h>
 #include <loc.h>
-#include <input.h>
-#include <kbd.h>
-#include <kbd_port.h>
-#include <kbd_ctl.h>
-#include <mouse_proto.h>
-#include <layout.h>
-#include <mouse.h>
-
-#define NUM_LAYOUTS  3
+#include "layout.h"
+#include "kbd.h"
+#include "kbd_port.h"
+#include "kbd_ctl.h"
+#include "mouse.h"
+#include "mouse_proto.h"
+#include "input.h"
+
+#define NUM_LAYOUTS  4
 
 static layout_ops_t *layout[NUM_LAYOUTS] = {
         &us_qwerty_ops,
         &us_dvorak_ops,
-        &cz_ops
+        &cz_ops,
+        &ar_ops
 };
 
@@ -163 +164 @@
         }
         
+        if (type == KEY_PRESS && (kdev->mods & KM_LCTRL) &&
+            key == KC_F4) {
+                layout_destroy(kdev->active_layout);
+                kdev->active_layout = layout_create(layout[3]);
+                return;
+        }
+        
         ev.type = type;
         ev.key = key;
@@ -189 +197 @@
         }
         async_exchange_end(exch);
+}
+
+/** Mouse pointer has moved in absolute mode. */
+void mouse_push_event_abs_move(mouse_dev_t *mdev, unsigned int x, unsigned int y,
+    unsigned int max_x, unsigned int max_y)
+{
+        if (max_x && max_y) {
+                async_exch_t *exch = async_exchange_begin(client_sess);
+                async_msg_4(exch, INPUT_EVENT_ABS_MOVE, x, y, max_x, max_y);
+                async_exchange_end(exch);
+        }
 }
 
@@ -412 +431 @@
         kbd_add_dev(&chardev_port, &stty_ctl);
 #endif
-#if defined(UARCH_arm32) && defined(MACHINE_testarm) && defined(CONFIG_FB)
-        kbd_add_dev(&gxemul_port, &gxe_fb_ctl);
-#endif
-#if defined(UARCH_arm32) && defined(MACHINE_testarm) && !defined(CONFIG_FB)
-        kbd_add_dev(&gxemul_port, &stty_ctl);
-#endif
 #if defined(UARCH_arm32) && defined(MACHINE_integratorcp)
         kbd_add_dev(&pl050_port, &pc_ctl);
@@ -635 +648 @@
 }
 
+static void usage(char *name)
+{
+        printf("Usage: %s <service_name>\n", name);
+}
+
 int main(int argc, char **argv)
 {
+        if (argc < 2) {
+                usage(argv[0]);
+                return 1;
+        }
+        
         printf("%s: HelenOS input service\n", NAME);
         
@@ -667 +690 @@
         }
         
-        char kbd[LOC_NAME_MAXLEN + 1];
-        snprintf(kbd, LOC_NAME_MAXLEN, "%s/%s", NAMESPACE, NAME);
-        
         service_id_t service_id;
-        rc = loc_service_register(kbd, &service_id);
-        if (rc != EOK) {
-                printf("%s: Unable to register service %s\n", NAME, kbd);
+        rc = loc_service_register(argv[1], &service_id);
+        if (rc != EOK) {
+                printf("%s: Unable to register service %s\n", NAME, argv[1]);
                 return rc;
         }
@@ -681 +701 @@
         
         printf("%s: Accepting connections\n", NAME);
+        task_retval(0);
         async_manager();