Merge pull request #391 from sy-c/master

v0.38.0

Author: sy-c

CMakeLists.txt

@@ -159,6 +159,7 @@ add_library(ReadoutCard SHARED
   src/Pda/PdaBar.cxx
   src/Pda/PdaDevice.cxx
   src/Pda/PdaDmaBuffer.cxx
+  src/ReadoutCardVersion.cxx
   src/RocPciDevice.cxx
   src/Utilities/Hugetlbfs.cxx
   src/Utilities/MemoryMaps.cxx

doc/releaseNotes.md

@@ -0,0 +1,8 @@
+# ReadoutCard release notes
+
+This file describes the main feature changes for released versions of ReadoutCard library and tools.
+
+## v0.38.0 - 05/09/2022
+- Added release notes as part of source code.
+- Added library version number. Can be retrieved at runtime with o2::roc::getReadoutCardVersion().
+- Fixed bug in DMA reset. Old data from previous run could stay in the pipeline if previous process was stopped abruptly. 

include/ReadoutCard/ReadoutCard.h

@@ -22,3 +22,4 @@
 #include "ReadoutCard/Exception.h"
 #include "ReadoutCard/Parameters.h"
 #include "ReadoutCard/RegisterReadWriteInterface.h"
+#include "ReadoutCard/Version.h"

include/ReadoutCard/Version.h

@@ -0,0 +1,27 @@
+
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#ifndef O2_READOUTCARD_INCLUDE_VERSION_H_
+#define O2_READOUTCARD_INCLUDE_VERSION_H_
+
+namespace o2
+{
+namespace roc
+{
+
+/// Get the ReadoutCard library version
+const char* getReadoutCardVersion();
+
+} // namespace roc
+} // namespace o2
+
+#endif

src/Cru/Constants.h

@@ -200,7 +200,7 @@ static constexpr uint32_t DATA_MIDTRG(0x2);*/
 
 /// Registers for getting TTC info
 static constexpr Register TTC_ONU_STICKY(0x00200014);
-static constexpr Register TTC_ONU_STICKY_MON(0x0020001c);
+static constexpr Register TTC_ONU_STICKY_MON(0x00200014);
 static constexpr Register TTC_PON_QUALITY(0x0010000C);
 
 /// Registers used for TTC calibration

src/Cru/CruDmaChannel.cxx

@@ -142,6 +142,10 @@ void CruDmaChannel::deviceStartDma()
     log("Did not set data source, feature not supported by firmware", LogWarningDevel_(4254));
   }
 
+  if (dataSourceSelection == Cru::Registers::DATA_SOURCE_SELECT_GBT) {
+    getBar2()->disableDataTaking(); // Make sure we don't start from a bad state - shall be done before reset
+  }
+
   // Reset CRU (should be done after link mask set)
   resetCru();
 
@@ -162,7 +166,6 @@ void CruDmaChannel::deviceStartDma()
 
   // Enable data taking
   if (dataSourceSelection == Cru::Registers::DATA_SOURCE_SELECT_GBT) {
-    getBar2()->disableDataTaking(); // Make sure we don't start from a bad state
     getBar2()->enableDataTaking();
   }
 }

src/ReadoutCardVersion.cxx

@@ -0,0 +1,27 @@
+// Copyright 2019-2020 CERN and copyright holders of ALICE O2.
+// See https://alice-o2.web.cern.ch/copyright for details of the copyright holders.
+// All rights not expressly granted are reserved.
+//
+// This software is distributed under the terms of the GNU General Public
+// License v3 (GPL Version 3), copied verbatim in the file "COPYING".
+//
+// In applying this license CERN does not waive the privileges and immunities
+// granted to it by virtue of its status as an Intergovernmental Organization
+// or submit itself to any jurisdiction.
+
+#include "ReadoutCard/Version.h"
+
+#define O2_READOUTCARD_VERSION "0.38.0"
+
+namespace o2
+{
+namespace roc
+{
+
+const char* getReadoutCardVersion()
+{
+  return O2_READOUTCARD_VERSION;
+}
+
+} // namespace roc
+} // namespace o2