From: hadaq <hadaq>
Date: Wed, 19 May 2010 15:55:05 +0000 (+0000)
Subject: update
X-Git-Tag: v6.0~264
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=0bc6c7e17f37284b14c4e8cc8b94bebc09ea2f10;p=trbnettools.git

update
---

diff --git a/trbrich/pulser.c b/trbrich/pulser.c
index 0792a4d..b54fa1f 100644
--- a/trbrich/pulser.c
+++ b/trbrich/pulser.c
@@ -11,7 +11,7 @@
 #include <trbnet.h>
 #include <trberror.h>
 
-static const char pulser_version[] = "$Revision: 1.8 $"; 
+static const char pulser_version[] = "$Revision: 1.9 $"; 
 
 /* 6MByte for 6 Sectors should be enough */
 #define BUFFER_SIZE (6 * 1024 * 1024 / 4)
@@ -107,11 +107,7 @@ int main(int argc, char ** argv)
   }
 
   /* open port */
-#ifndef TRB_RPC
   init_ports();
-#else
-  trb_connect(NULL);
-#endif  
 
   /* Open HLD-File */
   if (strncmp(hldFileName, "stdout", 256) != 0) {
diff --git a/trbrich/trb_i2c.c b/trbrich/trb_i2c.c
index bed9eca..27d47af 100644
--- a/trbrich/trb_i2c.c
+++ b/trbrich/trb_i2c.c
@@ -11,7 +11,7 @@
 
 #define BUFFER_SIZE (6 * 4096)
 
-static const char trb_i2c_version[] = "$Revision: 1.7 $"; 
+static const char trb_i2c_version[] = "$Revision: 1.8 $"; 
 
 static const uint16_t trb_i2c_register = 0x8040;
 
@@ -159,11 +159,7 @@ int main(int argc, char** argv)
   }
         
   /* Open port */
-#ifndef TRB_RPC
   init_ports();
-#else
-  trb_connect(NULL);
-#endif
   
   if (strcmp(argv[optind], "w") == 0) {
     
diff --git a/trbrich/trbflash.c b/trbrich/trbflash.c
index aa39c47..23096fa 100644
--- a/trbrich/trbflash.c
+++ b/trbrich/trbflash.c
@@ -90,7 +90,7 @@ static const char FlashTypeStr[][32] =
 
 static FlashType flashType = FLASH_INVALID; 
 static uint32_t manId = 0;
-static const char trbflash_version[] = "$Revision: 2.16 $"; 
+static const char trbflash_version[] = "$Revision: 2.17 $"; 
 
 static uint32_t mdcFlashSelect = 1;
 
@@ -121,51 +121,6 @@ static void atexit0()
   free(imageBuffer);
 }
 
-static int readSetupRegister(uint16_t trb_address,
-                             uint8_t value[NUM_ENDPOINTS])
-{
-  unsigned int ctr = 0;
-  int status = -1;
-  int c;
-  int i;
-
-  /* Wait until NoMoreData is withdrawn */
-  do {
-    if ((status = trb_register_read(trb_address, SetupReg,
-                                    trbBuffer, TRB_BUFFER_SIZE)) == -1) {
-      fprintf(logFile, "Error > readSetupRegister: TRBNet %s\n",
-              trb_strerror(trb_errno));
-      return -1;
-    }
-    
-    /* Check timeout */
-    if (ctr >=  timeout) {
-      fprintf(logFile, "Error > readSetupRegister: timeout\n");
-      return -1;
-    }
-    ctr++;
-  } while (trb_term.status_channel == 0x04);
-  
-  if (trb_term.status_channel != 0) {
-    fprintf(logFile, "Error > readSetupRegister: invalid Status returned %s\n",
-            trb_strerror(trb_errno));
-    return -1;
-  }
-  
-  if (status <= 0) {
-    fprintf(logFile, "Error > readSetupRegister: invalid length returned\n");
-    return -1;
-  }
-  
-  c = 0;
-  for (i = 1; i < status; i += 2) {
-    if (value != NULL) value[c] = (uint8_t)((trbBuffer[i] >> 24) & 0xff);  
-    c++;
-  }
-  
-  return c;
-}
-
 static int writeSetupRegister(uint16_t trb_address, uint8_t value)
 {
   unsigned int ctr = 0;
@@ -1020,7 +975,7 @@ static int prepareImageBuffer()
   /* Overwrite Header with 0xff */
   end = 0;
   for (i = 0; i < 2 * PAGE_SIZE; i++) {
-    if (strncmp(imageBuffer + i, "Bitstream CRC: 0x", 17) == 0) {
+    if (strncmp((char*)(imageBuffer + i), "Bitstream CRC: 0x", 17) == 0) {
       end = i + 22;
       break;
     }
@@ -1038,7 +993,7 @@ static int prepareImageBuffer()
 
 static int createInfoPage(const char* fileName, const char* userString)
 {
-  char* buffer = imageBuffer + (NUM_PAGES - 1) * PAGE_SIZE;
+  char* buffer = (char*)(imageBuffer + (NUM_PAGES - 1) * PAGE_SIZE);
   struct stat statBuf;
 
   unsigned int i;
@@ -1183,14 +1138,10 @@ int main(int argc, char ** argv)
     exit(EXIT_FAILURE);
   }
  
-#ifndef TRB_RPC 
   if (init_ports() == -1) {
     trb_error("Init_Ports");
     exit(EXIT_FAILURE);
   }
-#else
-  trb_connect(NULL);
-#endif
   
   atexit(atexit0);
 
@@ -1509,9 +1460,9 @@ int main(int argc, char ** argv)
       fprintf(stdout, "\nEndPoint: 0x%04x   InfoPage\n",
               pageBufferAddress[i]);
       if (
-          (strncmp(pageBuffer[i] + 0, "NAME:", 5) != 0) ||
-          (strncmp(pageBuffer[i] + 64, "DATE:", 5) != 0) ||
-          (strncmp(pageBuffer[i] + 96, "USER:", 5) != 0)
+          (strncmp((char*)(pageBuffer[i] + 0), "NAME:", 5) != 0) ||
+          (strncmp((char*)(pageBuffer[i] + 64), "DATE:", 5) != 0) ||
+          (strncmp((char*)(pageBuffer[i] + 96), "USER:", 5) != 0)
           ) {
         fprintf(stdout, "INVALID CONTENT\n");
         continue;
diff --git a/trbrich/trbrichcmd.c b/trbrich/trbrichcmd.c
index 4f9571d..d99b866 100644
--- a/trbrich/trbrichcmd.c
+++ b/trbrich/trbrichcmd.c
@@ -13,7 +13,7 @@
 
 #define TEMP_RESOLUTION 0.0625
 
-static const char trbrichcmd_version[] = "$Revision: 1.8 $"; 
+static const char trbrichcmd_version[] = "$Revision: 1.9 $"; 
 
 static const uint16_t adcm_uid_register = 0xc000;
 
@@ -70,11 +70,7 @@ int main(int argc, char** argv)
   }
         
   /* Open port */
-#ifndef TRB_RPC
   init_ports();
-#else
-  trb_connect(NULL);
-#endif
 
   if (strcmp(argv[optind], "uid") == 0) {