gearmulator

commit 085d95359d4b65584bfe107771b8cfd340419deb
parent 3a041933843676440c7267667e30038165f83e4a
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Thu,  1 Aug 2024 02:34:15 +0200

more shutdown fixes

Diffstat:
M
source/nord/n2x/n2xLib/n2xhardware.cpp
 | 
25
++++++++++++-------------

1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/source/nord/n2x/n2xLib/n2xhardware.cpp b/source/nord/n2x/n2xLib/n2xhardware.cpp
@@ -37,33 +37,31 @@ namespace n2x
 	{
 		m_destroy = true;
 
+		while(m_destroy)
+			processAudio(8,64);
+
 		constexpr auto notifyCount = dsp56k::Audio::RingBufferSize * 2;
 
+		m_dspA.terminate();
+		m_dspB.terminate();
+
 		// DSP A waits for space to push to DSP B
 		for(uint32_t i=0; i<notifyCount; ++i)
 			m_semDspAtoB.notify();
 
 		// DSP B waits for ESAI rate limiting
-		for(uint32_t i=0; i<notifyCount; ++i)
-			m_haltDSPcv.notify_all();
-
 		m_esaiFrameIndex = 0;
 		m_maxEsaiCallbacks = std::numeric_limits<uint32_t>::max();
 		m_esaiLatency = 0;
 
+		for(uint32_t i=0; i<notifyCount; ++i)
+			m_haltDSPcv.notify_all();
+
+		m_dspB.terminate();
 		m_dspA.join();
+		m_dspB.terminate();
 		m_dspB.join();
 
-		// UC waits for ESAI to sync to DSPs and on HDI to read/write data
-		m_esaiFrameIndex = 1;
-		m_lastEsaiFrameIndex = 0;
-		for(uint32_t i=0; i<notifyCount; ++i)
-			m_esaiFrameAddedCv.notify_all();
-		while(m_dspA.getPeriph().getHDI08().hasTX())		m_dspA.getPeriph().getHDI08().readTX();
-		while(m_dspA.getPeriph().getHDI08().hasRXData())	m_dspA.getPeriph().getHDI08().readRX(dsp56k::Move_xx);
-		while(m_dspB.getPeriph().getHDI08().hasTX())		m_dspB.getPeriph().getHDI08().readTX();
-		while(m_dspB.getPeriph().getHDI08().hasRXData())	m_dspB.getPeriph().getHDI08().readRX(dsp56k::Move_xx);
-
 		m_ucThread->join();
 	}
 
@@ -301,6 +299,7 @@ namespace n2x
 			processUC();
 			processUC();
 		}
+		m_destroy = false;
 	}
 
 	void Hardware::advanceSamples(const uint32_t _samples, const uint32_t _latency)