add DMAMEM, fix warnings

trailhead · Mar 21, 2020 · 31a3d57 · 31a3d57
1 parent bfcc6b0
commit 31a3d57
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/input_i2s.cpp b/input_i2s.cpp
@@ -30,7 +30,7 @@
 #include "input_i2s.h"
 #include "output_i2s.h"
 
-static uint32_t i2s_rx_buffer[AUDIO_BLOCK_SAMPLES];
+DMAMEM __attribute__((aligned(32))) static uint32_t i2s_rx_buffer[AUDIO_BLOCK_SAMPLES];
 audio_block_t * AudioInputI2S::block_left = NULL;
 audio_block_t * AudioInputI2S::block_right = NULL;
 uint16_t AudioInputI2S::block_offset = 0;

diff --git a/input_i2s2.cpp b/input_i2s2.cpp
@@ -30,7 +30,7 @@
 #include "input_i2s2.h"
 #include "output_i2s2.h"
 
-static uint32_t i2s2_rx_buffer[AUDIO_BLOCK_SAMPLES];
+DMAMEM __attribute__((aligned(32))) static uint32_t i2s2_rx_buffer[AUDIO_BLOCK_SAMPLES];
 audio_block_t * AudioInputI2S2::block_left = NULL;
 audio_block_t * AudioInputI2S2::block_right = NULL;
 uint16_t AudioInputI2S2::block_offset = 0;

diff --git a/input_i2s_hex.cpp b/input_i2s_hex.cpp
@@ -112,7 +112,7 @@ void AudioInputI2SHex::isr(void)
 	if (block_ch1) {
 		offset = block_offset;
 		if (offset <= AUDIO_BLOCK_SAMPLES/2) {
-			arm_dcache_delete(src, sizeof(i2s_rx_buffer) / 2);
+			arm_dcache_delete((void*)src, sizeof(i2s_rx_buffer) / 2);
 			block_offset = offset + AUDIO_BLOCK_SAMPLES/2;
 			dest1 = &(block_ch1->data[offset]);
 			dest2 = &(block_ch2->data[offset]);

diff --git a/input_i2s_quad.cpp b/input_i2s_quad.cpp
@@ -148,7 +148,7 @@ void AudioInputI2SQuad::isr(void)
 	if (block_ch1) {
 		offset = block_offset;
 		if (offset <= AUDIO_BLOCK_SAMPLES/2) {
-			arm_dcache_delete(src, sizeof(i2s_rx_buffer) / 2);
+			arm_dcache_delete((void*)src, sizeof(i2s_rx_buffer) / 2);
 			block_offset = offset + AUDIO_BLOCK_SAMPLES/2;
 			dest1 = &(block_ch1->data[offset]);
 			dest2 = &(block_ch2->data[offset]);