[alf] Move CRU REGISTER_SEQUENCE under the card level

Author: kostorr

src/AlfServer.cxx

@@ -32,7 +32,7 @@ AlfServer::AlfServer() : mRpcServers()
 {
 }
 
-std::string AlfServer::registerBlobWrite(const std::string& parameter, AlfLink link, bool isCru)
+std::string AlfServer::registerBlobWrite(const std::string& parameter, std::shared_ptr<roc::BarInterface> bar, bool isCru)
 {
   std::vector<std::string> stringPairs = Util::split(parameter, argumentSeparator());
   std::vector<std::vector<uint32_t>> registerPairs = parseStringToRegisterPairs(stringPairs);
@@ -50,11 +50,11 @@ std::string AlfServer::registerBlobWrite(const std::string& parameter, AlfLink l
     }
 
     if (registerPair.size() == 1) {
-      value = link.bar->readRegister(address / 4);
+      value = bar->readRegister(address / 4);
       resultBuffer << Util::formatValue(value) << "\n";
     } else if (registerPair.size() == 2) {
       value = registerPair.at(1);
-      link.bar->writeRegister(address / 4, value);
+      bar->writeRegister(address / 4, value);
       resultBuffer << "0"
                    << "\n";
     }
@@ -574,7 +574,7 @@ void AlfServer::makeRpcServers(std::vector<AlfLink> links)
 
         // Register Sequence
         servers.push_back(makeServer(names.registerSequence(),
-                                     [link](auto parameter) { return registerBlobWrite(parameter, link, true); }));
+                                     [bar](auto parameter) { return registerBlobWrite(parameter, bar, true); }));
         // Pattern Player
         servers.push_back(makeServer(names.patternPlayer(),
                                      [bar](auto parameter) { return patternPlayer(parameter, bar); }));
@@ -604,8 +604,8 @@ void AlfServer::makeRpcServers(std::vector<AlfLink> links)
 
     } else if (link.cardType == roc::CardType::Crorc) {
       // Register Sequence
-      servers.push_back(makeServer(names.registerSequence(),
-                                   [link](auto parameter) { return registerBlobWrite(parameter, link); }));
+      servers.push_back(makeServer(names.registerSequenceLink(),
+                                   [bar](auto parameter) { return registerBlobWrite(parameter, bar); }));
     }
   }
 }

src/AlfServer.h

@@ -55,7 +55,7 @@ class AlfServer
   std::string icBlobWrite(const std::string& parameter, AlfLink link);
   std::string icGbtI2cWrite(const std::string& parameter, AlfLink link);
   static std::string patternPlayer(const std::string& parameter, std::shared_ptr<roc::BarInterface>);
-  static std::string registerBlobWrite(const std::string& parameter, AlfLink link, bool isCru = false);
+  static std::string registerBlobWrite(const std::string& parameter, std::shared_ptr<roc::BarInterface>, bool isCru = false);
   std::string llaSessionStart(const std::string& parameter, roc::SerialId serialId);
   std::string llaSessionStop(const std::string& parameter, roc::SerialId serialId);
 

src/DimServices/ServiceNames.cxx

@@ -38,14 +38,14 @@ namespace alf
 DEFCARDSERVICENAME(patternPlayer, "PATTERN_PLAYER")
 DEFCARDSERVICENAME(llaSessionStart, "LLA_SESSION_START")
 DEFCARDSERVICENAME(llaSessionStop, "LLA_SESSION_STOP")
+DEFCARDSERVICENAME(registerSequence, "REGISTER_SEQUENCE")
 
+DEFLINKSERVICENAME(registerSequenceLink, "REGISTER_SEQUENCE")
 DEFLINKSERVICENAME(scaSequence, "SCA_SEQUENCE")
 DEFLINKSERVICENAME(scaMftPsuSequence, "SCA_MFT_PSU_SEQUENCE")
 DEFLINKSERVICENAME(swtSequence, "SWT_SEQUENCE")
 DEFLINKSERVICENAME(icSequence, "IC_SEQUENCE")
 DEFLINKSERVICENAME(icGbtI2cWrite, "IC_GBT_I2C_WRITE")
-//CRORC
-DEFLINKSERVICENAME(registerSequence, "REGISTER_SEQUENCE")
 
 std::string ServiceNames::formatLink(std::string name) const
 {

src/DimServices/ServiceNames.h

@@ -40,6 +40,7 @@ class ServiceNames
   std::string icGbtI2cWrite() const;
   std::string patternPlayer() const;
   std::string registerSequence() const;
+  std::string registerSequenceLink() const;
   std::string llaSessionStart() const;
   std::string llaSessionStop() const;