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

Timestamp:

2017-11-29T18:43:10Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

39026d7c

Parents:

48b77ed

Message:

Eliminate uses of thread_usleep() in favor of async_usleep(). Obvious cases are in components that don't explicitly create threads.

File:

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

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

@@ -45 +45 @@
 #include <stddef.h>
 #include <str.h>
-#include <thread.h>
 #include "../../tester.h"
 
@@ -162 +161 @@
                 TPRINTF("Read %zd bytes\n", nread);
                 
-                if (nread == 0)
-                        thread_usleep(DEFAULT_SLEEP);
-                else {
-                        buf[nread] = 0;
-                        
-                        /*
-                         * Write data back to the device to test the opposite
-                         * direction of data transfer.
-                         */
-                        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);
-                                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);
-                                serial_close(serial);
-                                async_hangup(sess);
-                                return "Written less data than read from serial device";
-                        }
-                        
-                        TPRINTF("Written %zd bytes\n", nwritten);
-                }
+                buf[nread] = 0;
+                
+                /*
+                 * Write data back to the device to test the opposite
+                 * direction of data transfer.
+                 */
+                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);
+                        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);
+                        serial_close(serial);
+                        async_hangup(sess);
+                        return "Written less data than read from serial device";
+                }
+                
+                TPRINTF("Written %zd bytes\n", nwritten);
                 
                 total += nread;