[config] Fix link mask bug

Author: kostorr

src/Crorc/CrorcBar.cxx

@@ -129,13 +129,14 @@ void CrorcBar::configure(bool /*force*/)
   log("CRORC configuration done", LogInfoOps);
 }
 
-Crorc::ReportInfo CrorcBar::report()
+Crorc::ReportInfo CrorcBar::report(bool forConfig)
 {
   std::map<int, Crorc::Link> linkMap = initializeLinkMap();
 
   // strip down link map, depending on link(s) requested to report on
   // "associative-container erase idiom"
-  for (auto it = linkMap.cbegin(); it != linkMap.cend(); /* no increment */) {
+  // don't remove links for config, as they all need to be reported
+  for (auto it = linkMap.cbegin(); it != linkMap.cend() && !forConfig; /* no increment */) {
     if ((mLinkMask.find(it->first) == mLinkMask.end())) {
       linkMap.erase(it++);
     } else {

src/Crorc/CrorcBar.h

@@ -49,7 +49,7 @@ class CrorcBar final : public BarInterfaceBase
   void setSerial(int serial);
 
   void configure(bool force = false) override;
-  Crorc::ReportInfo report();
+  Crorc::ReportInfo report(bool forConfig = false);
 
   void resetDevice(bool withSiu);
   void flushSuperpages();

src/Cru/CruBar.cxx

@@ -455,13 +455,14 @@ FirmwareFeatures CruBar::convertToFirmwareFeatures(uint32_t reg)
 }
 
 /// Reports the CRU status
-Cru::ReportInfo CruBar::report()
+Cru::ReportInfo CruBar::report(bool forConfig)
 {
   std::map<int, Link> linkMap = initializeLinkMap();
 
   // strip down link map, depending on link(s) requested to report on
   // "associative-container erase idiom"
-  for (auto it = linkMap.cbegin(); it != linkMap.cend(); /* no increment */) {
+  // don't remove links for config, as they all need to be reported
+  for (auto it = linkMap.cbegin(); it != linkMap.cend() && !forConfig; /* no increment */) {
     if ((mLinkMask.find(it->first) == mLinkMask.end())) {
       linkMap.erase(it++);
     } else {
@@ -661,7 +662,7 @@ void CruBar::checkConfigParameters()
 void CruBar::configure(bool force)
 {
   // Get current info
-  Cru::ReportInfo reportInfo = report();
+  Cru::ReportInfo reportInfo = report(true);
   populateLinkMap(mLinkMap);
 
   if (static_cast<uint32_t>(mClock) == reportInfo.ttcClock &&

src/Cru/CruBar.h

@@ -80,7 +80,7 @@ class CruBar final : public BarInterfaceBase
   void resetInternalCounters();
   void setWrapperCount();
   void configure(bool force = false) override;
-  Cru::ReportInfo report();
+  Cru::ReportInfo report(bool forConfig = false);
   Cru::PacketMonitoringInfo monitorPackets();
   Cru::TriggerMonitoringInfo monitorTriggers(bool updateable = false);
   void emulateCtp(Cru::CtpInfo);