[swt] Remove obsolete SWT sequence checks

Author: kostorr

include/Alf/Swt.h

@@ -125,7 +125,6 @@ class Swt
   AlfLink mLink;
   std::unique_ptr<LlaSession> mLlaSession;
 
-  int mWordSequence = 0; //start from 0, as after the reset the counter starts at 1
   static constexpr int DEFAULT_SWT_TIMEOUT_MS = 10;
 };
 

include/Alf/SwtWord.h

@@ -49,19 +49,16 @@ class SwtWord
   void setLow(uint32_t low);
   void setMed(uint32_t med);
   void setHigh(uint16_t high);
-  void setSequence(uint16_t high);
   void setSize(Size size);
   uint32_t getLow() const;
   uint32_t getMed() const;
   uint16_t getHigh() const;
   Size getSize() const;
-  int getSequence() const;
 
  private:
   uint32_t mLow;
   uint32_t mMed;
   uint16_t mHigh;
-  int mSequence;
   Size mSize;
 };
 

src/Swt.cxx

@@ -84,7 +84,6 @@ void Swt::reset()
 {
   barWrite(sc_regs::SC_RESET.index, 0x1);
   barWrite(sc_regs::SC_RESET.index, 0x0); //void cmd to sync clocks
-  mWordSequence = 0;
 }
 
 void Swt::checkChannelSet()
@@ -128,26 +127,8 @@ std::vector<SwtWord> Swt::read(SwtWord::Size wordSize, TimeOut msTimeOut)
       tempWord.setMed(barRead(sc_regs::SWT_RD_WORD_M.index));
     }
 
-    if (wordSize == SwtWord::Size::High) { // Sequence set with high part of the word
+    if (wordSize == SwtWord::Size::High) {
       tempWord.setHigh(barRead(sc_regs::SWT_RD_WORD_H.index));
-    } else { // Only set sequence if smaller word requested
-      tempWord.setSequence(barRead(sc_regs::SWT_RD_WORD_H.index));
-    }
-
-    mWordSequence = (mWordSequence + 1) % 16;
-
-    // If we get the same counter as before it means the FIFO wasn't updated; drop the word
-    if (tempWord.getSequence() != mWordSequence) {
-
-      if (std::chrono::steady_clock::now() > timeOut) {
-        BOOST_THROW_EXCEPTION(SwtException() << ErrorInfo::Message("Timed out: not enough words in SWT READ FIFO"));
-      }
-
-      Logger::get().warn() << "SWT word sequence duplicate" << endm;
-
-      mWordSequence = tempWord.getSequence(); //roll mWordSequence back by one
-      numWords++;                             //will have to read one more time
-      continue;
     }
 
     //wordMonPairs.push_back(std::make_pair(tempWord, barRead(sc_regs::SWT_MON.index)));

src/SwtWord.cxx

@@ -79,19 +79,13 @@ void SwtWord::setMed(uint32_t med)
 void SwtWord::setHigh(uint16_t high)
 {
   mHigh = high & 0xfff;
-  mSequence = (high & 0xf000) >> 12;
 }
 
 void SwtWord::setSize(Size size)
 {
   mSize = size;
 }
 
-void SwtWord::setSequence(uint16_t high)
-{
-  mSequence = (high & 0xf000) >> 12;
-}
-
 uint32_t SwtWord::getLow() const
 {
   return mLow;
@@ -107,11 +101,6 @@ uint16_t SwtWord::getHigh() const
   return mHigh & 0xfff;
 }
 
-int SwtWord::getSequence() const
-{
-  return mSequence;
-}
-
 SwtWord::Size SwtWord::getSize() const
 {
   return mSize;