Changes in uspace/app/tester/hw/serial/serial1.c [e80188f:9d58539] in mainline

File:

• uspace/app/tester/hw/serial/serial1.c (modified) (5 diffs)

uspace/app/tester/hw/serial/serial1.c

@@ -42 +42 @@
 #include <async.h>
 #include <ipc/services.h>
-#include <loc.h>
+#include <ipc/devman.h>
+#include <devman.h>
 #include <device/char_dev.h>
 #include <str.h>
@@ -70 +71 @@
                 }
         
-        service_id_t svc_id;
-        int res = loc_service_get_id("devices/\\hw\\pci0\\00:01.0\\com1\\a",
-            &svc_id, IPC_FLAG_BLOCKING);
+        devman_handle_t handle;
+        int res = devman_fun_get_handle("/hw/pci0/00:01.0/com1/a", &handle,
+            IPC_FLAG_BLOCKING);
         if (res != EOK)
-                return "Failed getting serial port service ID";
-        
-        async_sess_t *sess = loc_service_connect(EXCHANGE_SERIALIZE, svc_id,
+                return "Could not get serial device handle";
+        
+        async_sess_t *sess = devman_device_connect(EXCHANGE_SERIALIZE, handle,
             IPC_FLAG_BLOCKING);
         if (!sess)
-                return "Failed connecting to serial device";
+                return "Unable to connect to serial device";
         
         char *buf = (char *) malloc(cnt + 1);
         if (buf == NULL) {
                 async_hangup(sess);
-                return "Failed allocating input buffer";
+                return "Failed to allocate input buffer";
         }
         
@@ -111 +112 @@
                 free(buf);
                 async_hangup(sess);
-                return "Failed setting serial communication parameters";
-        }
-        
-        TPRINTF("Trying reading %zu characters from serial device "
-            "(svc_id=%" PRIun ")\n", cnt, svc_id);
+                return "Failed to set serial communication parameters";
+        }
+        
+        TPRINTF("Trying to read %zu characters from serial device "
+            "(handle=%" PRIun ")\n", cnt, handle);
         
         size_t total = 0;
@@ -129 +130 @@
                         free(buf);
                         async_hangup(sess);
-                        return "Failed reading from serial device";
+                        return "Failed read from serial device";
                 }
                 
@@ -164 +165 @@
                                 free(buf);
                                 async_hangup(sess);
-                                return "Failed writing to serial device";
+                                return "Failed write to serial device";
                         }