Move some CRU constants under include/ReadoutCard/Cru.h

kostorr · kostorr · commit 99a1b5cb08d8 · 2018-12-19T16:48:46.000+01:00
diff --git a/include/ReadoutCard/Cru.h b/include/ReadoutCard/Cru.h
@@ -0,0 +1,36 @@
+/// \file Cru.h
+/// \brief Definitions of CRU related constants
+///
+/// \author Kostas Alexopoulos (kostas.alexopoulos@cern.ch)
+
+#ifndef ALICEO2_INCLUDE_READOUTCARD_CRU_H_
+#define ALICEO2_INCLUDE_READOUTCARD_CRU_H_
+
+#include <cstdint>
+
+namespace AliceO2 {
+namespace roc {
+namespace Cru {
+
+static constexpr uint32_t CLOCK_TTC(0x0);
+static constexpr uint32_t CLOCK_LOCAL(0x2);
+
+static constexpr uint32_t DATA_CTP(0x0);
+static constexpr uint32_t DATA_PATTERN(0x1);
+static constexpr uint32_t DATA_MIDTRG(0x2);
+
+static constexpr uint32_t GBT_MUX_TTC(0x0);
+static constexpr uint32_t GBT_MUX_DDG(0x1);
+static constexpr uint32_t GBT_MUX_SC(0x2);
+
+static constexpr uint32_t GBT_MODE_GBT(0x0);
+static constexpr uint32_t GBT_MODE_WB(0x1);
+
+static constexpr uint32_t GBT_PACKET(0x1);
+static constexpr uint32_t GBT_CONTINUOUS(0x0);
+
+} // namespace Cru
+} // namespace roc
+} // namespace AliceO2
+
+#endif // ALICEO2_INCLUDE_READOUTCARD_CRU_H_
diff --git a/include/ReadoutCard/ParameterTypes/Clock.h b/include/ReadoutCard/ParameterTypes/Clock.h
@@ -7,7 +7,7 @@
 #define ALICEO2_INCLUDE_READOUTCARD_CLOCK_H_
 
 #include <string>
-#include <Cru/Constants.h>
+#include "ReadoutCard/Cru.h"
 
 namespace AliceO2 {
 namespace roc {
@@ -17,8 +17,8 @@ struct Clock
 {
     enum type
     {
-      Local = Cru::Registers::CLOCK_LOCAL,
-      Ttc = Cru::Registers::CLOCK_TTC,
+      Local = Cru::CLOCK_LOCAL,
+      Ttc = Cru::CLOCK_TTC,
     };
 
     /// Converts a Clock to a string
diff --git a/include/ReadoutCard/ParameterTypes/DatapathMode.h b/include/ReadoutCard/ParameterTypes/DatapathMode.h
@@ -7,7 +7,7 @@
 #define ALICEO2_INCLUDE_READOUTCARD_CRU_DATAPATHMODE_H_
 
 #include <string>
-#include <Cru/Constants.h>
+#include "ReadoutCard/Cru.h"
 
 namespace AliceO2 {
 namespace roc {
@@ -17,8 +17,8 @@ struct DatapathMode
 {
     enum type
     {
-      Continuous = Cru::Registers::GBT_CONTINUOUS,
-      Packet = Cru::Registers::GBT_PACKET,
+      Continuous = Cru::GBT_CONTINUOUS,
+      Packet = Cru::GBT_PACKET,
     };
 
     /// Converts a DatapathMode to a string
diff --git a/include/ReadoutCard/ParameterTypes/DownstreamData.h b/include/ReadoutCard/ParameterTypes/DownstreamData.h
@@ -7,7 +7,7 @@
 #define ALICEO2_INCLUDE_READOUTCARD_CRU_DOWNSTREAMDATA_H_
 
 #include <string>
-#include <Cru/Constants.h>
+#include "ReadoutCard/Cru.h"
 
 namespace AliceO2 {
 namespace roc {
@@ -17,13 +17,13 @@ struct DownstreamData
 {
     enum type
     {
-      Ctp = Cru::Registers::DATA_CTP,
-      Pattern = Cru::Registers::DATA_PATTERN,
-      Midtrg = Cru::Registers::DATA_MIDTRG,
+      Ctp = Cru::DATA_CTP,
+      Pattern = Cru::DATA_PATTERN,
+      Midtrg = Cru::DATA_MIDTRG,
     };
 
     /// Converts a DownstreamData to an int
-    static std::string toString(const DownstreamData::type& gbtMux);
+    static std::string toString(const DownstreamData::type& downstreamData);
 
     /// Converts a string to a DownstreamData
     static DownstreamData::type fromString(const std::string& string);
diff --git a/include/ReadoutCard/ParameterTypes/GbtMode.h b/include/ReadoutCard/ParameterTypes/GbtMode.h
@@ -7,7 +7,7 @@
 #define ALICEO2_INCLUDE_READOUTCARD_CRU_GBTMODE_H_
 
 #include <string>
-#include <Cru/Constants.h>
+#include "ReadoutCard/Cru.h"
 
 namespace AliceO2 {
 namespace roc {
@@ -17,12 +17,12 @@ struct GbtMode
 {
     enum type
     {
-      Gbt = Cru::Registers::GBT_MODE_GBT,
-      Wb = Cru::Registers::GBT_MODE_WB,
+      Gbt = Cru::GBT_MODE_GBT,
+      Wb = Cru::GBT_MODE_WB,
     };
 
     /// Converts a GbtMode to an int
-    static std::string toString(const GbtMode::type& gbtMux);
+    static std::string toString(const GbtMode::type& gbtMode);
 
     /// Converts a string to a GbtMode
     static GbtMode::type fromString(const std::string& string);
diff --git a/include/ReadoutCard/ParameterTypes/GbtMux.h b/include/ReadoutCard/ParameterTypes/GbtMux.h
@@ -7,7 +7,7 @@
 #define ALICEO2_INCLUDE_READOUTCARD_CRU_GBTMUX_H_
 
 #include <string>
-#include <Cru/Constants.h>
+#include "ReadoutCard/Cru.h"
 
 namespace AliceO2 {
 namespace roc {
@@ -17,9 +17,9 @@ struct GbtMux
 {
     enum type
     {
-      Ttc = Cru::Registers::GBT_MUX_TTC,
-      Ddg = Cru::Registers::GBT_MUX_DDG,
-      Sc = Cru::Registers::GBT_MUX_SC,
+      Ttc = Cru::GBT_MUX_TTC,
+      Ddg = Cru::GBT_MUX_DDG,
+      Sc = Cru::GBT_MUX_SC,
     };
 
     /// Converts a GbtMux to an int
diff --git a/src/CommandLineUtilities/ProgramStatus.cxx b/src/CommandLineUtilities/ProgramStatus.cxx
@@ -72,31 +72,31 @@ class ProgramStatus: public Program
 
     for (const auto& link : reportInfo.linkList) {
       int globalId = link.id + link.bank*6;
-      std::string gbtTxMode = (link.gbtTxMode == Cru::Registers::GBT_MODE_WB ? "WB" : "GBT");
-      std::string gbtRxMode = (link.gbtRxMode == Cru::Registers::GBT_MODE_WB ? "WB" : "GBT");
+      std::string gbtTxMode = (link.gbtTxMode == Cru::GBT_MODE_WB ? "WB" : "GBT");
+      std::string gbtRxMode = (link.gbtRxMode == Cru::GBT_MODE_WB ? "WB" : "GBT");
       std::string gbtTxRxMode = gbtTxMode + "/" + gbtRxMode;
       std::string loopback = (link.loopback == false ? "None" : "Enabled");
 
       std::string downstreamData;
-      if (reportInfo.downstreamData == Cru::Registers::DATA_CTP) {
+      if (reportInfo.downstreamData == Cru::DATA_CTP) {
         downstreamData = "CTP";
-      } else if (reportInfo.downstreamData == Cru::Registers::DATA_PATTERN) {
+      } else if (reportInfo.downstreamData == Cru::DATA_PATTERN) {
         downstreamData = "PATTERN";
-      } else if (reportInfo.downstreamData == Cru::Registers::DATA_MIDTRG) {
+      } else if (reportInfo.downstreamData == Cru::DATA_MIDTRG) {
         downstreamData = "MIDTRG";
       }
 
       std::string gbtMux;
-      if (link.gbtMux == Cru::Registers::GBT_MUX_TTC) {
+      if (link.gbtMux == Cru::GBT_MUX_TTC) {
         gbtMux = "TTC:" + downstreamData;
-      } else if (link.gbtMux == Cru::Registers::GBT_MUX_DDG) {
+      } else if (link.gbtMux == Cru::GBT_MUX_DDG) {
         gbtMux = "DDG";
-      } else if (link.gbtMux == Cru::Registers::GBT_MUX_SC) {
+      } else if (link.gbtMux == Cru::GBT_MUX_SC) {
         gbtMux = "SC";
       }
 
       std::string datapathMode; 
-      if (link.datapathMode == Cru::Registers::GBT_PACKET) {
+      if (link.datapathMode == Cru::GBT_PACKET) {
         datapathMode = "Packet";
       } else {
         datapathMode = "Continuous";
diff --git a/src/Cru/Constants.h b/src/Cru/Constants.h
@@ -1,12 +1,13 @@
 /// \file Cru/Constants.h
-/// \brief Definitions of CRU related constants
+/// \brief Definitions of internal CRU related constants
 ///
 /// \author Pascal Boeschoten (pascal.boeschoten@cern.ch)
 /// \author Kostas Alexopoulos (kostas.alexopoulos@cern.ch)
 
 #ifndef ALICEO2_READOUTCARD_CRU_CONSTANTS_H_
 #define ALICEO2_READOUTCARD_CRU_CONSTANTS_H_
 
+#include "ReadoutCard/Cru.h"
 #include "Register.h"
 
 namespace AliceO2
@@ -153,13 +154,13 @@ static constexpr Register LOCAL_CLOCK(0x00240004);
 /// Register for locking the clock the the refclk 
 static constexpr Register LOCK_CLOCK_TO_REF(0x00220000);
 
-/// Register for modifying TTC parameters (e.g. Clock/Downstream Data)
+/// Register for modifying TTC parameters (CLOCK_/DATA_)
 static constexpr Register TTC_DATA(0x00200000);
-static constexpr uint32_t CLOCK_TTC(0x0);
+/*static constexpr uint32_t CLOCK_TTC(0x0);
 static constexpr uint32_t CLOCK_LOCAL(0x2);
 static constexpr uint32_t DATA_CTP(0x0);
 static constexpr uint32_t DATA_PATTERN(0x1);
-static constexpr uint32_t DATA_MIDTRG(0x2);
+static constexpr uint32_t DATA_MIDTRG(0x2);*/
 
 /// Registers used for TTC calibration
 static constexpr Register PON_WRAPPER_PLL(0x00224000);
@@ -192,9 +193,9 @@ static constexpr Register GBT_LINK_SOURCE_SELECT(0x00000038);
 
 /// Register for selecting the the GBT Multiplexer
 static constexpr Register GBT_MUX_SELECT(0x0000001c);
-static constexpr uint32_t GBT_MUX_TTC(0x0);
+/*static constexpr uint32_t GBT_MUX_TTC(0x0);
 static constexpr uint32_t GBT_MUX_DDG(0x1);
-static constexpr uint32_t GBT_MUX_SC(0x2);
+static constexpr uint32_t GBT_MUX_SC(0x2);*/
 
 /// GBT registers to get Link and Wrapper parameters (e.g. count/links per bank)
 static constexpr Register GBT_LINK_XCVR_OFFSET(0x00001000);
@@ -207,8 +208,8 @@ 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 uint32_t GBT_MODE_GBT(0x0);
-static constexpr uint32_t GBT_MODE_WB(0x1);
+/*static constexpr uint32_t GBT_MODE_GBT(0x0);
+static constexpr uint32_t GBT_MODE_WB(0x1);*/
 
 
 //** DATAPATH WRAPPER **//
@@ -231,8 +232,8 @@ static constexpr Register DWRAPPER_MUX_CONTROL(0x00000004);
 static constexpr Register DATAPATHLINK_OFFSET(0x00040000);
 static constexpr Register DATALINK_OFFSET(0x00001000);
 static constexpr Register DATALINK_CONTROL(0x00000000);
-static constexpr uint32_t GBT_PACKET(0x1);
-static constexpr uint32_t GBT_CONTINUOUS(0x0);
+/*static constexpr uint32_t GBT_PACKET(0x1); 
+static constexpr uint32_t GBT_CONTINUOUS(0x0);*/
 
 /// Registers to set the Flow Control
 static constexpr Register FLOW_CONTROL_OFFSET(0x000c0000);
diff --git a/src/Cru/CruBar.cxx b/src/Cru/CruBar.cxx
@@ -470,8 +470,8 @@ void CruBar::configure()
   std::cout << "Configuring GBT" << std::endl;
   for (auto const& link: mLinkList) {
     gbt.setInternalDataGenerator(link, 0);
-    gbt.setTxMode(link, Cru::Registers::GBT_MODE_GBT); //TX is always GBT
-    gbt.setRxMode(link, mGbtMode);                     //RX may also be WB
+    gbt.setTxMode(link, Cru::GBT_MODE_GBT); //TX is always GBT
+    gbt.setRxMode(link, mGbtMode);          //RX may also be WB
     gbt.setLoopback(link, mLoopback);
   }
 
diff --git a/src/Cru/Gbt.cxx b/src/Cru/Gbt.cxx
@@ -70,14 +70,14 @@ void Gbt::getGbtModes()
 {
   for (auto& link: mLinkList) {
     uint32_t rxControl = mPdaBar->readRegister(getRxControlAddress(link)/4);
-    if (((rxControl >> 8) & 0x1) == Cru::Registers::GBT_MODE_WB) { //TODO: Change with Constants
+    if (((rxControl >> 8) & 0x1) == Cru::GBT_MODE_WB) { //TODO: Change with Constants
       link.gbtRxMode = GbtMode::type::Wb;
     } else {
       link.gbtRxMode = GbtMode::type::Gbt;
     }
 
     uint32_t txControl = mPdaBar->readRegister(getTxControlAddress(link)/4);
-    if (((txControl >> 8) & 0x1) == Cru::Registers::GBT_MODE_WB) { //TODO: Change with Constants
+    if (((txControl >> 8) & 0x1) == Cru::GBT_MODE_WB) { //TODO: Change with Constants
       link.gbtTxMode = GbtMode::type::Wb;
     } else {
       link.gbtTxMode = GbtMode::type::Gbt;
@@ -89,11 +89,11 @@ void Gbt::getGbtMuxes()
 {
   for (auto& link: mLinkList) { uint32_t txMux = mPdaBar->readRegister((Cru::Registers::GBT_MUX_SELECT.address + link.bank * 4)/4);
     txMux = (txMux >> (link.id*4)) & 0x3;
-    if (txMux == Cru::Registers::GBT_MUX_TTC) {
+    if (txMux == Cru::GBT_MUX_TTC) {
       link.gbtMux = GbtMux::type::Ttc;
-    } else if (txMux == Cru::Registers::GBT_MUX_DDG) {
+    } else if (txMux == Cru::GBT_MUX_DDG) {
       link.gbtMux = GbtMux::type::Ddg;
-    } else if (txMux == Cru::Registers::GBT_MUX_SC) {
+    } else if (txMux == Cru::GBT_MUX_SC) {
       link.gbtMux = GbtMux::type::Sc;
     }
   }
diff --git a/src/Cru/Ttc.cxx b/src/Cru/Ttc.cxx
@@ -38,7 +38,7 @@ void Ttc::configurePlls(uint32_t clock)
   std::vector<std::pair<uint32_t, uint32_t>> registerMap2;
   std::vector<std::pair<uint32_t, uint32_t>> registerMap3 = getSi5344RegisterMap();
 
-  if (clock == Cru::Registers::CLOCK_LOCAL) {
+  if (clock == Cru::CLOCK_LOCAL) {
     registerMap2 = getLocalClockRegisterMap();
   } else {
     setRefGen(1);
