[roc-config] Update gbt mux registers

Author: kostorr

src/Cru/CruBar.cxx

@@ -663,7 +663,7 @@ void CruBar::populateLinkMap(std::map<int, Link> &linkMap)
       } else {                                    // Specific MUX not found
         link.gbtMux = mGbtMux;
       }
-      gbt.setMux(link, link.gbtMux);
+      gbt.setMux(el.first, link.gbtMux);
 
       link.datapathMode = mDatapathMode;
     }

src/Cru/Gbt.cxx

@@ -30,10 +30,12 @@ Gbt::Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::map<int, Link> &linkMap, int
 {
 }
 
-void Gbt::setMux(Link link, uint32_t mux)
+void Gbt::setMux(int index, uint32_t mux)
 {
-  uint32_t address = Cru::Registers::GBT_MUX_SELECT.address + (link.bank * 4);
-  mPdaBar->modifyRegister(address/4, link.id*4, 2, mux);
+  uint32_t reg = index / 16;
+  uint32_t bitOffset = (index % 16) * 2;
+  uint32_t address = Cru::Registers::GBT_MUX_SELECT.address + (reg * 4);
+  mPdaBar->modifyRegister(address/4, bitOffset, 2, mux);
 }
 
 void Gbt::setInternalDataGenerator(Link link, uint32_t value)
@@ -100,15 +102,20 @@ void Gbt::getGbtModes()
 void Gbt::getGbtMuxes()
 {
   for (auto& el: mLinkMap) {
+    int index = el.first;
     auto& link = el.second;
-    uint32_t txMux = mPdaBar->readRegister((Cru::Registers::GBT_MUX_SELECT.address + link.bank * 4)/4);
-    txMux = (txMux >> (link.id*4)) & 0x3;
+    uint32_t reg = (index / 16);
+    uint32_t bitOffset = (index % 16) * 2;
+    uint32_t txMux = mPdaBar->readRegister((Cru::Registers::GBT_MUX_SELECT.address + reg * 4)/4);
+    txMux = (txMux >> bitOffset) & 0x3;
     if (txMux == Cru::GBT_MUX_TTC) {
       link.gbtMux = GbtMux::type::Ttc;
     } else if (txMux == Cru::GBT_MUX_DDG) {
       link.gbtMux = GbtMux::type::Ddg;
     } else if (txMux == Cru::GBT_MUX_SWT) {
       link.gbtMux = GbtMux::type::Swt;
+    } else {
+      link.gbtMux = GbtMux::type::Na;
     }
   }
 }

src/Cru/Gbt.h

@@ -30,7 +30,7 @@ class Gbt {
   public: 
     //Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::vector<Link> &mLinkList, int wrapperCount);
     Gbt(std::shared_ptr<Pda::PdaBar> pdaBar, std::map<int, Link> &mLinkMap, int wrapperCount);
-    void setMux(Link link, uint32_t mux);
+    void setMux(int link, uint32_t mux);
     void setInternalDataGenerator(Link link, uint32_t value);
     void setTxMode(Link link, uint32_t mode);
     void setRxMode(Link link, uint32_t mode);