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

Timestamp:

2017-11-21T18:40:27Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

74017ce, d51a0d6, ee44809

Parents:

afec1be

Message:

Add C API for serial port control.

File:

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

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

@@ -46 +46 @@
 #include <char_dev_iface.h>
 #include <str.h>
-#include <ipc/serial_ctl.h>
+#include <io/serial.h>
 #include "../../tester.h"
 
@@ -56 +56 @@
 {
         size_t cnt;
+        serial_t *serial;
         
         if (test_argc < 1)
@@ -79 +80 @@
         async_sess_t *sess = loc_service_connect(svc_id, INTERFACE_DDF,
             IPC_FLAG_BLOCKING);
-        if (!sess)
+        if (sess == NULL)
                 return "Failed connecting to serial device";
+        
+        res = serial_open(sess, &serial);
+        if (res != EOK)
+                return "Failed opening serial port";
         
         char *buf = (char *) malloc(cnt + 1);
         if (buf == NULL) {
+                serial_close(serial);
                 async_hangup(sess);
                 return "Failed allocating input buffer";
         }
         
-        sysarg_t old_baud;
-        sysarg_t old_par;
-        sysarg_t old_stop;
-        sysarg_t old_word_size;
-        
-        async_exch_t *exch = async_exchange_begin(sess);
-        res = async_req_0_4(exch, SERIAL_GET_COM_PROPS, &old_baud,
-            &old_par, &old_word_size, &old_stop);
-        async_exchange_end(exch);
-        
+        unsigned old_baud;
+        serial_parity_t old_par;
+        unsigned old_stop;
+        unsigned old_word_size;
+        
+        res = serial_get_comm_props(serial, &old_baud, &old_par,
+            &old_word_size, &old_stop);
         if (res != EOK) {
                 free(buf);
+                serial_close(serial);
                 async_hangup(sess);
                 return "Failed to get old serial communication parameters";
         }
         
-        exch = async_exchange_begin(sess);
-        res = async_req_4_0(exch, SERIAL_SET_COM_PROPS, 1200,
-            SERIAL_NO_PARITY, 8, 1);
-        async_exchange_end(exch);
-        
+        res = serial_set_comm_props(serial, 1200, SERIAL_NO_PARITY, 8, 1);
         if (EOK != res) {
                 free(buf);
+                serial_close(serial);
                 async_hangup(sess);
                 return "Failed setting serial communication parameters";
@@ -123 +124 @@
                 
                 if (read < 0) {
-                        exch = async_exchange_begin(sess);
-                        async_req_4_0(exch, SERIAL_SET_COM_PROPS, old_baud,
+                        (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
-                        async_exchange_end(exch);
                         
                         free(buf);
+                        serial_close(serial);
                         async_hangup(sess);
                         return "Failed reading from serial device";
@@ -134 +134 @@
                 
                 if ((size_t) read > cnt - total) {
-                        exch = async_exchange_begin(sess);
-                        async_req_4_0(exch, SERIAL_SET_COM_PROPS, old_baud,
+                        (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
-                        async_exchange_end(exch);
                         
                         free(buf);
+                        serial_close(serial);
                         async_hangup(sess);
                         return "Read more data than expected";
@@ -158 +157 @@
                         
                         if (written < 0) {
-                                exch = async_exchange_begin(sess);
-                                async_req_4_0(exch, SERIAL_SET_COM_PROPS, old_baud,
+                                (void) serial_set_comm_props(serial, old_baud,
                                     old_par, old_word_size, old_stop);
-                                async_exchange_end(exch);
                                 
                                 free(buf);
+                                serial_close(serial);
                                 async_hangup(sess);
                                 return "Failed writing to serial device";
@@ -169 +167 @@
                         
                         if (written != read) {
-                                exch = async_exchange_begin(sess);
-                                async_req_4_0(exch, SERIAL_SET_COM_PROPS, old_baud,
+                                (void) serial_set_comm_props(serial, old_baud,
                                     old_par, old_word_size, old_stop);
-                                async_exchange_end(exch);
                                 
                                 free(buf);
+                                serial_close(serial);
                                 async_hangup(sess);
                                 return "Written less data than read from serial device";
@@ -190 +187 @@
         ssize_t written = char_dev_write(sess, (void *) EOT, eot_size);
         
-        exch = async_exchange_begin(sess);
-        async_req_4_0(exch, SERIAL_SET_COM_PROPS, old_baud,
-            old_par, old_word_size, old_stop);
-        async_exchange_end(exch);
+        (void) serial_set_comm_props(serial, old_baud, old_par, old_word_size,
+            old_stop);
         
         free(buf);
+        serial_close(serial);
         async_hangup(sess);