examples/serialblaster, serialrx, udpblaster: Update to serial/UDP tests.

examples/serialblaster/Kconfig

@@ -19,4 +19,9 @@ config EXAMPLES_SERIALBLASTER_PRIORITY
 	int "CPU hog task priority"
 	default 50
 
+config EXAMPLES_SERIALBLASTER_DEVPATH
+	string "Serial device path"
+	default "/dev/ttyS2"
+	---help---
+		The default path to the serial device
 endif

examples/serialblaster/serialblaster_main.c

@@ -44,8 +44,11 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <nuttx/clock.h>
-
+#include <fcntl.h>
+#include <errno.h>
+#include <stdlib.h>
 #include <nuttx/fs/fs.h>
+#include <nuttx/arch.h>
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -70,16 +73,60 @@ static const char s[] = "abcdefghijklmnopqrstuvwxyz";
 int main(int argc, FAR char *argv[])
 {
   int ret;
+  int fd;
+  FAR char *devpath;
+  int size = 0;
+  int rem;
 
-  while (1)
+  if (argc == 1)
     {
-#ifdef BUFFERED_IO
+      devpath = CONFIG_EXAMPLES_SERIALBLASTER_DEVPATH;
-      ret = fputs(s, stdout);
+    }
-#else
+  else if (argc == 2)
-      ret = write(1, s, sizeof(s)-1);
+    {
-#endif
+      devpath = argv[1];
+    }
+  else if (argc == 3)
+    {
+      devpath = argv[1];
+      size =  strtol(argv[2], NULL, 10);
+    }
+  else
+    {
+      fprintf(stderr, "Usage: %s [devpath]\n", argv[0]);
+      goto errout;
+    }
+
+  fd = open(devpath, O_RDWR);
+  if (fd < 0)
+    {
+      printf("dev_ttyS2: ERROR Failed to open /dev/ttyS2\n");
+      return -1;
+    }
+
+  rem = size;
+  while (size > sizeof(s))
+    {
+      if (rem > 26)
+        {
+          ret = write(fd, s, (sizeof(s)-1));
+        }
+
+      rem = rem - 26;
+      if (rem < 26)
+        {
+          ret = write(fd, s, rem);
+        }
+
+      size = size - 26;
       UNUSED(ret);
     }
 
+  up_udelay(5000000);
+  close(fd);
   return 0;
+
+errout:
+  fflush(stderr);
+  return EXIT_FAILURE;
 }

examples/serialrx/Kconfig

@@ -21,7 +21,7 @@ config EXAMPLES_SERIALRX_PRIORITY
 
 config EXAMPLES_SERIALRX_BUFFERED
 	bool "Buffered I/O"
-	default y
+	default n
 	---help---
 		Use buffered I/O
 

examples/serialrx/serialrx_main.c

@@ -48,14 +48,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <nuttx/arch.h>
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Data
- ****************************************************************************/
 
 /****************************************************************************
  * Public Functions
@@ -69,8 +62,13 @@ int main(int argc, FAR char *argv[])
 {
 #ifdef CONFIG_EXAMPLES_SERIALRX_BUFFERED
   FAR FILE *f;
+  int fd;
+  int nbytes;
+  int cnt;
 #else
   int fd;
+  int cnt;
+  int bytecount = 0;
 #endif
 #ifdef CONFIG_EXAMPLES_SERIALRX_PRINTHYPHEN
   int count = 0;
@@ -90,6 +88,11 @@ int main(int argc, FAR char *argv[])
     {
       devpath = argv[1];
     }
+  else if (argc == 3)
+    {
+          devpath = argv[1];
+          bytecount = strtol(argv[2], NULL, 10);
+    }
   else
     {
       fprintf(stderr, "Usage: %s [devpath]\n", argv[0]);
@@ -101,6 +104,7 @@ int main(int argc, FAR char *argv[])
 #else
   buf = (FAR char *)malloc(CONFIG_EXAMPLES_SERIALRX_BUFSIZE);
 #endif
+
   if (buf == NULL)
     {
       fprintf(stderr, "ERROR: malloc failed: %d\n", errno);
@@ -115,7 +119,7 @@ int main(int argc, FAR char *argv[])
       goto errout_with_buf;
     }
 #else
-  fd = open(devpath, O_RDONLY);
+  fd = open(devpath, O_RDWR);
   if (fd < 0)
     {
       fprintf(stderr, "ERROR: open failed: %d\n", errno);
@@ -125,11 +129,12 @@ int main(int argc, FAR char *argv[])
 
   printf("Reading from %s\n", devpath);
   fflush(stdout);
-
+  cnt = 0;
-  while (!eof)
+  while (cnt < bytecount)
     {
 #ifdef CONFIG_EXAMPLES_SERIALRX_BUFFERED
-      size_t n = fread(buf, 1, CONFIG_EXAMPLES_SERIALRX_BUFSIZE, f);
+      size_t n = fread(buf, 1, 26, f);
+      cnt++;
       if (feof(f))
         {
           eof = true;
@@ -142,6 +147,7 @@ int main(int argc, FAR char *argv[])
         }
 #else
       ssize_t n = read(fd, buf, CONFIG_EXAMPLES_SERIALRX_BUFSIZE);
+      up_udelay(1000);
       if (n == 0)
         {
           eof = true;
@@ -167,24 +173,25 @@ int main(int argc, FAR char *argv[])
             {
               printf("0x%02x ", i, buf[i]);
             }
+
           fflush(stdout);
-#elif defined(CONFIG_EXAMPLES_SERIALRX_PRINTSTR)
+#endif                                  /*Kamal*/
-          buf[n] = '\0';
+          cnt += n;
-          printf("%s", buf);
-          fflush(stdout);
-#endif
-        }
         }
 
+      UNUSED(eof);
+    }
 #ifdef CONFIG_EXAMPLES_SERIALRX_PRINTHYPHEN
   printf("\n");
 #endif
   printf("EOF reached\n");
+  printf("Total bytes received = %d\n", cnt); /* Kamal */
   fflush(stdout);
 
 #ifdef CONFIG_EXAMPLES_SERIALRX_BUFFERED
   fclose(f);
 #else
+  up_udelay(1000000);
   close(fd);
 #endif
 

examples/udpblaster/udpblaster_target.c

@@ -182,7 +182,6 @@ static void netest_initialize(void)
    */
 
   netlib_ifup("eth0");
-
 }
 #endif /*CONFIG_EXAMPLES_UDPBLASTER_INIT */
 
@@ -318,7 +317,7 @@ int main(int argc, FAR char *argv[])
           goto errout_with_socket;
         }
 
-      if (++npackets >= 10)
+      if (++npackets >= 10000)
         {
           putchar('.');
           npackets = 0;