diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-06-05 21:08:03 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-06-05 21:08:22 +0200 |
| commit | 8618657695b2530f463d1e7e0fca11304d2b897e (patch) | |
| tree | 1f183912e438599ef7abdc0e188c48a3da30d56d /src/common | |
| parent | ba105ccbf7c350e24ee527472a99e3672983e93d (diff) | |
| download | glutte-o-matic-8618657695b2530f463d1e7e0fca11304d2b897e.tar.gz glutte-o-matic-8618657695b2530f463d1e7e0fca11304d2b897e.tar.bz2 glutte-o-matic-8618657695b2530f463d1e7e0fca11304d2b897e.zip | |
Make object for common/Audio
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/includes/Audio/audio.h | 12 | ||||
| -rw-r--r-- | src/common/sourcelist.txt | 2 | ||||
| -rw-r--r-- | src/common/src/Audio/audio.c | 18 |
3 files changed, 20 insertions, 12 deletions
diff --git a/src/common/includes/Audio/audio.h b/src/common/includes/Audio/audio.h index 006f82e..6531879 100644 --- a/src/common/includes/Audio/audio.h +++ b/src/common/includes/Audio/audio.h @@ -6,6 +6,18 @@ typedef void AudioCallbackFunction(void *context,int buffer); +// Variables used by both glutt-o-logique and simulator +extern AudioCallbackFunction *callback_function; +extern void *callback_context; +extern int16_t *next_buffer_samples; +extern int next_buffer_length; +extern int buffer_number; +extern bool dma_running; + +void audio_initialize_platform(int plln, int pllr, int i2sdiv, int i2sodd, int rate); +void audio_start_dma_and_request_buffers(); +void audio_stop_dma(); + #define Audio8000HzSettings 256,5,12,1,8000 #define Audio16000HzSettings 213,2,13,0,16000 #define Audio32000HzSettings 213,2,6,1,32000 diff --git a/src/common/sourcelist.txt b/src/common/sourcelist.txt index 97cb298..4c85b65 100644 --- a/src/common/sourcelist.txt +++ b/src/common/sourcelist.txt @@ -1,3 +1,5 @@ src/GPIO/usart.c src/GPS/gps.c src/Core/common.c +src/Audio/cw.c +src/Audio/audio.c diff --git a/src/common/src/Audio/audio.c b/src/common/src/Audio/audio.c index 40f0e76..f68f867 100644 --- a/src/common/src/Audio/audio.c +++ b/src/common/src/Audio/audio.c @@ -26,18 +26,12 @@ #include <stdlib.h> -static void audio_write_register(uint8_t address, uint8_t value); -static void audio_start_dma_and_request_buffers(); -static void audio_stop_dma(); - -static AudioCallbackFunction *callback_function; -static void *callback_context; -static int16_t * volatile next_buffer_samples; -static volatile int next_buffer_length; -static volatile int buffer_number; -static volatile bool dma_running; - -void audio_initialize_platform(int plln, int pllr, int i2sdiv, int i2sodd, int rate); +AudioCallbackFunction *callback_function; +void *callback_context; +int16_t * next_buffer_samples; +int next_buffer_length; +int buffer_number; +bool dma_running; void audio_initialize(int plln, int pllr, int i2sdiv, int i2sodd, int rate) { |