BugID: 708

Remove unused constants.
Remove initial clear of RSP board since it doesn't work anyway and the
board should be initialized properly by the higher level software anyway.

MAC/APL/PIC/RSPDriver/src/BWRead.cc

@@ -36,8 +36,6 @@
 #include "Cache.h"
 #include "StationSettings.h"
 
-#define N_RETRIES 3
-
 using namespace blitz;
 using namespace LOFAR;
 using namespace RSP;

MAC/APL/PIC/RSPDriver/src/RSPDriver.conf.in

@@ -43,7 +43,7 @@ RSPDriver.SOFTPPS=0
 # lofar27:eth2:00:50:04:32:B8:5C
 #RSPDriver.MAC_ADDR_0=00:50:04:32:B8:5C
 RSPDriver.MAC_ADDR_0=10:FA:00:00:13:00
-RSPDriver.MAC_ADDR_1=00:00:00:00:00:FD
+RSPDriver.MAC_ADDR_1=10:FA:00:00:12:00
 RSPDriver.MAC_ADDR_2=00:00:00:00:00:03
 RSPDriver.MAC_ADDR_3=00:00:00:00:00:04
 RSPDriver.MAC_ADDR_4=00:00:00:00:00:05
@@ -213,7 +213,7 @@ RSPDriver.READ_XST=1
 #
 RSPDriver.READ_BF=0
 RSPDriver.READ_SS=0
-RSPDriver.READ_RCU=0
+RSPDriver.READ_RCU=1
 RSPDriver.READ_WG=0
 
 #

MAC/APL/PIC/RSPDriver/src/RSUWrite.cc

@@ -34,8 +34,6 @@
 #include "RSUWrite.h"
 #include "Cache.h"
 
-#define N_RETRIES 3
-
 using namespace blitz;
 using namespace LOFAR;
 using namespace RSP;
@@ -63,40 +61,25 @@ void RSUWrite::sendrequest()
   
   reset.hdr.set(MEPHeader::RSU_RESET_HDR);
 
-  //
-  // Send CLEAR on first write
-  //
-  static bool first = true;
-  if (first) {
-    LOG_INFO("Sending CLEAR to all RSP boards");
-
-    reset.reset = g_RSU_RESET_CLEAR;
-    m_hdr = reset.hdr;
-    getBoardPort().send(reset);
-
-    // wait 5.1 seconds to allow the hardware to run selftests
-    usleep(5100000);
-
-    first = false;
+  // cache modified?
+  if (RTC::RegisterState::MODIFIED != Cache::getInstance().getRSUClearState().get(getBoardId())) {
+    setContinue(true);
+    return;
   }
+
+  // read values from cache
+  RSUSettings& s = Cache::getInstance().getBack().getRSUSettings();
+  if (s()(getBoardId()).getSync())		reset.reset = g_RSU_RESET_SYNC;
+  else if (s()(getBoardId()).getClear())	reset.reset = g_RSU_RESET_CLEAR;
+  else if (s()(getBoardId()).getReset())	reset.reset = g_RSU_RESET_RESET;
   else {
-    // cache modified?
-    if (RTC::RegisterState::MODIFIED != Cache::getInstance().getRSUClearState().get(getBoardId())) {
-      setContinue(true);
-      return;
-    }
-
-    // read values from cache
-    RSUSettings& s = Cache::getInstance().getBack().getRSUSettings();
-    if (s()(getBoardId()).getSync())		reset.reset = g_RSU_RESET_SYNC;
-    else if (s()(getBoardId()).getClear())	reset.reset = g_RSU_RESET_CLEAR;
-    else if (s()(getBoardId()).getReset())	reset.reset = g_RSU_RESET_RESET;
-    else {
-      setContinue(true);
-      return;
-    }
-    getBoardPort().send(reset);
+    Cache::getInstance().getRSUClearState().confirmed(getBoardId());
+    setContinue(true);
+    return;
   }
+
+  m_hdr = reset.hdr;
+  getBoardPort().send(reset);
 }
 
 void RSUWrite::sendrequest_status()

MAC/APL/PIC/RSPDriver/src/SSRead.cc

@@ -32,8 +32,6 @@
 #include "SSRead.h"
 #include "Cache.h"
 
-#define N_RETRIES 3
-
 using namespace blitz;
 using namespace LOFAR;
 using namespace RSP;

MAC/APL/PIC/RSPDriver/src/XstRead.cc

@@ -56,7 +56,7 @@ void XstRead::sendrequest()
   //uint16 offset = (GET_CONFIG("RSPDriver.XST_FIRST_RSP_BOARD", i) + 1) * MEPHeader::N_LOCAL_XLETS * MEPHeader::XLET_SIZE;
   uint16 offset = (GET_CONFIG("RSPDriver.XST_FIRST_RSP_BOARD", i) + 1) * MEPHeader::XLET_SIZE;
 
-  LOG_INFO_STR("XstRead::offset=" << offset);
+  LOG_DEBUG_STR("XstRead::offset=" << offset);
 
   if (m_regid < MEPHeader::XST_0X0 || m_regid > MEPHeader::XST_3Y3)
   {
@@ -133,7 +133,7 @@ GCFEvent::TResult XstRead::handleack(GCFEvent& event, GCFPortInterface& /*port*/
 
   int global_blp = (getBoardId() * StationSettings::instance()->nrBlpsPerBoard()) + (m_regid / MEPHeader::N_POL);
   
-  LOG_INFO(formatString("XstRead::handleack: global_blp=%d", global_blp));
+  LOG_DEBUG(formatString("XstRead::handleack: global_blp=%d", global_blp));
 
   Array<complex<double>, 4>& cache(Cache::getInstance().getBack().getXCStats()());
 
@@ -144,12 +144,12 @@ GCFEvent::TResult XstRead::handleack(GCFEvent& event, GCFPortInterface& /*port*/
 		  
   //Range rcu_range(remote_blp_offset, remote_blp_offset + MEPHeader::N_REMOTE_XLETS - 1);
   
-  LOG_INFO_STR(endl << 
+  LOG_DEBUG_STR(endl << 
 		"global_blp=" << global_blp << endl <<
 		"blp_target_range=" << blp_target_range << endl <<
 		"xststats.range=" << Range(0, MEPHeader::N_REMOTE_XLETS));
 
-  LOG_INFO_STR("xststats shape=" << shape(MEPHeader::N_REMOTE_XLETS, MEPHeader::N_POL));
+  LOG_DEBUG_STR("xststats shape=" << shape(MEPHeader::N_REMOTE_XLETS, MEPHeader::N_POL));
   
   Array<complex<uint32>, 2> xststats((complex<uint32>*)&ack.xst_stat,
 				     shape(MEPHeader::N_REMOTE_XLETS, MEPHeader::N_POL),