Changeset 79ae36dd in mainline for uspace/srv/hid/char_mouse

Timestamp:

2011-06-08T19:01:55Z (15 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.)

Location:

uspace/srv/hid/char_mouse

Files:

• char_mouse.c (modified) (5 diffs)
• chardev.c (modified) (4 diffs)

uspace/srv/hid/char_mouse/char_mouse.c

@@ -43 +43 @@
 #include <stdlib.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <errno.h>
 #include <devmap.h>
-
 #include <char_mouse.h>
 #include <mouse_port.h>
 #include <mouse_proto.h>
+
+// FIXME: remove this header
+#include <kernel/ipc/ipc_methods.h>
 
 #define NAME       "mouse"
@@ -65 +68 @@
 /*      printf("ev_btn: button %d, press %d\n", button, press);*/
         if (client_phone != -1) {
-                async_msg_2(client_phone, MEVENT_BUTTON, button, press);
+                async_obsolete_msg_2(client_phone, MEVENT_BUTTON, button, press);
         }
 }
@@ -73 +76 @@
 /*      printf("ev_move: dx %d, dy %d\n", dx, dy);*/
         if (client_phone != -1)
-                async_msg_2(client_phone, MEVENT_MOVE, dx, dy);
+                async_obsolete_msg_2(client_phone, MEVENT_MOVE, dx, dy);
 }
 
@@ -86 +89 @@
         while (1) {
                 callid = async_get_call(&call);
-                switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
+                
+                if (!IPC_GET_IMETHOD(call)) {
                         if (client_phone != -1) {
-                                async_hangup(client_phone);
+                                async_obsolete_hangup(client_phone);
                                 client_phone = -1;
                         }
@@ -95 +98 @@
                         async_answer_0(callid, EOK);
                         return;
+                }
+                
+                switch (IPC_GET_IMETHOD(call)) {
                 case IPC_M_CONNECT_TO_ME:
                         if (client_phone != -1) {

uspace/srv/hid/char_mouse/chardev.c

@@ -36 +36 @@
 #include <ipc/char.h>
 #include <async.h>
+#include <async_obsolete.h>
 #include <vfs/vfs.h>
 #include <fcntl.h>
 #include <errno.h>
-
+#include <devmap.h>
+#include <devmap_obsolete.h>
 #include <char_mouse.h>
 #include <mouse_port.h>
@@ -51 +53 @@
 int mouse_port_init(void)
 {
-        const char *input = "/dev/char/ps2b";
-        int input_fd;
-
-        printf(NAME ": open %s\n", input);
-
-        input_fd = open(input, O_RDONLY);
-        if (input_fd < 0) {
-                printf(NAME ": Failed opening %s (%d)\n", input, input_fd);
-                return false;
+        devmap_handle_t handle;
+        int rc = devmap_device_get_handle("char/ps2b", &handle,
+            IPC_FLAG_BLOCKING);
+        
+        if (rc != EOK) {
+                printf("%s: Failed resolving PS/2\n", NAME);
+                return rc;
         }
-
-        dev_phone = fd_phone(input_fd);
+        
+        dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
         if (dev_phone < 0) {
-                printf(NAME ": Failed to connect to device\n");
-                return false;
+                printf("%s: Failed connecting to PS/2\n", NAME);
+                return ENOENT;
         }
-
+        
         /* NB: The callback connection is slotted for removal */
-        if (async_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) {
+        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, chardev_events) != 0) {
                 printf(NAME ": Failed to create callback from device\n");
                 return false;
         }
-
+        
         return 0;
 }
@@ -87 +87 @@
 void mouse_port_write(uint8_t data)
 {
-        async_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
+        async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
 }
 
@@ -99 +99 @@
 
                 int retval;
+                
+                if (!IPC_GET_IMETHOD(call)) {
+                        /* TODO: Handle hangup */
+                        return;
+                }
 
                 switch (IPC_GET_IMETHOD(call)) {
-                case IPC_M_PHONE_HUNGUP:
-                        /* TODO: Handle hangup */
-                        return;
                 case IPC_FIRST_USER_METHOD:
                         mouse_handle_byte(IPC_GET_ARG1(call));