8 channel I2S output for Teensy 4.0

Audio.h

@@ -103,6 +103,7 @@
 #include "output_i2s2.h"
 #include "output_i2s_quad.h"
 #include "output_i2s_hex.h"
+#include "output_i2s_oct.h"
 #include "output_mqs.h"
 #include "output_pwm.h"
 #include "output_spdif.h"

keywords.txt

@@ -12,6 +12,7 @@ AudioOutputI2S	KEYWORD2
 AudioOutputI2S2	KEYWORD2
 AudioOutputI2SQuad	KEYWORD2
 AudioOutputI2SHex	KEYWORD2
+AudioOutputI2SOct	KEYWORD2
 AudioOutputI2Sslave	KEYWORD2
 AudioOutputSPDIF	KEYWORD2
 AudioOutputSPDIF2	KEYWORD2

output_i2s.h

@@ -43,6 +43,8 @@ public:
 	friend class AudioInputI2SQuad;
 	friend class AudioOutputI2SHex;
 	friend class AudioInputI2SHex;
+	friend class AudioOutputI2SOct;
+	friend class AudioInputI2SOct;
 #endif
 protected:
 	AudioOutputI2S(int dummy): AudioStream(2, inputQueueArray) {} // to be used only inside AudioOutputI2Sslave !!

output_i2s_oct.cpp

@@ -0,0 +1,419 @@
+/* Audio Library for Teensy 3.X
+ * Copyright (c) 2014, Paul Stoffregen, paul@pjrc.com
+ *
+ * Development of this audio library was funded by PJRC.COM, LLC by sales of
+ * Teensy and Audio Adaptor boards.  Please support PJRC's efforts to develop
+ * open source software by purchasing Teensy or other PJRC products.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, development funding notice, and this permission
+ * notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <Arduino.h>
+#include "output_i2s_oct.h"
+#include "output_i2s.h"
+#include "memcpy_audio.h"
+
+#if defined(__IMXRT1062__)
+#include "utility/imxrt_hw.h"
+
+audio_block_t * AudioOutputI2SOct::block_ch1_1st = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch2_1st = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch3_1st = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch4_1st = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch5_1st = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch6_1st = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch7_1st = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch8_1st = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch1_2nd = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch2_2nd = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch3_2nd = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch4_2nd = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch5_2nd = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch6_2nd = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch7_2nd = NULL;
+audio_block_t * AudioOutputI2SOct::block_ch8_2nd = NULL;
+uint16_t  AudioOutputI2SOct::ch1_offset = 0;
+uint16_t  AudioOutputI2SOct::ch2_offset = 0;
+uint16_t  AudioOutputI2SOct::ch3_offset = 0;
+uint16_t  AudioOutputI2SOct::ch4_offset = 0;
+uint16_t  AudioOutputI2SOct::ch5_offset = 0;
+uint16_t  AudioOutputI2SOct::ch6_offset = 0;
+uint16_t  AudioOutputI2SOct::ch7_offset = 0;
+uint16_t  AudioOutputI2SOct::ch8_offset = 0;
+bool AudioOutputI2SOct::update_responsibility = false;
+DMAMEM __attribute__((aligned(32))) static uint32_t i2s_tx_buffer[AUDIO_BLOCK_SAMPLES*4];
+DMAChannel AudioOutputI2SOct::dma(false);
+
+static const uint32_t zerodata[AUDIO_BLOCK_SAMPLES/4] = {0};
+
+void AudioOutputI2SOct::begin(void)
+{
+	dma.begin(true); // Allocate the DMA channel first
+
+	block_ch1_1st = NULL;
+	block_ch2_1st = NULL;
+	block_ch3_1st = NULL;
+	block_ch4_1st = NULL;
+	block_ch5_1st = NULL;
+	block_ch6_1st = NULL;
+
+	memset(i2s_tx_buffer, 0, sizeof(i2s_tx_buffer));
+	AudioOutputI2S::config_i2s();
+	I2S1_TCR3 = I2S_TCR3_TCE_4CH;
+	CORE_PIN7_CONFIG  = 3;
+	CORE_PIN32_CONFIG = 3;
+	CORE_PIN6_CONFIG  = 3;
+	CORE_PIN9_CONFIG  = 3;
+	dma.TCD->SADDR = i2s_tx_buffer;
+	dma.TCD->SOFF = 2;
+	dma.TCD->ATTR = DMA_TCD_ATTR_SSIZE(1) | DMA_TCD_ATTR_DSIZE(1);
+	dma.TCD->NBYTES_MLOFFYES = DMA_TCD_NBYTES_DMLOE |
+		DMA_TCD_NBYTES_MLOFFYES_MLOFF(-16) |
+		DMA_TCD_NBYTES_MLOFFYES_NBYTES(8);
+	dma.TCD->SLAST = -sizeof(i2s_tx_buffer);
+	dma.TCD->DADDR = (void *)((uint32_t)&I2S1_TDR0 + 2);
+	dma.TCD->DOFF = 4;
+	dma.TCD->CITER_ELINKNO = AUDIO_BLOCK_SAMPLES * 2;
+	dma.TCD->DLASTSGA = -16;
+	dma.TCD->BITER_ELINKNO = AUDIO_BLOCK_SAMPLES * 2;
+	dma.TCD->CSR = DMA_TCD_CSR_INTHALF | DMA_TCD_CSR_INTMAJOR;
+	dma.triggerAtHardwareEvent(DMAMUX_SOURCE_SAI1_TX);
+	dma.enable();
+	I2S1_RCSR |= I2S_RCSR_RE | I2S_RCSR_BCE;
+	I2S1_TCSR = I2S_TCSR_TE | I2S_TCSR_BCE | I2S_TCSR_FRDE;
+	//I2S1_TCR3 = I2S_TCR3_TCE_4CH;
+	update_responsibility = update_setup();
+	dma.attachInterrupt(isr);
+}
+
+void AudioOutputI2SOct::isr(void)
+{
+	uint32_t saddr;
+	const int16_t *src1, *src2, *src3, *src4, *src5, *src6, *src7, *src8;
+	const int16_t *zeros = (const int16_t *)zerodata;
+	int16_t *dest;
+
+	saddr = (uint32_t)(dma.TCD->SADDR);
+	dma.clearInterrupt();
+	if (saddr < (uint32_t)i2s_tx_buffer + sizeof(i2s_tx_buffer) / 2) {
+		// DMA is transmitting the first half of the buffer
+		// so we must fill the second half
+		dest = (int16_t *)((uint32_t)i2s_tx_buffer + sizeof(i2s_tx_buffer) / 2);
+		if (update_responsibility) update_all();
+	} else {
+		dest = (int16_t *)i2s_tx_buffer;
+	}
+
+	src1 = (block_ch1_1st) ? block_ch1_1st->data + ch1_offset : zeros;
+	src2 = (block_ch2_1st) ? block_ch2_1st->data + ch2_offset : zeros;
+	src3 = (block_ch3_1st) ? block_ch3_1st->data + ch3_offset : zeros;
+	src4 = (block_ch4_1st) ? block_ch4_1st->data + ch4_offset : zeros;
+	src5 = (block_ch5_1st) ? block_ch5_1st->data + ch5_offset : zeros;
+	src6 = (block_ch6_1st) ? block_ch6_1st->data + ch6_offset : zeros;
+	src7 = (block_ch7_1st) ? block_ch7_1st->data + ch7_offset : zeros;
+	src8 = (block_ch8_1st) ? block_ch8_1st->data + ch8_offset : zeros;
+#if 0
+	// TODO: optimized 8 channel copy...
+	memcpy_tointerleaveQuad(dest, src1, src2, src3, src4);
+#else
+	int16_t *p=dest;
+	for (int i=0; i < AUDIO_BLOCK_SAMPLES/2; i++) {
+		*p++ = *src1++;
+		*p++ = *src3++;
+		*p++ = *src5++;
+		*p++ = *src7++;
+		*p++ = *src2++;
+		*p++ = *src4++;
+		*p++ = *src6++;
+		*p++ = *src8++;
+	}
+#endif
+	arm_dcache_flush_delete(dest, sizeof(i2s_tx_buffer) / 2);
+
+	if (block_ch1_1st) {
+		if (ch1_offset == 0) {
+			ch1_offset = AUDIO_BLOCK_SAMPLES/2;
+		} else {
+			ch1_offset = 0;
+			release(block_ch1_1st);
+			block_ch1_1st = block_ch1_2nd;
+			block_ch1_2nd = NULL;
+		}
+	}
+	if (block_ch2_1st) {
+		if (ch2_offset == 0) {
+			ch2_offset = AUDIO_BLOCK_SAMPLES/2;
+		} else {
+			ch2_offset = 0;
+			release(block_ch2_1st);
+			block_ch2_1st = block_ch2_2nd;
+			block_ch2_2nd = NULL;
+		}
+	}
+	if (block_ch3_1st) {
+		if (ch3_offset == 0) {
+			ch3_offset = AUDIO_BLOCK_SAMPLES/2;
+		} else {
+			ch3_offset = 0;
+			release(block_ch3_1st);
+			block_ch3_1st = block_ch3_2nd;
+			block_ch3_2nd = NULL;
+		}
+	}
+	if (block_ch4_1st) {
+		if (ch4_offset == 0) {
+			ch4_offset = AUDIO_BLOCK_SAMPLES/2;
+		} else {
+			ch4_offset = 0;
+			release(block_ch4_1st);
+			block_ch4_1st = block_ch4_2nd;
+			block_ch4_2nd = NULL;
+		}
+	}
+	if (block_ch5_1st) {
+		if (ch5_offset == 0) {
+			ch5_offset = AUDIO_BLOCK_SAMPLES/2;
+		} else {
+			ch5_offset = 0;
+			release(block_ch5_1st);
+			block_ch5_1st = block_ch5_2nd;
+			block_ch5_2nd = NULL;
+		}
+	}
+	if (block_ch6_1st) {
+		if (ch6_offset == 0) {
+			ch6_offset = AUDIO_BLOCK_SAMPLES/2;
+		} else {
+			ch6_offset = 0;
+			release(block_ch6_1st);
+			block_ch6_1st = block_ch6_2nd;
+			block_ch6_2nd = NULL;
+		}
+	}
+	if (block_ch7_1st) {
+		if (ch7_offset == 0) {
+			ch7_offset = AUDIO_BLOCK_SAMPLES/2;
+		} else {
+			ch7_offset = 0;
+			release(block_ch7_1st);
+			block_ch7_1st = block_ch7_2nd;
+			block_ch7_2nd = NULL;
+		}
+	}
+	if (block_ch8_1st) {
+		if (ch8_offset == 0) {
+			ch8_offset = AUDIO_BLOCK_SAMPLES/2;
+		} else {
+			ch8_offset = 0;
+			release(block_ch8_1st);
+			block_ch8_1st = block_ch8_2nd;
+			block_ch8_2nd = NULL;
+		}
+	}
+}
+
+
+void AudioOutputI2SOct::update(void)
+{
+	audio_block_t *block, *tmp;
+
+	block = receiveReadOnly(0); // channel 1
+	if (block) {
+		__disable_irq();
+		if (block_ch1_1st == NULL) {
+			block_ch1_1st = block;
+			ch1_offset = 0;
+			__enable_irq();
+		} else if (block_ch1_2nd == NULL) {
+			block_ch1_2nd = block;
+			__enable_irq();
+		} else {
+			tmp = block_ch1_1st;
+			block_ch1_1st = block_ch1_2nd;
+			block_ch1_2nd = block;
+			ch1_offset = 0;
+			__enable_irq();
+			release(tmp);
+		}
+	}
+	block = receiveReadOnly(1); // channel 2
+	if (block) {
+		__disable_irq();
+		if (block_ch2_1st == NULL) {
+			block_ch2_1st = block;
+			ch2_offset = 0;
+			__enable_irq();
+		} else if (block_ch2_2nd == NULL) {
+			block_ch2_2nd = block;
+			__enable_irq();
+		} else {
+			tmp = block_ch2_1st;
+			block_ch2_1st = block_ch2_2nd;
+			block_ch2_2nd = block;
+			ch2_offset = 0;
+			__enable_irq();
+			release(tmp);
+		}
+	}
+	block = receiveReadOnly(2); // channel 3
+	if (block) {
+		__disable_irq();
+		if (block_ch3_1st == NULL) {
+			block_ch3_1st = block;
+			ch3_offset = 0;
+			__enable_irq();
+		} else if (block_ch3_2nd == NULL) {
+			block_ch3_2nd = block;
+			__enable_irq();
+		} else {
+			tmp = block_ch3_1st;
+			block_ch3_1st = block_ch3_2nd;
+			block_ch3_2nd = block;
+			ch3_offset = 0;
+			__enable_irq();
+			release(tmp);
+		}
+	}
+	block = receiveReadOnly(3); // channel 4
+	if (block) {
+		__disable_irq();
+		if (block_ch4_1st == NULL) {
+			block_ch4_1st = block;
+			ch4_offset = 0;
+			__enable_irq();
+		} else if (block_ch4_2nd == NULL) {
+			block_ch4_2nd = block;
+			__enable_irq();
+		} else {
+			tmp = block_ch4_1st;
+			block_ch4_1st = block_ch4_2nd;
+			block_ch4_2nd = block;
+			ch4_offset = 0;
+			__enable_irq();
+			release(tmp);
+		}
+	}
+	block = receiveReadOnly(4); // channel 5
+	if (block) {
+		__disable_irq();
+		if (block_ch5_1st == NULL) {
+			block_ch5_1st = block;
+			ch5_offset = 0;
+			__enable_irq();
+		} else if (block_ch5_2nd == NULL) {
+			block_ch5_2nd = block;
+			__enable_irq();
+		} else {
+			tmp = block_ch5_1st;
+			block_ch5_1st = block_ch5_2nd;
+			block_ch5_2nd = block;
+			ch5_offset = 0;
+			__enable_irq();
+			release(tmp);
+		}
+	}
+	block = receiveReadOnly(5); // channel 6
+	if (block) {
+		__disable_irq();
+		if (block_ch6_1st == NULL) {
+			block_ch6_1st = block;
+			ch6_offset = 0;
+			__enable_irq();
+		} else if (block_ch6_2nd == NULL) {
+			block_ch6_2nd = block;
+			__enable_irq();
+		} else {
+			tmp = block_ch6_1st;
+			block_ch6_1st = block_ch6_2nd;
+			block_ch6_2nd = block;
+			ch6_offset = 0;
+			__enable_irq();
+			release(tmp);
+		}
+	}
+	block = receiveReadOnly(6); // channel 7
+	if (block) {
+		__disable_irq();
+		if (block_ch7_1st == NULL) {
+			block_ch7_1st = block;
+			ch7_offset = 0;
+			__enable_irq();
+		} else if (block_ch7_2nd == NULL) {
+			block_ch7_2nd = block;
+			__enable_irq();
+		} else {
+			tmp = block_ch7_1st;
+			block_ch7_1st = block_ch7_2nd;
+			block_ch7_2nd = block;
+			ch7_offset = 0;
+			__enable_irq();
+			release(tmp);
+		}
+	}
+	block = receiveReadOnly(7); // channel 8
+	if (block) {
+		__disable_irq();
+		if (block_ch8_1st == NULL) {
+			block_ch8_1st = block;
+			ch8_offset = 0;
+			__enable_irq();
+		} else if (block_ch8_2nd == NULL) {
+			block_ch8_2nd = block;
+			__enable_irq();
+		} else {
+			tmp = block_ch8_1st;
+			block_ch8_1st = block_ch8_2nd;
+			block_ch8_2nd = block;
+			ch8_offset = 0;
+			__enable_irq();
+			release(tmp);
+		}
+	}
+}
+
+
+#else // not supported
+
+void AudioOutputI2SOct::begin(void)
+{
+}
+
+void AudioOutputI2SOct::update(void)
+{
+	audio_block_t *block;
+
+	block = receiveReadOnly(0);
+	if (block) release(block);
+	block = receiveReadOnly(1);
+	if (block) release(block);
+	block = receiveReadOnly(2);
+	if (block) release(block);
+	block = receiveReadOnly(3);
+	if (block) release(block);
+	block = receiveReadOnly(4);
+	if (block) release(block);
+	block = receiveReadOnly(5);
+	if (block) release(block);
+	block = receiveReadOnly(6);
+	if (block) release(block);
+	block = receiveReadOnly(7);
+	if (block) release(block);
+}
+
+#endif

output_i2s_oct.h

@@ -0,0 +1,71 @@
+/* Audio Library for Teensy 3.X
+ * Copyright (c) 2014, Paul Stoffregen, paul@pjrc.com
+ *
+ * Development of this audio library was funded by PJRC.COM, LLC by sales of
+ * Teensy and Audio Adaptor boards.  Please support PJRC's efforts to develop
+ * open source software by purchasing Teensy or other PJRC products.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice, development funding notice, and this permission
+ * notice shall be included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef output_i2s_oct_h_
+#define output_i2s_oct_h_
+
+#include "Arduino.h"
+#include "AudioStream.h"
+#include "DMAChannel.h"
+
+class AudioOutputI2SOct : public AudioStream
+{
+public:
+	AudioOutputI2SOct(void) : AudioStream(8, inputQueueArray) { begin(); }
+	virtual void update(void);
+	void begin(void);
+private:
+	static audio_block_t *block_ch1_1st;
+	static audio_block_t *block_ch2_1st;
+	static audio_block_t *block_ch3_1st;
+	static audio_block_t *block_ch4_1st;
+	static audio_block_t *block_ch5_1st;
+	static audio_block_t *block_ch6_1st;
+	static audio_block_t *block_ch7_1st;
+	static audio_block_t *block_ch8_1st;
+	static bool update_responsibility;
+	static DMAChannel dma;
+	static void isr(void);
+	static audio_block_t *block_ch1_2nd;
+	static audio_block_t *block_ch2_2nd;
+	static audio_block_t *block_ch3_2nd;
+	static audio_block_t *block_ch4_2nd;
+	static audio_block_t *block_ch5_2nd;
+	static audio_block_t *block_ch6_2nd;
+	static audio_block_t *block_ch7_2nd;
+	static audio_block_t *block_ch8_2nd;
+	static uint16_t ch1_offset;
+	static uint16_t ch2_offset;
+	static uint16_t ch3_offset;
+	static uint16_t ch4_offset;
+	static uint16_t ch5_offset;
+	static uint16_t ch6_offset;
+	static uint16_t ch7_offset;
+	static uint16_t ch8_offset;
+	audio_block_t *inputQueueArray[8];
+};
+
+#endif