Browse Source

Merge pull request #319 from FrankBoesing/progmem

PROGMEM -> FLASHMEM
dds
Paul Stoffregen 4 years ago
parent
commit
722fa3d2ab
No account linked to committer's email address
4 changed files with 7 additions and 7 deletions
  1. +2
    -2
      output_pt8211_2.cpp
  2. +2
    -2
      output_spdif.cpp
  3. +2
    -2
      output_spdif2.cpp
  4. +1
    -1
      utility/imxrt_hw.cpp

+ 2
- 2
output_pt8211_2.cpp View File

@@ -46,7 +46,7 @@ bool AudioOutputPT8211_2::update_responsibility = false;
#endif
DMAChannel AudioOutputPT8211_2::dma(false);

PROGMEM
FLASHMEM
void AudioOutputPT8211_2::begin(void)
{
dma.begin(true); // Allocate the DMA channel first
@@ -378,7 +378,7 @@ void AudioOutputPT8211_2::update(void)
}
}

PROGMEM
FLASHMEM
void AudioOutputPT8211_2::config_i2s(void)
{


+ 2
- 2
output_spdif.cpp View File

@@ -53,7 +53,7 @@ uint32_t AudioOutputSPDIF::vucp = VUCP_VALID;

#endif

PROGMEM
FLASHMEM
void AudioOutputSPDIF::begin(void)
{

@@ -354,7 +354,7 @@ void AudioOutputSPDIF::update(void)
#endif
#endif

PROGMEM
FLASHMEM
void AudioOutputSPDIF::config_SPDIF(void)
{
#if defined(KINETISK)

+ 2
- 2
output_spdif2.cpp View File

@@ -51,7 +51,7 @@ static uint32_t SPDIF_tx_buffer[AUDIO_BLOCK_SAMPLES * 4]; //2 KB

uint32_t AudioOutputSPDIF2::vucp = VUCP_VALID;

PROGMEM
FLASHMEM
void AudioOutputSPDIF2::begin(void)
{

@@ -269,7 +269,7 @@ void AudioOutputSPDIF2::update(void)

}

PROGMEM
FLASHMEM
void AudioOutputSPDIF2::config_SPDIF(void)
{
CCM_CCGR5 |= CCM_CCGR5_SAI2(CCM_CCGR_ON);

+ 1
- 1
utility/imxrt_hw.cpp View File

@@ -30,7 +30,7 @@
#if defined(__IMXRT1052__) || defined(__IMXRT1062__)
#include "imxrt_hw.h"

PROGMEM
FLASHMEM
void set_audioClock(int nfact, int32_t nmult, uint32_t ndiv, bool force) // sets PLL4
{
if (!force && (CCM_ANALOG_PLL_AUDIO & CCM_ANALOG_PLL_AUDIO_ENABLE)) return;

Loading…
Cancel
Save