From: hadaq <hadaq>
Date: Tue, 9 Nov 2010 19:54:02 +0000 (+0000)
Subject: update
X-Git-Tag: v6.0~183
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=6f54d32cf509b2b5dab07210b1c990321ffa216a;p=trbnettools.git

update
---

diff --git a/libtrbnet/trbnet.c b/libtrbnet/trbnet.c
index b32cfc8..3122e4b 100644
--- a/libtrbnet/trbnet.c
+++ b/libtrbnet/trbnet.c
@@ -1,4 +1,4 @@
-const char trbnet_version[] = "$Revision: 2.90 $";
+const char trbnet_version[] = "$Revision: 2.91 $";
 
 #include <stdlib.h>
 #include <signal.h>
@@ -1090,11 +1090,6 @@ static int unlockPorts(int masterLock)
 
 /* ----- Global Functions ----------------------------------------------- */
 
-int trb_connect(const char* server)
-{
-  return init_ports();
-}
-
 /* Intit FPGA Interface */
 int init_ports()
 {
@@ -1964,7 +1959,7 @@ int trb_register_modify(uint16_t trb_address,
   /* check, whether all registers are the same */ 
   singleWrite = 1;
   value = data[1];
-  for (i = 2; i < status; i += 2) {
+  for (i = 2; (i + 1) < status; i += 2) {
     if (data[i + 1] != value) {
       singleWrite = 0;
       break;
@@ -1972,7 +1967,7 @@ int trb_register_modify(uint16_t trb_address,
   }
         
   /* Write modified register value(s) */
-  for (i = 0; i < (singleWrite == 0 ? status : 2); i += 2) {
+  for (i = 0; (i + 1) < (singleWrite == 0 ? status : 2); i += 2) {
     if (singleWrite == 0) {
       trb_address = data[i];
       value = data[i + 1];