[crorc] Fix CRORC QSFP status addressing

Author: kostorr

src/Crorc/Constants.h

@@ -399,8 +399,10 @@ static constexpr uint32_t SIU_RANDCIFST(0x00000002);
 static constexpr uint32_t LINK_DOWN(0x00002000);
 
 // Registers containing Optical Power information
-static constexpr IntervalRegister OPT_POWER_QSFP0(0x00000144, 0x4);
-static constexpr IntervalRegister OPT_POWER_QSFP1(0x00000158, 0x4);
+// Odd link number, bits [31-16], even link number bits [15-0]
+static constexpr Register OPT_POWER_QSFP10(0x00000144);
+static constexpr Register OPT_POWER_QSFP32(0x00000148);
+static constexpr Register OPT_POWER_QSFP54(0x00000158);
 
 // Registers for RX FIFO configuration
 static constexpr Register RX_FIFO_ADDR_LOW(0x00000038);

src/Crorc/CrorcBar.cxx

@@ -232,12 +232,22 @@ void CrorcBar::getOpticalPowers(std::map<int, Crorc::Link>& linkMap)
   for (auto& el : linkMap) {
     auto linkNo = el.first;
     auto& link = el.second;
-    if (linkNo < 4) {
-      link.opticalPower = readRegister(Crorc::Registers::OPT_POWER_QSFP0.get(linkNo).index) & 0xffff;
+
+    uint32_t opt;
+
+    if (linkNo < 2) {
+      opt = readRegister(Crorc::Registers::OPT_POWER_QSFP10.index);
+    } else if (linkNo < 4) {
+      opt = readRegister(Crorc::Registers::OPT_POWER_QSFP32.index);
+    } else {
+      opt = readRegister(Crorc::Registers::OPT_POWER_QSFP54.index);
+    }
+    if (linkNo % 2 == 0) {
+      opt &= 0xffff;
     } else {
-      link.opticalPower = readRegister(Crorc::Registers::OPT_POWER_QSFP1.get(linkNo % 4).index) & 0xffff;
+      opt = (opt & 0xffff0000) >> 16;
     }
-    link.opticalPower /= 10;
+    link.opticalPower = opt / 10;
   }
 }