[alf] Assign services to card instead of endpoint level

Author: kostorr

src/AlfServer.cxx

@@ -548,25 +548,25 @@ void AlfServer::makeRpcServers(std::vector<AlfLink> links)
     std::shared_ptr<roc::BarInterface> bar = link.bar;
 
     if (link.cardType == roc::CardType::Cru) {
-      if (link.linkId == 0) { // Register Read / Write services are per card; register them as soon as possible
+      if (link.linkId == 0 && link.serialId.getEndpoint() == 0) { // Services per card
         // Register Read
         servers.push_back(makeServer(names.registerRead(),
-                                     [bar](auto parameter) { return registerRead(parameter, bar); }));
+              [bar](auto parameter) { return registerRead(parameter, bar); }));
         // Register Write
         servers.push_back(makeServer(names.registerWrite(),
-                                     [bar](auto parameter) { return registerWrite(parameter, bar); }));
+              [bar](auto parameter) { return registerWrite(parameter, bar); }));
 
         // Pattern Player
         servers.push_back(makeServer(names.patternPlayer(),
-                                     [bar](auto parameter) { return patternPlayer(parameter, bar); }));
+              [bar](auto parameter) { return patternPlayer(parameter, bar); }));
 
         // LLA Session Start
         servers.push_back(makeServer(names.llaSessionStart(),
-                                     [link, this](auto parameter) { return llaSessionStart(parameter, link.serialId); }));
+              [link, this](auto parameter) { return llaSessionStart(parameter, link.serialId); }));
 
         // LLA Session Stop
         servers.push_back(makeServer(names.llaSessionStop(),
-                                     [link, this](auto parameter) { return llaSessionStop(parameter, link.serialId); }));
+              [link, this](auto parameter) { return llaSessionStop(parameter, link.serialId); }));
       }
 
       lla::SessionParameters params = lla::SessionParameters::makeParameters()

src/DimServices/ServiceNames.cxx

@@ -31,29 +31,30 @@ namespace alf
 #define DEFCARDSERVICENAME(_function, _name)  \
   std::string ServiceNames::_function() const \
   {                                           \
-    return format(_name);                     \
+    return formatCard(_name);                 \
   }
 
-DEFCARDSERVICENAME(registerRead, "REGISTER_READ")
-DEFCARDSERVICENAME(registerWrite, "REGISTER_WRITE")
 DEFCARDSERVICENAME(patternPlayer, "PATTERN_PLAYER")
 DEFCARDSERVICENAME(llaSessionStart, "LLA_SESSION_START")
 DEFCARDSERVICENAME(llaSessionStop, "LLA_SESSION_STOP")
+DEFCARDSERVICENAME(registerRead, "REGISTER_READ")
+DEFCARDSERVICENAME(registerWrite, "REGISTER_WRITE")
 
-DEFLINKSERVICENAME(registerSequence, "REGISTER_SEQUENCE")
 DEFLINKSERVICENAME(scaSequence, "SCA_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
 {
   return ((boost::format("ALF_%1%/SERIAL_%2%/ENDPOINT_%3%/LINK_%4%/%5%") % mAlfId % mSerialId.getSerial() % mSerialId.getEndpoint() % mLink % name)).str();
 }
 
-std::string ServiceNames::format(std::string name) const
+std::string ServiceNames::formatCard(std::string name) const
 {
-  return ((boost::format("ALF_%1%/SERIAL_%2%/ENDPOINT_%3%/%4%") % mAlfId % mSerialId.getSerial() % mSerialId.getEndpoint() % name)).str();
+  return ((boost::format("ALF_%1%/SERIAL_%2%/%3%") % mAlfId % mSerialId.getSerial() % name)).str();
 }
 
 } // namespace alf

src/DimServices/ServiceNames.h

@@ -46,7 +46,7 @@ class ServiceNames
 
  private:
   std::string formatLink(std::string name) const;
-  std::string format(std::string name) const;
+  std::string formatCard(std::string name) const;
   std::string mAlfId;
   const roc::SerialId mSerialId;
   const int mLink;