Changeset 79ae36dd in mainline for uspace/drv/usbhid/mouse/mousedev.c

Timestamp:

2011-06-08T19:01:55Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

0eff68e

Parents:

764d71e

Message:

new async framework with integrated exchange tracking

• strict isolation between low-level IPC and high-level async framework with integrated exchange tracking
  • each IPC connection is represented by an async_sess_t structure
  • each IPC exchange is represented by an async_exch_t structure
  • exchange management is either based on atomic messages (EXCHANGE_ATOMIC), locking (EXCHANGE_SERIALIZE) or connection cloning (EXCHANGE_CLONE)
• async_obsolete: temporary compatibility layer to keep old async clients working (several pieces of code are currently broken, but only non-essential functionality)
• IPC_M_PHONE_HANGUP is now method no. 0 (for elegant boolean evaluation)
• IPC_M_DEBUG_ALL has been renamed to IPC_M_DEBUG
• IPC_M_PING has been removed (VFS protocol now has VFS_IN_PING)
• console routines in libc have been rewritten for better abstraction
• additional use for libc-private header files (FILE structure opaque to the client)
• various cstyle changes (typos, indentation, missing externs in header files, improved comments, etc.)

File:

• uspace/drv/usbhid/mouse/mousedev.c (modified) (8 diffs)

uspace/drv/usbhid/mouse/mousedev.c

@@ -41 +41 @@
 #include <usb/hid/usages/core.h>
 #include <errno.h>
+#include <async.h>
+#include <async_obsolete.h>
 #include <str_error.h>
 #include <ipc/mouse.h>
@@ -50 +52 @@
 #include "mousedev.h"
 #include "../usbhid.h"
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define NAME "mouse"
@@ -181 +186 @@
         // hangup phone to the console
         if ((*mouse_dev)->mouse_phone >= 0) {
-                async_hangup((*mouse_dev)->mouse_phone);
+                async_obsolete_hangup((*mouse_dev)->mouse_phone);
         }
         
         if ((*mouse_dev)->wheel_phone >= 0) {
-                async_hangup((*mouse_dev)->wheel_phone);
+                async_obsolete_hangup((*mouse_dev)->wheel_phone);
         }
         
@@ -196 +201 @@
 static void usb_mouse_send_wheel(const usb_mouse_t *mouse_dev, int wheel)
 {
-        console_event_t ev;
+        kbd_event_t ev;
         
         ev.type = KEY_PRESS;
@@ -214 +219 @@
         for (i = 0; i < count * 3; ++i) {
                 usb_log_debug2("Sending key %d to the console\n", ev.key);
-                async_msg_4(mouse_dev->wheel_phone, KBD_EVENT, ev.type, 
+                async_obsolete_msg_4(mouse_dev->wheel_phone, KBD_EVENT, ev.type, 
                     ev.key, ev.mods, ev.c);
                 // send key release right away
-                async_msg_4(mouse_dev->wheel_phone, KBD_EVENT, KEY_RELEASE, 
+                async_obsolete_msg_4(mouse_dev->wheel_phone, KBD_EVENT, KEY_RELEASE, 
                     ev.key, ev.mods, ev.c);
         }
@@ -303 +308 @@
         
         if ((shift_x != 0) || (shift_y != 0)) {
-                async_req_2_0(mouse_dev->mouse_phone,
+                async_obsolete_req_2_0(mouse_dev->mouse_phone,
                     MEVENT_MOVE, shift_x, shift_y);
         }
@@ -353 +358 @@
                 if (mouse_dev->buttons[field->usage - field->usage_minimum] == 0
                     && field->value != 0) {
-                        async_req_2_0(mouse_dev->mouse_phone,
+                        async_obsolete_req_2_0(mouse_dev->mouse_phone,
                             MEVENT_BUTTON, field->usage, 1);
                         mouse_dev->buttons[field->usage - field->usage_minimum]
@@ -360 +365 @@
                     mouse_dev->buttons[field->usage - field->usage_minimum] != 0
                     && field->value == 0) {
-                       async_req_2_0(mouse_dev->mouse_phone,
+                       async_obsolete_req_2_0(mouse_dev->mouse_phone,
                            MEVENT_BUTTON, field->usage, 0);
                        mouse_dev->buttons[field->usage - field->usage_minimum]