Merge remote-tracking branch 'henrix/dev-kernel-4.4.y-xenomai-3-suppo…

…rt' into dev still using OUR pru_rtaudio.p.
BelaPlatform · Dec 20, 2017 · a98e51c · a98e51c
2 parents 8d0196c + d323c5e
commit a98e51c
Show file tree

Hide file tree

Showing 5 changed files with 139 additions and 93 deletions.
diff --git a/core/PRU.cpp b/core/PRU.cpp
@@ -14,12 +14,12 @@
  */
 
 #include "../include/PRU.h"
+#include "../include/PruBinary.h"
 #include "../include/prussdrv.h"
 #include "../include/pruss_intc_mapping.h"
 #include "../include/digital_gpio_mapping.h"
 #include "../include/GPIOcontrol.h"
 #include "../include/Bela.h"
-#include "../include/pru_rtaudio_bin.h"
 #include "../include/Gpio.h"
 #include "../include/Utilities.h"
 
@@ -41,7 +41,6 @@
 
 #if (defined(CTAGE_FACE_8CH) || defined(CTAG_FACE_16CH))
 	#define PRU_USES_MCASP_IRQ
-	#error TODO: load different PRU code
 #endif
 
 #if !(defined(BELA_USE_POLL) || defined(BELA_USE_RTDM))
@@ -711,6 +710,12 @@ int PRU::start(char * const filename)
 	pru_buffer_comm = pruMemory->getPruBufferComm();
 	initialisePruCommon();
 
+#ifdef PRU_USES_MCASP_IRQ
+	const unsigned int* PRUcode = IrqPruCode::getBinary();
+#else /* PRU_USES_MCASP_IRQ */
+	const unsigned int* PRUcode = NonIrqPruCode::getBinary();
+#endif /* PRU_USES_MCASP_IRQ */
+
 	/* Load and execute binary on PRU */
 	if(filename[0] == '\0') { //if the string is empty, load the embedded code
 		if(gRTAudioVerbose)
@@ -841,13 +846,7 @@ void PRU::loop(void *userData, void(*render)(BelaContext*, void*), bool highPerf
 		int16_to_float_audio(2 * context->audioFrames, audio_adc_pru_buffer, context->audioIn);
 		// TODO: implement non-interlaved
 #else
-
-#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
-		//TODO: @henrix: what is this about?
-		int audioInChannels = context->audioInChannels > 8 ? 8 : context->audioInChannels;
-#else 
 		int audioInChannels = context->audioInChannels;
-#endif /* defined CTAG */
 		if(interleaved)
 		{
 			for(unsigned int n = 0; n < audioInChannels * context->audioFrames; n++) {

diff --git a/core/RTAudio.cpp b/core/RTAudio.cpp
@@ -72,10 +72,7 @@ int gXenomaiInited = 0;
 static const char gRTAudioThreadName[] = "bela-audio";
 
 PRU *gPRU = 0;
-#ifdef CTAG_FACE_8CH
-	Spi_Codec *gAudioCodec = 0;
-	I2c_Codec *gNotUsedCodec = 0;
-#elif defined(CTAG_BEAST_16CH)
+#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
 	Spi_Codec *gAudioCodec = 0;
 	I2c_Codec *gNotUsedCodec = 0;
 #else
@@ -235,9 +232,7 @@ int Bela_initAudio(BelaInitSettings *settings, void *userData)
 	}
 
 	// Initialise the rendering environment: sample rates, frame counts, numbers of channels
-	#ifdef CTAG_FACE_8CH
-		gContext.audioSampleRate = 48000.0;
-	#elif defined(CTAG_BEAST_16CH)
+	#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
 		gContext.audioSampleRate = 48000.0;
 	#else
 		gContext.audioSampleRate = 44100.0;
@@ -316,14 +311,10 @@ int Bela_initAudio(BelaInitSettings *settings, void *userData)
 
 	// Use PRU for audio
 	gPRU = new PRU(&gContext);
-	#ifdef CTAG_FACE_8CH
+	#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
 		gNotUsedCodec = new I2c_Codec();
 		gNotUsedCodec->disable(); // Put not used codec in high impedance state
 		gAudioCodec = new Spi_Codec();
-	#elif defined(CTAG_BEAST_16CH)
-		gNotUsedCodec = new I2c_Codec();
-		gNotUsedCodec->disable();
-		gAudioCodec = new Spi_Codec();
 	#else
 		gAudioCodec = new I2c_Codec();
 	#endif
@@ -348,10 +339,7 @@ int Bela_initAudio(BelaInitSettings *settings, void *userData)
 		return 1;
 	}
 
-	#ifdef CTAG_FACE_8CH
-		gAudioCodec->initCodec();
-		//gAudioCodec->dumpRegisters();
-	#elif defined(CTAG_BEAST_16CH)
+	#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
 		gAudioCodec->initCodec();
 		//gAudioCodec->dumpRegisters();
 	#else
@@ -591,8 +579,7 @@ int Bela_setADCLevel(float decibels)
 {
 
 // AD1938 audio codec has no ADC volume controls
-#ifdef CTAG_FACE_8CH
-#elif defined(CTAG_BEAST_16CH)
+#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
 #else
 	if(gAudioCodec == 0)
 		return -1;
@@ -606,8 +593,7 @@ int Bela_setADCLevel(float decibels)
 // 59.5dB is maximum, 0dB is minimum; 0.5dB steps
 int Bela_setPgaGain(float decibels, int channel){
 //Nothing to be done for CTAG audio cards
-#ifdef CTAG_FACE_8CH
-#elif defined(CTAG_BEAST_16CH)
+#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
 #else
 	if(gAudioCodec == 0)
 		return -1;
@@ -623,8 +609,7 @@ int Bela_setPgaGain(float decibels, int channel){
 int Bela_setHeadphoneLevel(float decibels)
 {
 //Nothing to be done for CTAG audio cards
-#ifdef CTAG_FACE_8CH
-#elif defined(CTAG_BEAST_16CH)
+#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
 #else
 	if(gAudioCodec == 0)
 		return -1;
@@ -639,10 +624,7 @@ int Bela_setHeadphoneLevel(float decibels)
 int Bela_muteSpeakers(int mute)
 {
 //Nothing to be done for CTAG audio cards
-#ifdef CTAG_FACE_8CH
-	return 0;
-#elif defined(CTAG_BEAST_16CH)
-	//TODO: Implement for both AD1938 codecs
+#if defined(CTAG_FACE_8CH) || defined(CTAG_BEAST_16CH)
 	return 0;
 #else
 	int pinValue = mute ? LOW : HIGH;