[list-cards] Remove superfluous columns

Author: kostorr

src/CommandLineUtilities/ProgramListCards.cxx

@@ -54,9 +54,9 @@ class ProgramListCards : public Program
   {
     std::ostringstream table;
 
-    auto formatHeader = "  %-3s %-6s %-10s %-8s %-13s %-5s %-11s %-11s %-25s %-17s\n";
-    auto formatRow = "  %-3s %-6s %-10s %-8s %-13s %-5s 0x%-9s 0x%-9s %-25s %-17s\n";
-    auto header = (boost::format(formatHeader) % "#" % "Type" % "PCI Addr" % "Serial" % "Endpoint ID" % "NUMA" % "Vendor ID" % "Device ID" % "FW Version" % "Card ID").str();
+    auto formatHeader = "  %-3s %-6s %-10s %-8s %-10s %-5s %-12s\n";
+    auto formatRow = "  %-3s %-6s %-10s %-8s %-10s %-5s %-12s\n";
+    auto header = (boost::format(formatHeader) % "#" % "Type" % "PCI Addr" % "Serial" % "Endpoint" % "NUMA" % "FW Version").str();
     auto lineFat = std::string(header.length(), '=') + '\n';
     auto lineThin = std::string(header.length(), '-') + '\n';
 
@@ -73,15 +73,13 @@ class ProgramListCards : public Program
     for (const auto& card : cardsFound) {
       const std::string na = "n/a";
       std::string firmware = na;
-      std::string cardId = na;
       std::string numaNode = std::to_string(card.numaNode);
       try {
         Parameters params2 = Parameters::makeParameters(card.pciAddress, 2);
         auto bar2 = ChannelFactory().getBar(params2);
         firmware = bar2->getFirmwareInfo().value_or(na);
         // Check if the firmware is tagged
         firmware = FirmwareChecker().resolveFirmwareTag(firmware);
-        cardId = bar2->getCardId().value_or(na);
       } catch (const Exception& e) {
         if (isVerbose()) {
           std::cout << "Error parsing card information through BAR\n"
@@ -93,8 +91,8 @@ class ProgramListCards : public Program
       std::string endpoint = std::to_string(card.serialId.getEndpoint());
 
       if (!mOptions.jsonOut) {
-        auto format = boost::format(formatRow) % i % CardType::toString(card.cardType) % card.pciAddress.toString() % serial % endpoint % card.numaNode % card.pciId.vendor % card.pciId.device %
-                      firmware % cardId;
+        auto format = boost::format(formatRow) % i % CardType::toString(card.cardType) % card.pciAddress.toString() % serial %
+          endpoint % card.numaNode % firmware;
 
         table << format;
         std::cout << table.str();

src/FirmwareChecker.cxx

@@ -25,7 +25,7 @@ FirmwareChecker::FirmwareChecker() : mCompatibleFirmwareList({ /* CRU */
                                                                { "d458317e", "v3.5.2" },
                                                                { "6baf11da", "v3.5.1" },
                                                                /* CRORC */
-                                                               { "0", "alpha" } })
+                                                               { "72cdb92", "v2.4.1" } })
 {
 }
 
@@ -35,7 +35,7 @@ FirmwareChecker::~FirmwareChecker()
 
 std::string FirmwareChecker::resolveFirmwareTag(std::string firmware)
 {
-  firmware = firmware.substr(firmware.find_last_of("-") + 1);
+  //firmware = firmware.substr(firmware.find_last_of("-") + 1);
   if (mCompatibleFirmwareList.find(firmware) != mCompatibleFirmwareList.end()) {
     return mCompatibleFirmwareList.at(firmware);
   } else {
@@ -55,7 +55,7 @@ std::string FirmwareChecker::getFirmwareCompatibilityList()
 void FirmwareChecker::checkFirmwareCompatibilityWrapped(std::shared_ptr<BarInterface> bar2)
 {
   auto firmware = bar2->getFirmwareInfo().value_or("");
-  firmware = firmware.substr(firmware.find_last_of("-") + 1);
+  //firmware = firmware.substr(firmware.find_last_of("-") + 1);
   auto serial = bar2->getSerial().value_or(-1);
   if (mCompatibleFirmwareList.find(firmware) == mCompatibleFirmwareList.end()) {
     BOOST_THROW_EXCEPTION(Exception() << ErrorInfo::Message(