Update SCA base address

Author: PascalBoeschoten

src/CommandLineUtilities/AliceLowlevelFrontend/Sca.cxx

@@ -18,27 +18,39 @@ namespace CommandLineUtilities {
 namespace Alf {
 
 namespace Registers {
-constexpr size_t BASE_INDEX = 0x4224000 / 4;
-constexpr int WRITE_DATA(0x20 / 4);
-constexpr int WRITE_COMMAND(0x24 / 4);
-constexpr int CONTROL(0x28 / 4);
-constexpr int READ_DATA(0x30 / 4);
-constexpr int READ_COMMAND(0x34 / 4);
-constexpr int READ_BUSY(0x38 / 4);
-constexpr int READ_TIME(0x3c / 4);
+constexpr int CRU_BASE_INDEX = 0x4224000 / 4;
+constexpr int CRU_LINK_OFFSET = 0x20000 / 4;
+constexpr int CRU_MAX_LINKS = 7;
+constexpr int CRORC_BASE_INDEX = 0x30 / 4;
+constexpr int CRORC_LINK_OFFSET = 0x50 / 4;
+constexpr int CRORC_MAX_LINKS = 2;
+constexpr int WRITE_DATA = 0x20 / 4;
+constexpr int WRITE_COMMAND = 0x24 / 4;
+constexpr int CONTROL = 0x28 / 4;
+constexpr int READ_DATA = 0x30 / 4;
+constexpr int READ_COMMAND = 0x34 / 4;
+constexpr int READ_BUSY = 0x38 / 4;
+constexpr int READ_TIME = 0x3c / 4;
 } // namespace Registers
 
 constexpr auto BUSY_TIMEOUT = std::chrono::milliseconds(10);
 constexpr auto CHANNEL_BUSY_TIMEOUT = std::chrono::milliseconds(10);
 
-Sca::Sca(RegisterReadWriteInterface &bar2, CardType::type cardType, int link) : bar2(bar2)
+Sca::Sca(RegisterReadWriteInterface &bar2, CardType::type cardType, int link) : mBar2(bar2)
 {
+  auto setOffset = [&](auto base, auto offset, auto maxLinks) {
+    if (link >= maxLinks ) {
+      BOOST_THROW_EXCEPTION(ScaException() << ErrorInfo::Message("Maximum link number exceeded"));
+    }
+    mOffset = base + link * offset;
+  };
+
   if (cardType == CardType::Cru) {
-    offset = 0x04224000 + link * 0x20000;
+    setOffset(Registers::CRU_BASE_INDEX, Registers::CRU_LINK_OFFSET, Registers::CRU_MAX_LINKS);
   } else if (cardType == CardType::Crorc) {
-    offset = 0x1a0;
+    setOffset(Registers::CRORC_BASE_INDEX, Registers::CRORC_LINK_OFFSET, Registers::CRORC_MAX_LINKS);
   } else if (cardType == CardType::Dummy){
-    offset = 0;
+    setOffset(0, 0x100, 6);
   } else {
     throw std::runtime_error("Unknown card type, could not calculate SCA offset");
   }
@@ -183,12 +195,12 @@ auto Sca::gpioRead() -> ReadResult
 
 void Sca::barWrite(int index, uint32_t data)
 {
-  bar2.writeRegister(index + offset, data);
+  mBar2.writeRegister(index + mOffset, data);
 }
 
 uint32_t Sca::barRead(int index)
 {
-  return bar2.readRegister(index + offset);
+  return mBar2.readRegister(index + mOffset);
 }
 
 void Sca::executeCommand()

src/CommandLineUtilities/AliceLowlevelFrontend/Sca.h

@@ -57,10 +57,10 @@ class Sca
     bool isChannelBusy(uint32_t command);
 
     /// Interface for BAR 2
-    RegisterReadWriteInterface& bar2;
+    RegisterReadWriteInterface& mBar2;
 
     /// Offset for the registers. May differ per card
-    int offset;
+    int mOffset;
 };