Changes in uspace/app/tester/hw/serial/serial1.c [5a6cc679:a35b458] in mainline

File:

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

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

@@ -59 +59 @@
         size_t nread;
         size_t nwritten;
-        
+
         if (test_argc < 1)
                 cnt = DEFAULT_COUNT;
@@ -73 +73 @@
                         return "Unexpected argument error";
                 }
-        
+
         service_id_t svc_id;
         errno_t res = loc_service_get_id("devices/\\hw\\pci0\\00:01.0\\com1\\a",
@@ -79 +79 @@
         if (res != EOK)
                 return "Failed getting serial port service ID";
-        
+
         async_sess_t *sess = loc_service_connect(svc_id, INTERFACE_DDF,
             IPC_FLAG_BLOCKING);
         if (sess == NULL)
                 return "Failed connecting to serial device";
-        
+
         res = chardev_open(sess, &chardev);
         if (res != EOK) {
@@ -90 +90 @@
                 return "Failed opening serial port";
         }
-        
+
         res = serial_open(sess, &serial);
         if (res != EOK) {
@@ -97 +97 @@
                 return "Failed opening serial port";
         }
-        
+
         char *buf = (char *) malloc(cnt + 1);
         if (buf == NULL) {
@@ -105 +105 @@
                 return "Failed allocating input buffer";
         }
-        
+
         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);
@@ -120 +120 @@
                 return "Failed to get old serial communication parameters";
         }
-        
+
         res = serial_set_comm_props(serial, 1200, SERIAL_NO_PARITY, 8, 1);
         if (EOK != res) {
@@ -129 +129 @@
                 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;
         while (total < cnt) {
-                
+
                 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);
@@ -147 +147 @@
                         return "Failed reading from serial device";
                 }
-                
+
                 if (nread > cnt - total) {
                         (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
-                        
+
                         free(buf);
                         chardev_close(chardev);
@@ -158 +158 @@
                         return "Read more data than expected";
                 }
-                
+
                 TPRINTF("Read %zd bytes\n", nread);
-                
+
                 buf[nread] = 0;
-                
+
                 /*
                  * Write data back to the device to test the opposite
@@ -171 +171 @@
                         (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
-                        
+
                         free(buf);
                         chardev_close(chardev);
@@ -178 +178 @@
                         return "Failed writing to serial device";
                 }
-                
+
                 if (nwritten != nread) {
                         (void) serial_set_comm_props(serial, old_baud,
                             old_par, old_word_size, old_stop);
-                        
+
                         free(buf);
                         chardev_close(chardev);
@@ -189 +189 @@
                         return "Written less data than read from serial device";
                 }
-                
+
                 TPRINTF("Written %zd bytes\n", nwritten);
-                
+
                 total += nread;
         }
-        
+
         TPRINTF("Trying to write EOT banner to the serial device\n");
-        
+
         size_t eot_size = str_size(EOT);
         rc = chardev_write(chardev, (void *) EOT, eot_size, &nwritten);
-        
+
         (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);
-        
+
         if (rc != EOK)
                 return "Failed to write EOT banner to serial device";
-        
+
         if (nwritten != eot_size)
                 return "Written less data than the size of the EOT banner "
                     "to serial device";
-        
+
         return NULL;
 }