Merge pull request #1 from sy-c/syc-patch-1

Barthelemy · web-flow · commit 5827b83dca50 · 2018-03-27T17:14:54.000+02:00
reset cru moved after link mask set
diff --git a/src/Cru/CruDmaChannel.cxx b/src/Cru/CruDmaChannel.cxx
@@ -89,8 +89,6 @@ CruDmaChannel::~CruDmaChannel()
 
 void CruDmaChannel::deviceStartDma()
 {
-  resetCru();
-
   // Enable links
   uint32_t mask = 0xFfffFfff;
   for (const auto& link : mLinks) {
@@ -128,6 +126,9 @@ void CruDmaChannel::deviceStartDma()
     }
   }
 
+  // Reset CRU (should be done after link mask set)
+  resetCru();
+
   // Initialize link queues
   for (auto &link : mLinks) {
     link.queue.clear();

Original file line number	Diff line number	Diff line change
`@@ -89,8 +89,6 @@ CruDmaChannel::~CruDmaChannel()`
`89`	`89`
`90`	`90`	`void CruDmaChannel::deviceStartDma()`
`91`	`91`	`{`
`92`		`- resetCru();`
`93`		`-`
`94`	`92`	`// Enable links`
`95`	`93`	`uint32_t mask = 0xFfffFfff;`
`96`	`94`	`for (const auto& link : mLinks) {`
`@@ -128,6 +126,9 @@ void CruDmaChannel::deviceStartDma()`
`128`	`126`	`}`
`129`	`127`	`}`
`130`	`128`
	`129`	`+ // Reset CRU (should be done after link mask set)`
	`130`	`+ resetCru();`
	`131`	`+`
`131`	`132`	`// Initialize link queues`
`132`	`133`	`for (auto &link : mLinks) {`
`133`	`134`	`link.queue.clear();`