From: hadaq <hadaq>
Date: Mon, 9 Jan 2012 00:54:58 +0000 (+0000)
Subject: update
X-Git-Tag: v6.0~85
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=12bf5652ddb5aecd0b8f06da468bda92a5ddca74;p=trbnettools.git

update
---

diff --git a/libtrbnet/trbcmd.c b/libtrbnet/trbcmd.c
index 290cafa..6590b70 100644
--- a/libtrbnet/trbcmd.c
+++ b/libtrbnet/trbcmd.c
@@ -25,7 +25,7 @@
 
 static int hexMode = HEXMODE;
 
-static const char trbcmd_version[] = "$Revision: 2.76 $";
+static const char trbcmd_version[] = "$Revision: 2.77 $";
 
 #define BACKLOG 10
 static uint16_t tcp_port = 55555;
@@ -35,7 +35,7 @@ static int tcp_mode = 0;
 /* ---- User Buffer Size ------------------------------------------------ */
 
 static const size_t NUM_ENDPOINTS = 1024;      /* Maximum of 16KByte */
-static size_t USER_BUFFER_MAX_SIZE = 1310720;  /* *4Bytes = 5MByte   */
+static size_t USER_BUFFER_MAX_SIZE = 4194304;  /* *4Bytes = 5MByte   */
 
 /* ---- Error Handling -------------------------------------------------- */
 
@@ -99,9 +99,6 @@ void usage(const char *progName)
   fprintf(stdout,
           "  -s    only if running in -n mode, "
           "sleep time in ms\n");
-  fprintf(stdout,
-          "  -M    turn on HighMemoryMode (maximum usage is 20MByte, default: "
-          "3MByte)\n");
   fprintf(stdout, "  -d    turn on Debugging Information\n");
   fprintf(stdout, "        level 1: TRB_Package debugging\n");
   fprintf(stdout, "        level 2: +FIFO debugging\n");
@@ -196,10 +193,10 @@ int start(int argc, char **argv)
   int i;
 
 #ifdef PEXOR
-  const char optString[] = "+hf:n:d:s:HMVeD";
+  const char optString[] = "+hf:n:d:s:HVD";
   pexor_dma = 1;
 #else
-  const char optString[] = "+hf:n:d:s:HMVe";
+  const char optString[] = "+hf:n:d:s:HV";
 #endif
 
   trb_debug = 0;
@@ -236,10 +233,6 @@ int start(int argc, char **argv)
              basename(argv[0]), trbcmd_version, trbnet_version);
       return 0;
       break;
-    case 'M':
-      /* HighMem Setting */
-      USER_BUFFER_MAX_SIZE = 5242880; /* *4Bytes = 20MByte */
-      break;
 #ifdef PEXOR
     case 'D':
       pexor_dma = 0;
@@ -1263,7 +1256,7 @@ int start(int argc, char **argv)
         logError(ERROR, "Invalid command, try -h option\n");
         return -1;
       }
-      if (loop != 1) {
+      if (loop != 1 || scriptFile != NULL) {
         fprintf(stdout, "---\n");
         fflush(stdout);
       }