Changeset a40dea3 in mainline for uspace/srv/hid/char_mouse/chardev.c

Timestamp:

2011-06-20T20:04:39Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

6a0ff7f4

Parents:

5203e256

Message:

Eliminate devmap_obsolete API.

File:

• uspace/srv/hid/char_mouse/chardev.c (modified) (5 diffs)

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>
@@ -47 +45 @@
 static void chardev_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
 
-static int dev_phone;
+static async_sess_t *dev_sess;
 
 #define NAME "char_mouse"
@@ -54 +52 @@
 {
         devmap_handle_t handle;
-        int rc = devmap_device_get_handle("char/ps2b", &handle,
+        async_exch_t *exch;
+        int rc;
+        
+        rc = devmap_device_get_handle("char/ps2b", &handle,
             IPC_FLAG_BLOCKING);
         
@@ -62 +63 @@
         }
         
-        dev_phone = devmap_obsolete_device_connect(handle, IPC_FLAG_BLOCKING);
-        if (dev_phone < 0) {
+        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle,
+            IPC_FLAG_BLOCKING);
+        if (dev_sess == NULL) {
                 printf("%s: Failed connecting to PS/2\n", NAME);
                 return ENOENT;
         }
         
+        exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with PS/2\n", NAME);
+                async_hangup(dev_sess);
+                return ENOMEM;
+        }
+        
         /* NB: The callback connection is slotted for removal */
-        if (async_obsolete_connect_to_me(dev_phone, 0, 0, 0, chardev_events,
-            NULL) != 0) {
+        rc = async_connect_to_me(exch, 0, 0, 0, chardev_events, NULL);
+        async_exchange_end(exch);
+        
+        if (rc != 0) {
                 printf(NAME ": Failed to create callback from device\n");
+                async_hangup(dev_sess);
                 return false;
         }
@@ -88 +100 @@
 void mouse_port_write(uint8_t data)
 {
-        async_obsolete_msg_1(dev_phone, CHAR_WRITE_BYTE, data);
+        async_exch_t *exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with PS/2\n", NAME);
+                return;
+        }
+        
+        async_msg_1(exch, CHAR_WRITE_BYTE, data);
+        
+        async_exchange_end(exch);
 }