Changeset 85f2064 in mainline for uspace/app/tester/hw/serial/serial1.c

Timestamp:

2012-04-12T14:21:46Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

bb8f69d

Parents:

751cabc (diff), d11a181 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

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