Changeset a40dea3 in mainline for uspace/srv/hid/input

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.

Location:

uspace/srv/hid/input/port

Files:

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

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

@@ -37 +37 @@
 #include <ipc/adb.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <input.h>
 #include <kbd_port.h>
@@ -45 +44 @@
 #include <errno.h>
 #include <devmap.h>
-#include <devmap_obsolete.h>
 
 static void kbd_port_events(ipc_callid_t iid, ipc_call_t *icall, void *arg);
@@ -63 +61 @@
 
 static kbd_dev_t *kbd_dev;
-static int dev_phone;
+static async_sess_t *dev_sess;
 
 static int adb_port_init(kbd_dev_t *kdev)
@@ -69 +67 @@
         const char *dev = "adb/kbd";
         devmap_handle_t handle;
-
+        async_exch_t *exch;
+        int rc;
+        
         kbd_dev = kdev;
         
-        int rc = devmap_device_get_handle(dev, &handle, 0);
-        if (rc == EOK) {
-                dev_phone = devmap_obsolete_device_connect(handle, 0);
-                if (dev_phone < 0) {
-                        printf("%s: Failed to connect to device\n", NAME);
-                        return dev_phone;
-                }
-        } else
+        rc = devmap_device_get_handle(dev, &handle, 0);
+        if (rc != EOK)
                 return rc;
         
+        dev_sess = devmap_device_connect(EXCHANGE_ATOMIC, handle, 0);
+        if (dev_sess == NULL) {
+                printf("%s: Failed to connect to device\n", NAME);
+                return ENOENT;
+        }
+        
+        exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with device\n", NAME);
+                async_hangup(dev_sess);
+                return ENOMEM;
+        }
+        
         /* NB: The callback connection is slotted for removal */
-        rc = async_obsolete_connect_to_me(dev_phone, 0, 0, 0, kbd_port_events,
-            NULL);
+        rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
+        async_exchange_end(exch);
         if (rc != EOK) {
                 printf(NAME ": Failed to create callback from device\n");
+                async_hangup(dev_sess);
                 return rc;
         }

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

@@ -37 +37 @@
 #include <ipc/char.h>
 #include <async.h>
-#include <async_obsolete.h>
 #include <input.h>
 #include <kbd_port.h>
 #include <kbd.h>
 #include <devmap.h>
-#include <devmap_obsolete.h>
 #include <errno.h>
 #include <stdio.h>
@@ -61 +59 @@
 
 static kbd_dev_t *kbd_dev;
-static int dev_phone;
+static async_sess_t *dev_sess;
 
 /** List of devices to try connecting to. */
@@ -74 +72 @@
 {
         devmap_handle_t handle;
+        async_exch_t *exch;
         unsigned int i;
         int rc;
@@ -90 +89 @@
         }
         
-        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 device\n", NAME);
                 return ENOENT;
         }
         
+        exch = async_exchange_begin(dev_sess);
+        if (exch == NULL) {
+                printf("%s: Failed starting exchange with device\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, kbd_port_events,
-            NULL) != 0) {
+        rc = async_connect_to_me(exch, 0, 0, 0, kbd_port_events, NULL);
+        async_exchange_end(exch);
+        
+        if (rc != 0) {
                 printf(NAME ": Failed to create callback from device\n");
+                async_hangup(dev_sess);
                 return -1;
         }
-
+        
         return 0;
 }
@@ -116 +126 @@
 static void chardev_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 device\n", NAME);
+                return;
+        }
+
+        async_msg_1(exch, CHAR_WRITE_BYTE, data);
+        async_exchange_end(exch);
 }