Changes in uspace/app/tester/hw/serial/serial1.c [c4c6025:74017ce] in mainline

File:

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

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

@@ -35 +35 @@
  */
 
-#include <inttypes.h>
+#include <async.h>
 #include <errno.h>
+#include <io/chardev.h>
+#include <io/serial.h>
+#include <ipc/services.h>
+#include <loc.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <stddef.h>
-#include <async.h>
+#include <str.h>
 #include <thread.h>
-#include <ipc/services.h>
-#include <loc.h>
-#include <char_dev_iface.h>
-#include <str.h>
-#include <io/serial.h>
 #include "../../tester.h"
 
@@ -57 +56 @@
         size_t cnt;
         serial_t *serial;
+        chardev_t *chardev;
+        int rc;
+        size_t nread;
+        size_t nwritten;
         
         if (test_argc < 1)
@@ -83 +86 @@
                 return "Failed connecting to serial device";
         
+        res = chardev_open(sess, &chardev);
+        if (res != EOK) {
+                async_hangup(sess);
+                return "Failed opening serial port";
+        }
+        
         res = serial_open(sess, &serial);
-        if (res != EOK)
+        if (res != EOK) {
+                chardev_close(chardev);
+                async_hangup(sess);
                 return "Failed opening serial port";
+        }
         
         char *buf = (char *) malloc(cnt + 1);
         if (buf == NULL) {
+                chardev_close(chardev);
                 serial_close(serial);
                 async_hangup(sess);
@@ -103 +116 @@
         if (res != EOK) {
                 free(buf);
+                chardev_close(chardev);
                 serial_close(serial);
                 async_hangup(sess);
@@ -111 +125 @@
         if (EOK != res) {
                 free(buf);
+                chardev_close(chardev);
                 serial_close(serial);
                 async_hangup(sess);
@@ -121 +136 @@
         size_t total = 0;
         while (total < cnt) {
-                ssize_t read = char_dev_read(sess, buf, cnt - total);
-                
-                if (read < 0) {
+                
+                rc = chardev_read(chardev, buf, cnt - total, &nread);
+                if (rc != EOK) {
                         (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
                         
                         free(buf);
+                        chardev_close(chardev);
                         serial_close(serial);
                         async_hangup(sess);
@@ -133 +149 @@
                 }
                 
-                if ((size_t) read > cnt - total) {
+                if (nread > cnt - total) {
                         (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
                         
                         free(buf);
+                        chardev_close(chardev);
                         serial_close(serial);
                         async_hangup(sess);
@@ -143 +160 @@
                 }
                 
-                TPRINTF("Read %zd bytes\n", read);
-                
-                if (read == 0)
+                TPRINTF("Read %zd bytes\n", nread);
+                
+                if (nread == 0)
                         thread_usleep(DEFAULT_SLEEP);
                 else {
-                        buf[read] = 0;
+                        buf[nread] = 0;
                         
                         /*
@@ -154 +171 @@
                          * direction of data transfer.
                          */
-                        ssize_t written = char_dev_write(sess, buf, read);
-                        
-                        if (written < 0) {
+                        rc = chardev_write(chardev, buf, nread, &nwritten);
+                        if (rc != EOK) {
                                 (void) serial_set_comm_props(serial, old_baud,
                                     old_par, old_word_size, old_stop);
                                 
                                 free(buf);
+                                chardev_close(chardev);
                                 serial_close(serial);
                                 async_hangup(sess);
@@ -166 +183 @@
                         }
                         
-                        if (written != read) {
+                        if (nwritten != nread) {
                                 (void) serial_set_comm_props(serial, old_baud,
                                     old_par, old_word_size, old_stop);
                                 
                                 free(buf);
+                                chardev_close(chardev);
                                 serial_close(serial);
                                 async_hangup(sess);
@@ -176 +194 @@
                         }
                         
-                        TPRINTF("Written %zd bytes\n", written);
-                }
-                
-                total += read;
+                        TPRINTF("Written %zd bytes\n", nwritten);
+                }
+                
+                total += nread;
         }
         
@@ -185 +203 @@
         
         size_t eot_size = str_size(EOT);
-        ssize_t written = char_dev_write(sess, (void *) EOT, eot_size);
+        rc = chardev_write(chardev, (void *) EOT, eot_size, &nwritten);
         
         (void) serial_set_comm_props(serial, old_baud, old_par, old_word_size,
@@ -191 +209 @@
         
         free(buf);
+        chardev_close(chardev);
         serial_close(serial);
         async_hangup(sess);
         
-        if (written < 0)
+        if (rc != EOK)
                 return "Failed to write EOT banner to serial device";
         
-        if ((size_t) written != eot_size)
+        if (nwritten != eot_size)
                 return "Written less data than the size of the EOT banner "
                     "to serial device";