[roc-status] Adapt optical status to new endpoint link scheme

Author: kostorr

src/Cru/CruBar.cxx

@@ -424,7 +424,7 @@ Cru::ReportInfo CruBar::report()
   }
 
   // Update the link map with optical power information through I2C
-  I2c i2c = I2c(Cru::Registers::BSP_I2C_MINIPODS.address, 0x0, mPdaBar);
+  I2c i2c = I2c(Cru::Registers::BSP_I2C_MINIPODS.address, 0x0, mPdaBar, mEndpoint);
   i2c.getOpticalPower(linkMap);
 
   Ttc ttc = Ttc(mPdaBar);

src/Cru/I2c.cxx

@@ -28,6 +28,7 @@ namespace roc
 
 I2c::I2c(uint32_t baseAddress, uint32_t chipAddress,
          std::shared_ptr<Pda::PdaBar> pdaBar,
+         int endpoint,
          std::vector<std::pair<uint32_t, uint32_t>> registerMap)
   : mI2cConfig(baseAddress),
     mI2cCommand(baseAddress + 0x4),
@@ -36,6 +37,7 @@ I2c::I2c(uint32_t baseAddress, uint32_t chipAddress,
     mChipAddressStart(0x0),
     mChipAddressEnd(0x7f),
     mPdaBar(pdaBar),
+    mEndpoint(endpoint),
     mRegisterMap(registerMap)
 {
 }
@@ -226,17 +228,13 @@ void I2c::getOpticalPower(std::map<int, Link>& linkMap)
    *                             value 23 -> chip1 but link 23
    *                             ... */
 
-  int chipIndex = 11;
+  int chipIndex = (mEndpoint == 0) ? 11 : 23;
   for (auto& el : linkMap) {
     auto& link = el.second;
     if (opticalPowers.empty()) { //Means no chip found
       link.opticalPower = 0.0;
     } else {
       link.opticalPower = opticalPowers[chipIndex--];
-
-      if (chipIndex == -1) {
-        chipIndex = 23; //move to second chip
-      }
     }
   }
 

src/Cru/I2c.h

@@ -33,6 +33,7 @@ class I2c
  public:
   I2c(uint32_t baseAddress, uint32_t chipAddress,
       std::shared_ptr<Pda::PdaBar> pdaBar,
+      int endpoint = 0,
       std::vector<std::pair<uint32_t, uint32_t>> registerMap = {});
   ~I2c();
 
@@ -57,6 +58,7 @@ class I2c
   uint32_t mChipAddressEnd = 0x7f;
 
   std::shared_ptr<Pda::PdaBar> mPdaBar;
+  int mEndpoint = 0;
   std::vector<std::pair<uint32_t, uint32_t>> mRegisterMap;
 };
 

src/Cru/Ttc.cxx

@@ -58,9 +58,9 @@ void Ttc::configurePlls(uint32_t clock)
     registerMap2 = getTtcClockPll2RegisterMap();
   }
 
-  I2c p1 = I2c(Cru::Registers::SI5345_1.address, chipAddress, mPdaBar, registerMap1);
-  I2c p2 = I2c(Cru::Registers::SI5345_2.address, chipAddress, mPdaBar, registerMap2);
-  I2c p3 = I2c(Cru::Registers::SI5344.address, chipAddress, mPdaBar, registerMap3);
+  I2c p1 = I2c(Cru::Registers::SI5345_1.address, chipAddress, mPdaBar, 0, registerMap1);
+  I2c p2 = I2c(Cru::Registers::SI5345_2.address, chipAddress, mPdaBar, 0, registerMap2);
+  I2c p3 = I2c(Cru::Registers::SI5344.address, chipAddress, mPdaBar, 0, registerMap3);
 
   p1.configurePll();
   p2.configurePll();