Reduce debug output; calibrate DM320 timer

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@372 42af7a65-404d-4744-a932-0658087f49c3

3 files changed, 46 insertions, 33 deletions

diff --git a/nuttx/examples/nettest/nettest-client.c b/nuttx/examples/nettest/nettest-client.c
index f352e3a85..ea8a4312c 100644
--- a/nuttx/examples/nettest/nettest-client.c
+++ b/nuttx/examples/nettest/nettest-client.c
@@ -73,7 +73,7 @@ void send_client(void)
   sockfd = socket(PF_INET, SOCK_STREAM, 0);
   if (sockfd < 0)
     {
-      printf("client socket failure %d\n", errno);
+      message("client socket failure %d\n", errno);
       exit(1);
     }
 
@@ -87,13 +87,13 @@ void send_client(void)
   myaddr.sin_addr.s_addr = HTONL(CONFIG_EXAMPLE_NETTEST_CLIENTIP);
 #endif
 
-  printf("client: Connecting...\n");
+  message("client: Connecting...\n");
   if (connect( sockfd, (struct sockaddr*)&myaddr, sizeof(struct sockaddr_in)) < 0)
     {
-      printf("client: connect failure: %d\n", errno);
+      message("client: connect failure: %d\n", errno);
       exit(1);
     }
-  printf("client: Connected\n");
+  message("client: Connected\n");
 
   /* Initialize the buffer */
 
@@ -115,13 +115,13 @@ void send_client(void)
       nbytessent = send(sockfd, outbuf, 512, 0);
       if (nbytessent < 0)
         {
-          printf("client: send failed: %d\n", errno);
+          message("client: send failed: %d\n", errno);
           close(sockfd);
           exit(-1);
         }
       else if (nbytessent != 512)
         {
-          printf("client: Bad send length=%d: %d\n", nbytessent);
+          message("client: Bad send length=%d: %d\n", nbytessent);
           close(sockfd);
           exit(-1);
         }
@@ -129,42 +129,42 @@ void send_client(void)
 #else
   /* Then send and receive one message */
 
-  printf("client: Sending %d bytes\n", SENDSIZE);
+  message("client: Sending %d bytes\n", SENDSIZE);
   nbytessent = send(sockfd, outbuf, SENDSIZE, 0);
-  printf("client: Sent %d bytes\n", nbytessent);
+  message("client: Sent %d bytes\n", nbytessent);
 
   if (nbytessent < 0)
     {
-      printf("client: send failed: %d\n", errno);
+      message("client: send failed: %d\n", errno);
       close(sockfd);
       exit(-1);
     }
   else if (nbytessent != SENDSIZE)
     {
-      printf("client: Bad send length=%d: %d\n", nbytessent);
+      message("client: Bad send length=%d: %d\n", nbytessent);
       close(sockfd);
       exit(-1);
     }
 
-  printf("client: Receiving...\n");
+  message("client: Receiving...\n");
   nbytesrecvd = recv(sockfd, inbuf, SENDSIZE, 0);
-  printf("client: Received %d bytes\n", nbytesrecvd);
+  message("client: Received %d bytes\n", nbytesrecvd);
 
   if (nbytesrecvd < 0)
     {
-      printf("client: recv failed: %d\n", errno);
+      message("client: recv failed: %d\n", errno);
       close(sockfd);
       exit(-1);
     }
   else if (nbytesrecvd != SENDSIZE)
     {
-      printf("client: Bad recv length=%d: %d\n", nbytessent);
+      message("client: Bad recv length=%d: %d\n", nbytessent);
       close(sockfd);
       exit(-1);
     }
   else if (memcmp(inbuf, outbuf, SENDSIZE) != 0)
     {
-      printf("client: Received buffer does not match sent buffer\n");
+      message("client: Received buffer does not match sent buffer\n");
       close(sockfd);
       exit(-1);
     }
diff --git a/nuttx/examples/nettest/nettest-server.c b/nuttx/examples/nettest/nettest-server.c
index a557b5a7d..2f398583a 100644
--- a/nuttx/examples/nettest/nettest-server.c
+++ b/nuttx/examples/nettest/nettest-server.c
@@ -73,7 +73,7 @@ void recv_server(void)
   listensd = socket(PF_INET, SOCK_STREAM, 0);
   if (listensd < 0)
     {
-      printf("server: socket failure: %d\n", errno);
+      message("server: socket failure: %d\n", errno);
       exit(1);
     }
 
@@ -82,7 +82,7 @@ void recv_server(void)
   optval = 1;
   if (setsockopt(listensd, SOL_SOCKET, SO_REUSEADDR, (void*)&optval, sizeof(int)) < 0)
     {
-      printf("server: setsockopt failure: %d\n", errno);
+      message("server: setsockopt failure: %d\n", errno);
       exit(1);
     }
 
@@ -94,7 +94,7 @@ void recv_server(void)
 
   if (bind(listensd, (struct sockaddr*)&myaddr, sizeof(struct sockaddr_in)) < 0)
     {
-      printf("server: bind failure: %d\n", errno);
+      message("server: bind failure: %d\n", errno);
       exit(1);
     }
 
@@ -102,21 +102,21 @@ void recv_server(void)
 
   if (listen(listensd, 5) < 0)
     {
-      printf("server: listen failure %d\n", errno);
+      message("server: listen failure %d\n", errno);
       exit(1);
     }
 
   /* Accept only one connection */
 
-  printf("server: Accepting connections on port %d\n", PORTNO);
+  message("server: Accepting connections on port %d\n", PORTNO);
   addrlen = sizeof(struct sockaddr_in);
   acceptsd = accept(listensd, (struct sockaddr*)&myaddr, &addrlen);
   if (acceptsd < 0)
     {
-      printf("server: accept failure: %d\n", errno);
+      message("server: accept failure: %d\n", errno);
       exit(1);
     }
-  printf("server: Connection accepted -- receiving\n");
+  message("server: Connection accepted -- receiving\n");
 
 #ifdef CONFIG_NETTEST_PERFORMANCE
   /* Then receive data forever */
@@ -126,7 +126,7 @@ void recv_server(void)
       nbytesread = recv(acceptsd, buffer, 1024, 0);
       if (nbytesread <= 0)
         {
-          printf("server: recv failed: %d\n", errno);
+          message("server: recv failed: %d\n", errno);
           close(listensd);
           close(acceptsd);
           exit(-1);
@@ -138,25 +138,25 @@ void recv_server(void)
   totalbytesread = 0;
   while (totalbytesread < SENDSIZE)
     {
-      printf("server: Reading...\n");
+      message("server: Reading...\n");
       nbytesread = recv(acceptsd, &buffer[totalbytesread], 1024 - totalbytesread, 0);
       if (nbytesread <= 0)
         {
-          printf("server: recv failed: %d\n", errno);
+          message("server: recv failed: %d\n", errno);
           close(listensd);
           close(acceptsd);
           exit(-1);
         }
 
       totalbytesread += nbytesread;
-      printf("server: Received %d of %d bytes\n", totalbytesread, SENDSIZE);
+      message("server: Received %d of %d bytes\n", totalbytesread, SENDSIZE);
     }
 
   /* Verify the message */
 
   if (totalbytesread != SENDSIZE)
     {
-      printf("server: Received %d / Expected %d bytes\n", totalbytesread, SENDSIZE);
+      message("server: Received %d / Expected %d bytes\n", totalbytesread, SENDSIZE);
       close(listensd);
       close(acceptsd);
       exit(-1);
@@ -167,7 +167,7 @@ void recv_server(void)
     {
       if (buffer[i] != ch)
         {
-          printf("server: Byte %d is %02x / Expected %02x\n", i, buffer[i], ch);
+          message("server: Byte %d is %02x / Expected %02x\n", i, buffer[i], ch);
           close(listensd);
           close(acceptsd);
           exit(-1);
@@ -184,12 +184,12 @@ void recv_server(void)
   nbytessent = send(acceptsd, buffer, totalbytesread, 0);
   if (nbytessent <= 0)
     {
-      printf("server: send failed: %d\n", errno);
+      message("server: send failed: %d\n", errno);
       close(listensd);
       close(acceptsd);
       exit(-1);
     }
-  printf("server: Sent %d bytes\n", nbytessent);
+  message("server: Sent %d bytes\n", nbytessent);
 
   close(listensd);
   close(acceptsd);
diff --git a/nuttx/examples/nettest/nettest.h b/nuttx/examples/nettest/nettest.h
index 0079a83a2..b868ec90d 100644
--- a/nuttx/examples/nettest/nettest.h
+++ b/nuttx/examples/nettest/nettest.h
@@ -40,15 +40,28 @@
  * Included Files
  ****************************************************************************/
 
+#ifdef CONFIG_NETTEST_HOST
+#else
+# include <debug.h>
+#endif
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/
 
 #ifdef CONFIG_NETTEST_HOST
-#  define HTONS(a) htons(a)
-#  define HTONL(a) htonl(a)
+   /* HTONS/L macros are unique to uIP */
+
+#  define HTONS(a)       htons(a)
+#  define HTONL(a)       htonl(a)
+#  define message(...)   printf(__VA_ARGS__)
 #else
-#  define errno   *get_errno_ptr()
+#  define errno         *get_errno_ptr()
+#  ifdef CONFIG_DEBUG
+#    define message(...) lib_lowprintf(__VA_ARGS__)
+#  else
+#    define message(...) printf(__VA_ARGS__)
+#  endif
 #endif
 
 #define PORTNO     5471