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

Timestamp:

2010-11-26T14:19:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

b12d3cc

Parents:

03171de (diff), ffdd2b9 (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

Local changes: removed extra parameters to printf (variables
that would be ignored anyway).

File:

• uspace/app/tester/hw/serial/serial1.c (moved) (moved from uspace/app/test_serial/test_serial.c ) (4 diffs)

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

@@ -27 +27 @@
  */
 
-/** @addtogroup test_serial
- * @brief       test the serial port driver - read from the serial port
+/** @addtogroup tester
+ * @brief Test the serial port driver - loopback test
  * @{
  */
@@ -35 +35 @@
  */
 
+#include <inttypes.h>
 #include <errno.h>
 #include <stdlib.h>
@@ -47 +48 @@
 #include <str.h>
 #include <ipc/serial_ctl.h>
-
-#define NAME            "test serial"
-
-
-static void print_usage(void)
+#include "../../tester.h"
+
+#define DEFAULT_COUNT  1024
+#define DEFAULT_SLEEP  100000
+#define EOT            "####> End of transfer <####\n"
+
+const char *test_serial1(void)
 {
-        printf("Usage: \n test_serial count \n where count is the number of "
-            "characters to be read\n");
-}
-
-int main(int argc, char *argv[])
-{
-        if (argc != 2) {
-                printf(NAME ": incorrect number of arguments.\n");
-                print_usage();
-                return 0;
-        }
-        
-        long int cnt = strtol(argv[1], NULL, 10);
-        
-        int res;
-        res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
+        size_t cnt;
+        
+        if (test_argc < 1)
+                cnt = DEFAULT_COUNT;
+        else
+                switch (str_size_t(test_argv[0], NULL, 0, true, &cnt)) {
+                case EOK:
+                        break;
+                case EINVAL:
+                        return "Invalid argument, unsigned integer expected";
+                case EOVERFLOW:
+                        return "Argument size overflow";
+                default:
+                        return "Unexpected argument error";
+                }
+        
+        int res = devman_get_phone(DEVMAN_CLIENT, IPC_FLAG_BLOCKING);
+        
         devman_handle_t handle;
-        
         res = devman_device_get_handle("/hw/pci0/00:01.0/com1", &handle,
             IPC_FLAG_BLOCKING);
-        if (EOK != res) {
-                printf(NAME ": could not get the device handle, errno = %d.\n",
-                    -res);
-                return 1;
-        }
-        
-        printf(NAME ": trying to read %d characters from device with handle "
-            "%d.\n", cnt, handle);
+        if (res != EOK)
+                return "Could not get serial device handle";
         
         int phone = devman_device_connect(handle, IPC_FLAG_BLOCKING);
-        if (0 > phone) {
-                printf(NAME ": could not connect to the device, errno = %d.\n",
-                    -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
-                return 2;
+        if (phone < 0) {
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Unable to connect to serial device";
         }
         
         char *buf = (char *) malloc(cnt + 1);
-        if (NULL == buf) {
-                printf(NAME ": failed to allocate the input buffer\n");
+        if (buf == NULL) {
                 ipc_hangup(phone);
                 devman_hangup_phone(DEVMAN_CLIENT);
-                return 3;
-        }
-        
-        ipcarg_t old_baud, old_par, old_stop, old_word_size;
+                return "Failed to allocate input buffer";
+        }
+        
+        ipcarg_t old_baud;
+        ipcarg_t old_par;
+        ipcarg_t old_stop;
+        ipcarg_t old_word_size;
         
         res = ipc_call_sync_0_4(phone, SERIAL_GET_COM_PROPS, &old_baud,
             &old_par, &old_word_size, &old_stop);
-        if (EOK != res) {
-                printf(NAME ": failed to get old communication parameters, "
-                    "errno = %d.\n", -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
+        if (res != EOK) {
+                free(buf);
                 ipc_hangup(phone);
-                free(buf);
-                return 4;
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Failed to get old serial communication parameters";
         }
         
@@ -114 +110 @@
             SERIAL_NO_PARITY, 8, 1);
         if (EOK != res) {
-                printf(NAME ": failed to set communication parameters, errno = "
-                    "%d.\n", -res);
-                devman_hangup_phone(DEVMAN_CLIENT);
+                free(buf);
                 ipc_hangup(phone);
-                free(buf);
-                return 4;
-        }
-        
-        int total = 0;
-        int read = 0;
+                devman_hangup_phone(DEVMAN_CLIENT);
+                return "Failed to set serial communication parameters";
+        }
+        
+        TPRINTF("Trying to read %zu characters from serial device "
+            "(handle=%" PRIun ")\n", cnt, handle);
+        
+        size_t total = 0;
         while (total < cnt) {
-                read = read_dev(phone, buf, cnt - total);
-                if (0 > read) {
-                        printf(NAME ": failed read from device, errno = %d.\n",
-                            -read);
+                ssize_t read = read_dev(phone, buf, cnt - total);
+                
+                if (read < 0) {
                         ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
                             old_par, old_word_size, old_stop);
+                        free(buf);
                         ipc_hangup(phone);
                         devman_hangup_phone(DEVMAN_CLIENT);
+                        return "Failed read from serial device";
+                }
+                
+                if ((size_t) read > cnt - total) {
+                        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                            old_par, old_word_size, old_stop);
                         free(buf);
-                        return 5;
-                }
-                total += read;
-                if (read > 0) {
+                        ipc_hangup(phone);
+                        devman_hangup_phone(DEVMAN_CLIENT);
+                        return "Read more data than expected";
+                }
+                
+                TPRINTF("Read %zd bytes\n", read);
+                
+                if (read == 0)
+                        usleep(DEFAULT_SLEEP);
+                else {
                         buf[read] = 0;
-                        printf(buf);
+                        
                         /*
                          * Write data back to the device to test the opposite
                          * direction of data transfer.
                          */
-                        write_dev(phone, buf, read);
-                } else {
-                        usleep(100000);
-                }       
-        }
-        
-        const char *the_end = "\n---------\nTHE END\n---------\n";
-        write_dev(phone, (void *)the_end, str_size(the_end));
-        
-        /* restore original communication settings */
-        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud, old_par,
-            old_word_size, old_stop);
+                        ssize_t written = write_dev(phone, buf, read);
+                        
+                        if (written < 0) {
+                                ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                                    old_par, old_word_size, old_stop);
+                                free(buf);
+                                ipc_hangup(phone);
+                                devman_hangup_phone(DEVMAN_CLIENT);
+                                return "Failed write to serial device";
+                        }
+                        
+                        if (written != read) {
+                                ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+                                    old_par, old_word_size, old_stop);
+                                free(buf);
+                                ipc_hangup(phone);
+                                devman_hangup_phone(DEVMAN_CLIENT);
+                                return "Written less data than read from serial device";
+                        }
+                        
+                        TPRINTF("Written %zd bytes\n", written);
+                }
+                
+                total += read;
+        }
+        
+        TPRINTF("Trying to write EOT banner to the serial device\n");
+        
+        size_t eot_size = str_size(EOT);
+        ssize_t written = write_dev(phone, (void *) EOT, eot_size);
+        
+        ipc_call_sync_4_0(phone, SERIAL_SET_COM_PROPS, old_baud,
+            old_par, old_word_size, old_stop);
+        free(buf);
+        ipc_hangup(phone);
         devman_hangup_phone(DEVMAN_CLIENT);
-        ipc_hangup(phone);
-        free(buf);
-        
-        return 0;
+        
+        if (written < 0)
+                return "Failed to write EOT banner to serial device";
+        
+        if ((size_t) written != eot_size)
+                return "Written less data than the size of the EOT banner "
+                    "to serial device";
+        
+        return NULL;
 }