Bläddra i källkod

Merge pull request #323 from FrankBoesing/master

add DMAMEM, fix warnings
dds
Paul Stoffregen 4 år sedan
förälder
incheckning
374b3fe12d
Inget konto är kopplat till bidragsgivarens mejladress
4 ändrade filer med 4 tillägg och 4 borttagningar
  1. +1
    -1
      input_i2s.cpp
  2. +1
    -1
      input_i2s2.cpp
  3. +1
    -1
      input_i2s_hex.cpp
  4. +1
    -1
      input_i2s_quad.cpp

+ 1
- 1
input_i2s.cpp Visa fil

@@ -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;

+ 1
- 1
input_i2s2.cpp Visa fil

@@ -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;

+ 1
- 1
input_i2s_hex.cpp Visa fil

@@ -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]);

+ 1
- 1
input_i2s_quad.cpp Visa fil

@@ -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]);

Laddar…
Avbryt
Spara