Bug 335: modified TBBDriver

MAC/APL/PIC/TBB_Driver/src/DriverSettings.cc

@@ -323,7 +323,7 @@ int32 TbbSettings::getFirstChannelNr(int32 board, int32 mp)
 	return((board * itsChannelsOnBoard) + (mp * itsChannelsOnMp));
 }
 
-void TbbSettings::setDestination(int32 rcunr, char *storage)
+void TbbSettings::setDestination(int32 channelnr, char *storage)
 {
     char mac[20];
     char ip[20];
@@ -355,11 +355,8 @@ void TbbSettings::setDestination(int32 rcunr, char *storage)
 		LOG_DEBUG_STR(formatString("storage=%s NOT found", key));
 	}
 	else {
-	    int32 ch;
-	    int32 board;
-	    convertRcu2Ch(rcunr, &board, &ch);
-	    itsChannelInfo[ch * board].dstIpCep = static_cast<string>(ip);
-	    itsChannelInfo[ch * board].dstMacCep = static_cast<string>(mac);
+	    itsChannelInfo[channelnr].dstIpCep = static_cast<string>(ip);
+	    itsChannelInfo[channelnr].dstMacCep = static_cast<string>(mac);
 	}
 }
 

MAC/APL/PIC/TBB_Driver/src/DriverSettings.h

@@ -189,7 +189,7 @@ public:
 	void setDstIpCep(int32 channelnr, string ip);
 	void setSrcMacCep(int32 boardnr, string mac);
 	void setDstMacCep(int32 channelnr, string mac);
-	void setDestination(int32 boardnr, char *storage);
+	void setDestination(int32 channelnr, char *storage);
 	
 	
 	void clearRcuSettings(int32 boardnr);

MAC/APL/PIC/TBB_Driver/src/TBBDriver.cc

@@ -1077,13 +1077,17 @@ bool TBBDriver::sendInfo(GCFEvent& event, GCFPortInterface& port)
     		    TBBModeEvent tbb_event(event);
     		    for (int32 rcu = 0; rcu < TS->maxChannels(); rcu++) {
     		        if (tbb_event.rcu_mask.test(rcu)) {
-    		            TS->setChOperatingMode(rcu, tbb_event.rec_mode[rcu]);
+    		            int chan;
+    		            int board;
+    		            TS->convertRcu2Ch(rcu, &board, &chan);
+    		            chan += board * TS->nrChannelsOnBoard();
+    		            TS->setChOperatingMode(chan, tbb_event.rec_mode[rcu]);
     		        }
     		    }
     		    
     		    TBBModeAckEvent ack;
         		for (int32 i = 0; i < TS->maxBoards(); i++) {
-        			ack.status_mask[i] = 0;
+        			ack.status_mask[i] = TBB_SUCCESS;
         		}
     		    port.send(ack);
     		} else {
@@ -1097,12 +1101,16 @@ bool TBBDriver::sendInfo(GCFEvent& event, GCFPortInterface& port)
     		    TBBCepStorageEvent tbb_event(event);
     		    for (int32 rcu = 0; rcu < TS->maxChannels(); rcu++) {
     		        if (tbb_event.rcu_mask.test(rcu)) {
-    		            TS->setDestination(rcu, tbb_event.destination);
+    		            int chan;
+    		            int board;
+    		            TS->convertRcu2Ch(rcu, &board, &chan);
+    		            chan += board * TS->nrChannelsOnBoard();
+    		            TS->setDestination(chan, tbb_event.destination);
     		        }
     		    }
     		    TBBCepStorageAckEvent tbb_ack;
         		for (int32 i = 0; i < TS->maxBoards(); i++) {
-        			tbb_ack.status_mask[i] = 0;
+        			tbb_ack.status_mask[i] = TBB_SUCCESS;
         		}
     		    port.send(tbb_ack);
     		} else {