[cru] Remove Generator Size parameter

Author: kostorr

src/CommandLineUtilities/ProgramDmaBench.cxx

@@ -153,9 +153,6 @@ class ProgramDmaBench : public Program
     options.add_options()("generator",
                           po::value<bool>(&mOptions.generatorEnabled)->default_value(true),
                           "Enable data generator");
-    options.add_options()("generator-size",
-                          SuffixOption<size_t>::make(&mOptions.dataGeneratorSize)->default_value("0"),
-                          "Data generator data size. 0 will use internal driver default.");
     Options::addOptionCardId(options);
     options.add_options()("links",
                           po::value<std::string>(&mOptions.links)->default_value("0"),
@@ -1101,7 +1098,6 @@ class ProgramDmaBench : public Program
     std::string links;
     bool generatorEnabled = false;
     bool bufferFullCheck = false;
-    size_t dataGeneratorSize;
     size_t dmaPageSize;
     std::string loopbackModeString;
     std::string timeLimitString;

src/Cru/CruBar.cxx

@@ -363,29 +363,6 @@ FirmwareFeatures CruBar::convertToFirmwareFeatures(uint32_t reg)
   return features;
 }
 
-/// Sets the bits for the data generator size in the given integer
-/// \param bits Integer with bits to set
-/// \param size Size to set
-void CruBar::setDataGeneratorSizeBits(uint32_t& bits, size_t size)
-{
-  if (!Utilities::isMultiple(size, 32ul)) {
-    BOOST_THROW_EXCEPTION(Exception()
-                          << ErrorInfo::Message("Unsupported generator data size for CRU; must be multiple of 32 bytes")
-                          << ErrorInfo::GeneratorEventLength(size));
-  }
-
-  if (size < 32 || size > Cru::DMA_PAGE_SIZE) {
-    BOOST_THROW_EXCEPTION(Exception()
-                          << ErrorInfo::Message("Unsupported generator data size for CRU; must be >= 32 bytes and <= 8 KiB")
-                          << ErrorInfo::GeneratorEventLength(size));
-  }
-
-  // We set the size in 256-bit (32 byte) words and do -1 because that's how it works.
-  uint32_t sizeValue = ((size / 32) - 1) << 8;
-  bits &= ~(uint32_t(0xff00));
-  bits += sizeValue;
-}
-
 /// Sets the bits for the data generator enabled in the given integer
 /// \param bits Integer with bits to set
 /// \param enabled Generator enabled or not
@@ -394,14 +371,6 @@ void CruBar::setDataGeneratorEnableBits(uint32_t& bits, bool enabled)
   Utilities::setBit(bits, 0, enabled);
 }
 
-/// Sets the bits for the data generator random size in the given integer
-/// \param bits Integer with bits to set
-/// \param enabled Random enabled or not
-void CruBar::setDataGeneratorRandomSizeBits(uint32_t& bits, bool enabled)
-{
-  Utilities::setBit(bits, 16, enabled);
-}
-
 /// Reports the CRU status
 Cru::ReportInfo CruBar::report()
 {

src/Cru/CruBar.h

@@ -73,7 +73,6 @@ class CruBar final : public BarInterfaceBase
 
   static FirmwareFeatures convertToFirmwareFeatures(uint32_t reg);
 
-  static void setDataGeneratorSizeBits(uint32_t& bits, size_t size);
   static void setDataGeneratorEnableBits(uint32_t& bits, bool enabled);
   static void setDataGeneratorRandomSizeBits(uint32_t& bits, bool enabled);
 

test/TestCruBar.cxx

@@ -60,31 +60,4 @@ BOOST_AUTO_TEST_CASE(TestDataGeneratorConfiguration)
     CruBar::setDataGeneratorEnableBits(bits, false);
     BOOST_CHECK(bits == 0x0);
   }
-  {
-    uint32_t bits = 0;
-    CruBar::setDataGeneratorRandomSizeBits(bits, true);
-    BOOST_CHECK(bits == (1 << 16));
-    CruBar::setDataGeneratorRandomSizeBits(bits, false);
-    BOOST_CHECK(bits != (1 << 16));
-  }
-  {
-    uint32_t bits = 0;
-    CruBar::setDataGeneratorEnableBits(bits, true);
-    BOOST_CHECK(bits == 0x1);
-    CruBar::setDataGeneratorSizeBits(bits, 8 * 1024);
-    BOOST_CHECK(bits == 0xff03);
-  }
-  {
-    uint32_t bits = 0;
-    CruBar::setDataGeneratorEnableBits(bits, true);
-    CruBar::setDataGeneratorSizeBits(bits, 32);
-    BOOST_CHECK(bits == 0x0003);
-  }
-  {
-    uint32_t bits = 0;
-    // Too high value
-    BOOST_CHECK_THROW(CruBar::setDataGeneratorSizeBits(bits, 8 * 1024 + 1), std::exception);
-    // Not a multiple of 256 bits
-    BOOST_CHECK_THROW(CruBar::setDataGeneratorSizeBits(bits, 257), std::exception);
-  }
 }

test/TestParameters.cxx

@@ -18,7 +18,6 @@ constexpr auto SERIAL_NUMBER = 1;
 constexpr auto CHANNEL_NUMBER = 2;
 //constexpr auto DMA_BUFFER_SIZE = 3ul;
 constexpr auto DMA_PAGE_SIZE = 4ul;
-constexpr auto GENERATOR_DATA_SIZE = 5ul;
 constexpr auto GENERATOR_ENABLED = true;
 constexpr auto GENERATOR_LOOPBACK_MODE = LoopbackMode::Internal;
 
@@ -34,22 +33,19 @@ BOOST_AUTO_TEST_CASE(ParametersPutGetTest)
 {
   Parameters p = Parameters::makeParameters(SERIAL_NUMBER, CHANNEL_NUMBER)
                    .setDmaPageSize(DMA_PAGE_SIZE)
-                   .setGeneratorDataSize(GENERATOR_DATA_SIZE)
                    .setGeneratorEnabled(GENERATOR_ENABLED)
                    .setGeneratorLoopback(GENERATOR_LOOPBACK_MODE)
                    .setBufferParameters(buffer_parameters::File{ "/my/file.shm", 0 });
 
   BOOST_REQUIRE(boost::get<int>(p.getCardId().get()) == SERIAL_NUMBER);
   BOOST_REQUIRE(p.getChannelNumber().get_value_or(0) == CHANNEL_NUMBER);
   BOOST_REQUIRE(p.getDmaPageSize().get_value_or(0) == DMA_PAGE_SIZE);
-  BOOST_REQUIRE(p.getGeneratorDataSize().get_value_or(0) == GENERATOR_DATA_SIZE);
   BOOST_REQUIRE(p.getGeneratorEnabled().get_value_or(false) == GENERATOR_ENABLED);
   BOOST_REQUIRE(p.getGeneratorLoopback().get_value_or(LoopbackMode::None) == GENERATOR_LOOPBACK_MODE);
 
   BOOST_REQUIRE(boost::get<int>(p.getCardIdRequired()) == SERIAL_NUMBER);
   BOOST_REQUIRE(p.getChannelNumberRequired() == CHANNEL_NUMBER);
   BOOST_REQUIRE(p.getDmaPageSizeRequired() == DMA_PAGE_SIZE);
-  BOOST_REQUIRE(p.getGeneratorDataSizeRequired() == GENERATOR_DATA_SIZE);
   BOOST_REQUIRE(p.getGeneratorEnabledRequired() == GENERATOR_ENABLED);
   BOOST_REQUIRE(p.getGeneratorLoopbackRequired() == GENERATOR_LOOPBACK_MODE);