Update firmware version registers

Author: kostorr

src/Cru/BarAccessor.h

@@ -187,16 +187,16 @@ class BarAccessor
       return mBar->readRegister(Registers::FIRMWARE_TIME.index);
     }
 
-    uint32_t getFpgaChipId1()
+    uint32_t getFpgaChipHigh()
     {
       assertBarIndex(2, "Can only get FPGA chip ID from BAR 2");
-      return mBar->readRegister(Registers::FPGA_CHIP_ID_1.index);
+      return mBar->readRegister(Registers::FPGA_CHIP_HIGH.index);
     }
 
-    uint32_t getFpgaChipId2()
+    uint32_t getFpgaChipLow()
     {
       assertBarIndex(2, "Can only get FPGA chip ID from BAR 2");
-      return mBar->readRegister(Registers::FPGA_CHIP_ID_2.index);
+      return mBar->readRegister(Registers::FPGA_CHIP_LOW.index);
     }
 
     /// Get the enabled features for the card's firmware.
@@ -310,4 +310,4 @@ class BarAccessor
 } // namespace roc
 } // namespace AliceO2
 
-#endif // ALICEO2_READOUTCARD_CRU_BARACCESSOR_H_
+#endif // ALICEO2_READOUTCARD_CRU_BARACCESSOR_H_

src/Cru/Constants.h

@@ -111,19 +111,19 @@ static constexpr Register FIRMWARE_EPOCH(0x1c);
 
 /// Register containing the compilation date/time in seconds since Unix epoch
 /// Must be accessed on BAR 2
-static constexpr Register FIRMWARE_DATE(0x20);
+static constexpr Register FIRMWARE_DATE(0x08);
 
 /// Register containing the compilation date/time in seconds since Unix epoch
 /// Must be accessed on BAR 2
-static constexpr Register FIRMWARE_TIME(0x24);
+static constexpr Register FIRMWARE_TIME(0x0c);
 
 /// Register containing the first part of the Arria 10 chip ID
 /// Must be accessed on BAR 2
-static constexpr Register FPGA_CHIP_ID_1(0x00200038);
+static constexpr Register FPGA_CHIP_HIGH(0x00010014);
 
 /// Register containing the second part of the Arria 10 chip ID
 /// Must be accessed on BAR 2
-static constexpr Register FPGA_CHIP_ID_2(0x0020003c);
+static constexpr Register FPGA_CHIP_LOW(0x00010018);
 
 } // namespace Cru
 } // namespace Registers

src/Cru/CruDmaChannel.cxx

@@ -351,7 +351,7 @@ boost::optional<std::string> CruDmaChannel::getFirmwareInfo()
 boost::optional<std::string> CruDmaChannel::getCardId()
 {
   if (mFeatures.chipId) {
-    return (boost::format("%08x-%08x") % getBar2().getFpgaChipId1() % getBar2().getFpgaChipId2()).str();
+    return (boost::format("%08x-%08x") % getBar2().getFpgaChipHigh() % getBar2().getFpgaChipLow()).str();
   } else {
     return {};
   }