Changeset 948911d in mainline for uspace/srv/hid

Timestamp:

2012-01-24T02:27:43Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

230385c

Parents:

8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

Location:

uspace/srv/hid

Files:

• console/console.c (modified) (1 diff)
• fb/fb.c (modified) (1 diff)
• input/Makefile (modified) (2 diffs)
• input/generic/input.c (modified) (8 diffs)
• input/include/mouse.h (modified) (1 diff)
• input/include/mouse_proto.h (modified) (1 diff)
• input/port/chardev.c (modified) (1 diff)
• input/port/chardev_mouse.c (deleted)
• input/proto/adb.c (modified) (1 diff)
• input/proto/mousedev.c (modified) (1 diff)
• input/proto/ps2.c (deleted)
• remcons/Makefile (added)
• remcons/remcons.c (added)
• remcons/remcons.h (added)
• remcons/telnet.h (added)
• remcons/user.c (added)
• remcons/user.h (added)
• s3c24xx_ts/s3c24xx_ts.c (modified) (1 diff)

uspace/srv/hid/console/console.c

@@ -825 +825 @@
         
         /* Register server */
-        int rc = loc_server_register(NAME, client_connection);
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf("%s: Unable to register server (%s)\n", NAME,

uspace/srv/hid/fb/fb.c

@@ -987 +987 @@
         
         /* Register server */
-        int rc = loc_server_register(NAME, client_connection);
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 printf("%s: Unable to register driver (%d)\n", NAME, rc);

uspace/srv/hid/input/Makefile

@@ -43 +43 @@
         port/adb_mouse.c \
         port/chardev.c \
-        port/chardev_mouse.c \
         port/gxemul.c \
         port/msim.c \
@@ -52 +51 @@
         proto/adb.c \
         proto/mousedev.c \
-        proto/ps2.c \
         ctl/apple.c \
         ctl/gxe_fb.c \

uspace/srv/hid/input/generic/input.c

@@ -39 +39 @@
 #include <adt/list.h>
 #include <bool.h>
+#include <fibril_synch.h>
 #include <ipc/services.h>
 #include <ipc/input.h>
@@ -83 +84 @@
 async_sess_t *irc_sess = NULL;
 
+static FIBRIL_MUTEX_INITIALIZE(discovery_lock);
+
 void kbd_push_data(kbd_dev_t *kdev, sysarg_t data)
 {
@@ -172 +175 @@
 
 /** Mouse pointer has moved. */
-void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy)
+void mouse_push_event_move(mouse_dev_t *mdev, int dx, int dy, int dz)
 {
         async_exch_t *exch = async_exchange_begin(client_sess);
-        async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
+        if (dx || dy)
+                async_msg_2(exch, INPUT_EVENT_MOVE, dx, dy);
+        if (dz) {
+                // TODO: Implement proper wheel support
+                keycode_t code = dz > 0 ? KC_UP : KC_DOWN;
+                for (int i = 0; i < 3; ++i) {
+                        async_msg_4(exch, INPUT_EVENT_KEY, KEY_PRESS, code, 0, 0);
+                }
+                async_msg_4(exch, INPUT_EVENT_KEY, KEY_RELEASE, code, 0, 0);
+        }
         async_exchange_end(exch);
 }
@@ -397 +409 @@
          * them automatically.
          */
-#if defined(UARCH_amd64)
-        kbd_add_dev(&chardev_port, &pc_ctl);
-#endif
 #if defined(UARCH_arm32) && defined(MACHINE_gta02)
         kbd_add_dev(&chardev_port, &stty_ctl);
@@ -411 +420 @@
 #if defined(UARCH_arm32) && defined(MACHINE_integratorcp)
         kbd_add_dev(&pl050_port, &pc_ctl);
-#endif
-#if defined(UARCH_ia32)
-        kbd_add_dev(&chardev_port, &pc_ctl);
-#endif
-#if defined(MACHINE_i460GX)
-        kbd_add_dev(&chardev_port, &pc_ctl);
 #endif
 #if defined(MACHINE_ski)
@@ -450 +453 @@
          * them automatically.
          */
-#if defined(UARCH_amd64)
-        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
-#endif
-#if defined(UARCH_ia32)
-        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
-#endif
-#if defined(MACHINE_i460GX)
-        mouse_add_dev(&chardev_mouse_port, &ps2_proto);
-#endif
 #if defined(UARCH_ppc32)
         mouse_add_dev(&adb_mouse_port, &adb_proto);
@@ -602 +596 @@
         int rc;
         
+        fibril_mutex_lock(&discovery_lock);
+        
         rc = dev_check_new_kbdevs();
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 return rc;
+        }
         
         rc = dev_check_new_mousedevs();
-        if (rc != EOK)
+        if (rc != EOK) {
+                fibril_mutex_unlock(&discovery_lock);
                 return rc;
-
+        }
+        
+        fibril_mutex_unlock(&discovery_lock);
+        
         return EOK;
 }
@@ -658 +660 @@
         
         /* Register driver */
-        int rc = loc_server_register(NAME, client_connection);
+        async_set_client_connection(client_connection);
+        int rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf("%s: Unable to register server (%d)\n", NAME, rc);

uspace/srv/hid/input/include/mouse.h

@@ -62 +62 @@
 
 extern void mouse_push_data(mouse_dev_t *, sysarg_t);
-extern void mouse_push_event_move(mouse_dev_t *, int, int);
+extern void mouse_push_event_move(mouse_dev_t *, int, int, int);
 extern void mouse_push_event_button(mouse_dev_t *, int, int);
 

uspace/srv/hid/input/include/mouse_proto.h

@@ -48 +48 @@
 
 extern mouse_proto_ops_t adb_proto;
-extern mouse_proto_ops_t ps2_proto;
 extern mouse_proto_ops_t mousedev_proto;
 

uspace/srv/hid/input/port/chardev.c

@@ -63 +63 @@
 /** List of devices to try connecting to. */
 static const char *in_devs[] = {
-        "char/ps2a",
         "char/s3c24ser"
 };

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

@@ -82 +82 @@
         
         if (dx != 0 || dy != 0)
-                mouse_push_event_move(mouse_dev, dx, dy);
+                mouse_push_event_move(mouse_dev, dx, dy, 0);
 }
 

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

@@ -91 +91 @@
                 switch (IPC_GET_IMETHOD(call)) {
                 case MOUSEEV_MOVE_EVENT:
-                        mouse_push_event_move(mousedev->mouse_dev, IPC_GET_ARG1(call),
-                            IPC_GET_ARG2(call));
+                        mouse_push_event_move(mousedev->mouse_dev,
+                            IPC_GET_ARG1(call), IPC_GET_ARG2(call),
+                            IPC_GET_ARG3(call));
                         retval = EOK;
                         break;
                 case MOUSEEV_BUTTON_EVENT:
-                        mouse_push_event_button(mousedev->mouse_dev, IPC_GET_ARG1(call),
-                            IPC_GET_ARG2(call));
+                        mouse_push_event_button(mousedev->mouse_dev,
+                            IPC_GET_ARG1(call), IPC_GET_ARG2(call));
                         retval = EOK;
                         break;

uspace/srv/hid/s3c24xx_ts/s3c24xx_ts.c

@@ -85 +85 @@
 
         printf(NAME ": S3C24xx touchscreen driver\n");
-
-        rc = loc_server_register(NAME, s3c24xx_ts_connection);
+        
+        async_set_client_connection(s3c24xx_ts_connection);
+        rc = loc_server_register(NAME);
         if (rc < 0) {
                 printf(NAME ": Unable to register driver.\n");