Testing for v3.0.0 [WIP]

Author: kostorr

src/CommandLineUtilities/ProgramStatus.cxx

@@ -80,6 +80,7 @@ class ProgramStatus: public Program
     std::cout << clock << " clock" << std::endl;
     std::cout << "------------" << std::endl;
 
+    // TODO: Sort according to linkID
     for (const auto& link : reportInfo.linkList) {
       int globalId = link.id + link.bank*6;
       std::string gbtTxMode = (link.gbtTxMode == Cru::GBT_MODE_WB ? "WB" : "GBT");

src/Cru/Common.cxx

@@ -126,7 +126,7 @@ void rxcal0(std::shared_ptr<Pda::PdaBar> pdaBar, uint32_t baseAddress)
 
   //b. Validate that user has control
   uint32_t bit = waitForBit(pdaBar, baseAddress + 4 * 0x280, 2, 0);
-  if (bit != 0) {
+  if (bit != 0 && false) {
     std::cout << "rxcal0 0" << std::endl;
     BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("rxcal0: User does not have control"));
   }
@@ -145,7 +145,7 @@ void rxcal0(std::shared_ptr<Pda::PdaBar> pdaBar, uint32_t baseAddress)
 
   //g. Wait..
   bit = waitForBit(pdaBar, baseAddress + 4 * 0x281, 1, 0);
-  if (bit != 0) {
+  if (bit != 0 && false) {
     std::cout << "rxcal0 1" << std::endl;
     BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message("rxcal0: User does not have control"));
   }

src/Cru/Constants.h

@@ -205,7 +205,7 @@ static constexpr Register GBT_BANK_LINK_OFFSET(0x00002000);
 static constexpr Register GBT_LINK_REGS_OFFSET(0x00000000);
 
 /// Register for selecting the GBT link source (i.e. Internal Data Generator)
-static constexpr Register GBT_LINK_SOURCE_SELECT(0x00000038);
+static constexpr Register GBT_LINK_SOURCE_SELECT(0x00000030);
 
 /// Register for selecting the the GBT Multiplexer
 static constexpr Register GBT_MUX_SELECT(0x0000001c);
@@ -222,8 +222,8 @@ static constexpr Register GBT_WRAPPER_ATX_PLL(0x000e0000);
 static constexpr Register GBT_BANK_FPLL(0x0000e000);
 
 /// Registers to set TX and RX GBT modes
-static constexpr Register GBT_LINK_TX_CONTROL_OFFSET(0x00000034);
-static constexpr Register GBT_LINK_RX_CONTROL_OFFSET(0x00000040);
+static constexpr Register GBT_LINK_TX_CONTROL_OFFSET(0x0000002c);
+static constexpr Register GBT_LINK_RX_CONTROL_OFFSET(0x0000003c);
 /*static constexpr uint32_t GBT_MODE_GBT(0x0);
 static constexpr uint32_t GBT_MODE_WB(0x1);*/
 
@@ -246,7 +246,7 @@ static constexpr Register DWRAPPER_MUX_CONTROL(0x00000004);
 
 /// Datapath Wrapper configuration registers
 static constexpr Register DATAPATHLINK_OFFSET(0x00040000);
-static constexpr Register DATALINK_OFFSET(0x00001000);
+static constexpr Register DATALINK_OFFSET(0x00002000);
 static constexpr Register DATALINK_CONTROL(0x00000000);
 /*static constexpr uint32_t GBT_PACKET(0x1); 
 static constexpr uint32_t GBT_CONTINUOUS(0x0);*/

src/Cru/CruBar.cxx

@@ -563,7 +563,24 @@ std::vector<Link> CruBar::initializeLinkList()
       }
     }
   }
-  return links;
+
+  std::vector<Link> newLinks(sizeof(links));
+  for(int i=0; i<links.size(); i++) {
+    Link link = links.at(i);
+    int newpos = (i-link.bank*6) * 2 + 12*(link.bank/2) + (link.bank %2);
+    newLinks[newpos] = link;
+  }
+
+  for(auto link: links) {
+    std::cout << link.id << std::endl;
+  }
+  std::cout << "====" << std::endl;
+  for (auto link: newLinks) {
+    std::cout << link.id << std::endl;
+    std::cout << std::hex << link.baseAddress << std::endl;
+  }
+  return newLinks;
+  //return links;
 }
 
 /// Initializes and Populates the linkList with the GBT configuration parameters

src/Cru/Ttc.cxx

@@ -58,7 +58,7 @@ void Ttc::configurePlls(uint32_t clock)
     setRefGen(0);
     setRefGen(1);
     registerMap1 = getTtcClockPll1RegisterMap();
-    registerMap2 = getTtcClockPll1RegisterMap();
+    registerMap2 = getTtcClockPll2RegisterMap();
   }
 
   I2c p1 = I2c(Cru::Registers::SI5345_1.address, chipAddress, mPdaBar, registerMap1);