[sc] No reset in constructors

Author: kostorr

apps/AlfLibClient.cxx

@@ -63,6 +63,7 @@ class AlfLibClient : public AliceO2::Common::Program
     if (mOptions.sca) {
       std::cout << "Running SCA test" << std::endl;
       auto sca = Sca(mOptions.cardId, mOptions.link);
+      sca.reset();
 
       std::cout << "Running simple SCA operation" << std::endl;
       try {
@@ -150,6 +151,7 @@ class AlfLibClient : public AliceO2::Common::Program
     if (mOptions.ic) {
       std::cout << "Running IC test" << std::endl;
       auto ic = Ic(mOptions.cardId, mOptions.link);
+      ic.reset();
 
       std::cout << "Running Simple IC operations" << std::endl;
       try {

include/Alf/Ic.h

@@ -78,6 +78,9 @@ class Ic
   /// \throws o2::alf::IcException if no IC channel selected
   void checkChannelSet();
 
+  /// Executes an SC reset
+  void reset();
+
   /// Performs an IC read
   /// \param address IC address to read from
   /// \return IC data requested
@@ -131,7 +134,6 @@ class Ic
 
  private:
   void init(const roc::Parameters::CardIdType& cardId, int linkId);
-  void reset();
   void barWrite(uint32_t offset, uint32_t data);
   uint32_t barRead(uint32_t index);
 

include/Alf/Sca.h

@@ -76,6 +76,9 @@ class Sca
   /// \throws o2::alf::ScaException if no SCA channel selected
   void checkChannelSet();
 
+  /// Executes an SC reset
+  void reset();
+
   /// Executes an SCA command
   /// \param commandData SCA command, data pair
   /// \param lock Boolean enabling implicit locking

include/Alf/Swt.h

@@ -74,9 +74,6 @@ class Swt
   /// \param linkId The link ID to set the channel to (optional).
   Swt(std::string cardId, int linkId = -1);
 
-  /// Resets the SWT channel selected
-  void reset();
-
   /// Sets the SWT channel
   /// \param gbtChannel The channel to set
   void setChannel(int gbtChannel);
@@ -85,6 +82,9 @@ class Swt
   /// \throws o2::alf::SwtException if no SWT channel selected
   void checkChannelSet();
 
+  /// Executes an SC reset
+  void reset();
+
   /// Writes an SWT word
   /// \param swtWord The SWT word to write
   /// \param wordSize The size of the SWT word to be written

src/Ic.cxx

@@ -87,8 +87,6 @@ void Ic::init(const roc::Parameters::CardIdType& cardId, int linkId)
 
   mLlaSession = std::make_unique<LlaSession>("DDT", card.sequenceId);
 
-  reset();
-
   // Set CFG to 0x3 by default
   barWrite(ic_regs::IC_WR_CFG.index, 0x3);
 }

src/Sca.cxx

@@ -46,9 +46,6 @@ Sca::Sca(AlfLink link)
       ScaException() << ErrorInfo::Message("Maximum link number exceeded"));
   }
 
-  barWrite(sc_regs::SC_RESET.index, 0x1);
-  barWrite(sc_regs::SC_RESET.index, 0x0);
-
   mLlaSession = std::make_unique<LlaSession>("DDT", link.cardSequence);
 }
 
@@ -75,9 +72,6 @@ void Sca::init(const roc::Parameters::CardIdType& cardId, int linkId)
     roc::CardType::Cru
   };
 
-  barWrite(sc_regs::SC_RESET.index, 0x1);
-  barWrite(sc_regs::SC_RESET.index, 0x0);
-
   mLlaSession = std::make_unique<LlaSession>("DDT", card.sequenceId);
 }
 
@@ -100,6 +94,12 @@ void Sca::checkChannelSet()
   }
 }
 
+void Sca::reset()
+{
+  barWrite(sc_regs::SC_RESET.index, 0x1);
+  barWrite(sc_regs::SC_RESET.index, 0x0);
+}
+
 Sca::CommandData Sca::executeCommand(uint32_t command, uint32_t data, bool lock)
 {
   if (lock) {