Changeset 7943c43 in mainline for uspace/srv/hid/input

Timestamp:

2012-01-16T22:45:38Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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.

Location:

uspace/srv/hid/input

Files:

• Makefile (modified) (2 diffs)
• generic/input.c (modified) (5 diffs)
• include/mouse.h (modified) (1 diff)
• include/mouse_proto.h (modified) (1 diff)
• port/chardev.c (modified) (1 diff)
• port/chardev_mouse.c (deleted)
• port/gxemul.c (modified) (1 diff)
• port/msim.c (modified) (1 diff)
• port/niagara.c (modified) (3 diffs)
• port/ns16550.c (modified) (1 diff)
• port/pl050.c (modified) (1 diff)
• proto/adb.c (modified) (1 diff)
• proto/mousedev.c (modified) (1 diff)
• proto/ps2.c (deleted)

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

@@ -172 +172 @@
 
 /** 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 +406 @@
          * 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 +417 @@
 #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 +450 @@
          * 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);
@@ -658 +649 @@
         
         /* 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/port/gxemul.c

@@ -90 +90 @@
         async_set_interrupt_received(gxemul_irq_handler);
         gxemul_cmds[0].addr = (void *) addr;
-        register_irq(inr, device_assign_devno(), 0, &gxemul_kbd);
+        irq_register(inr, device_assign_devno(), 0, &gxemul_kbd);
         return 0;
 }

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

@@ -89 +89 @@
         msim_cmds[0].addr = (void *) vaddr;
         async_set_interrupt_received(msim_irq_handler);
-        register_irq(inr, device_assign_devno(), 0, &msim_kbd);
+        irq_register(inr, device_assign_devno(), 0, &msim_kbd);
         
         return 0;

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

@@ -63 +63 @@
 #define POLL_INTERVAL  10000
 
-/**
- * Virtual address mapped to the buffer shared with the kernel counterpart.
- */
-static uintptr_t input_buffer_addr;
-
 /*
  * Kernel counterpart of the driver pushes characters (it has read) here.
@@ -102 +97 @@
                 return -1;
         
-        input_buffer_addr = (uintptr_t) as_get_mappable_page(PAGE_SIZE);
-        int rc = physmem_map((void *) paddr, (void *) input_buffer_addr,
-            1, AS_AREA_READ | AS_AREA_WRITE);
-        
+        int rc = physmem_map((void *) paddr, 1,
+            AS_AREA_READ | AS_AREA_WRITE, (void *) &input_buffer);
         if (rc != 0) {
                 printf("Niagara: uspace driver couldn't map physical memory: %d\n",
@@ -111 +104 @@
                 return rc;
         }
-        
-        input_buffer = (input_buffer_t) input_buffer_addr;
         
         thread_id_t tid;

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

@@ -135 +135 @@
         
         async_set_interrupt_received(ns16550_irq_handler);
-        register_irq(inr, device_assign_devno(), inr, &ns16550_kbd);
+        irq_register(inr, device_assign_devno(), inr, &ns16550_kbd);
         
         return pio_enable((void *) ns16550_physical, 8, &vaddr);

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

@@ -117 +117 @@
         
         async_set_interrupt_received(pl050_irq_handler);
-        register_irq(inr, device_assign_devno(), 0, &pl050_kbd);
+        irq_register(inr, device_assign_devno(), 0, &pl050_kbd);
         
         return 0;

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;