Remove unused audio functions

4 files changed, 1 insertions, 74 deletions

diff --git a/src/common/includes/Audio/audio.h b/src/common/includes/Audio/audio.h
index a3c70fd..41a8080 100644
--- a/src/common/includes/Audio/audio.h
+++ b/src/common/includes/Audio/audio.h
@@ -37,16 +37,10 @@ void audio_initialize(int plln,int pllr,int i2sdiv,int i2sodd, int rate);
 // Power up and down the audio hardware.
 void audio_put_codec_in_reset(void);
 void audio_reinit_codec(void);
-void audio_on(void);
-void audio_off(void);
 
 // Set audio volume in steps of 0.5 dB. 0xff is +12 dB.
 void audio_set_volume(int volume);
 
-// Output one audio sample directly to the hardware without using DMA.
-void audio_output_sample(int16_t sample);
-void audio_output_sample_without_blocking(int16_t sample);
-
 // Start and stop audio playback using DMA.
 // Callback is optional, and called whenever a new buffer is needed.
 void audio_play_with_callback(AudioCallbackFunction *callback,void *context);
@@ -58,7 +52,6 @@ void audio_stop(void);
 // invocation.
 // Buffers must reside in DMA1-accessible memory, that is, the 128k RAM bank,
 // or flash.
-void audio_provide_buffer(void *samples,int numsamples);
 bool audio_provide_buffer_without_blocking(void *samples,int numsamples);
 
 void DMA1_Stream7_IRQHandler(void);
diff --git a/src/glutt-o-logique/audio.c b/src/glutt-o-logique/audio.c
index 767970a..7c0c204 100644
--- a/src/glutt-o-logique/audio.c
+++ b/src/glutt-o-logique/audio.c
@@ -115,6 +115,7 @@ void audio_reinit_codec(void) {
 
     // Power on the codec.
     audio_write_register(0x02, 0x9e);
+    // Powering the codec off can be done be writing (0x02, 0x9e)
 
     // Configure codec for fast shutdown.
     audio_write_register(0x0a, 0x00); // Disable the analog soft ramp.
@@ -127,33 +128,11 @@ void audio_reinit_codec(void) {
     audio_write_register(0x1b, 0x0a);
 }
 
-void audio_on() {
-    audio_write_register(0x02, 0x9e);
-    SPI3 ->I2SCFGR = SPI_I2SCFGR_I2SMOD | SPI_I2SCFGR_I2SCFG_1
-        | SPI_I2SCFGR_I2SE; // Master transmitter, Phillips mode, 16 bit values, clock polarity low, enable.
-}
-
-void audio_off() {
-    audio_write_register(0x02, 0x9f);
-    SPI3 ->I2SCFGR = 0;
-}
-
 void audio_set_volume(int volume) {
     audio_write_register(0x20, (volume + 0x19) & 0xff);
     audio_write_register(0x21, (volume + 0x19) & 0xff);
 }
 
-void audio_output_sample(int16_t sample) {
-    while (!(SPI3 ->SR & SPI_SR_TXE ))
-        ;
-    SPI3 ->DR = sample;
-}
-
-
-void audio_output_sample_without_blocking(int16_t sample) {
-    SPI3 ->DR = sample;
-}
-
 void audio_play_with_callback(AudioCallbackFunction *callback, void *context) {
     audio_stop_dma();
 
@@ -177,11 +156,6 @@ void audio_stop() {
     callback_function = (AudioCallbackFunction*)0;
 }
 
-void audio_provide_buffer(void *samples, int numsamples) {
-    while (!audio_provide_buffer_without_blocking(samples, numsamples))
-        __asm__ volatile ("wfi");
-}
-
 bool audio_provide_buffer_without_blocking(void *samples, int numsamples) {
     if (next_buffer_samples)
         return false;
diff --git a/src/simulator/src/Audio/audio.c b/src/simulator/src/Audio/audio.c
index 851b1d9..c51e457 100644
--- a/src/simulator/src/Audio/audio.c
+++ b/src/simulator/src/Audio/audio.c
@@ -36,8 +36,6 @@ int16_t * current_buffer_samples;
 static void audio_buffer_sent(void);
 static void audio_buffer_sender(void *args);
 
-extern char gui_audio_on;
-
 void audio_initialize_platform(int __attribute__ ((unused))plln, int __attribute__ ((unused))pllr, int __attribute__ ((unused))i2sdiv, int __attribute__ ((unused))i2sodd, int rate) {
 
     int error;
@@ -96,14 +94,6 @@ static void audio_buffer_sent() {
 
 }
 
-void audio_on() {
-    gui_audio_on = 1;
-}
-
-void audio_off() {
-    gui_audio_on = 0;
-}
-
 void audio_set_volume(int __attribute__ ((unused))volume) {
 }
 
@@ -127,11 +117,6 @@ void audio_stop() {
     callback_function = NULL;
 }
 
-void audio_provide_buffer(void *samples, int numsamples) {
-    while (!audio_provide_buffer_without_blocking(samples, numsamples))
-        __asm__ volatile ("nop");
-}
-
 bool audio_provide_buffer_without_blocking(void *samples, int numsamples) {
     if (next_buffer_samples)
         return false;
diff --git a/src/simulator/src/Gui/gui.c b/src/simulator/src/Gui/gui.c
index 2e5c3f0..adf281a 100644
--- a/src/simulator/src/Gui/gui.c
+++ b/src/simulator/src/Gui/gui.c
@@ -124,7 +124,6 @@ int gui_gps_custom_year_len = 2;
 /**
  * Audio
  **/
-char gui_audio_on = 0;
 char gui_cw_text[4096];
 
 
@@ -533,30 +532,6 @@ void main_gui() {
             }
             nk_end(ctx);
 
-            if (nk_begin(ctx, &layout, "Audio", nk_rect(210, 390, 100, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
-
-                nk_layout_row_static(ctx, 20, 20, 3);
-
-                struct nk_color color;
-
-                nk_text(ctx, "", 0, NK_TEXT_LEFT);
-                nk_text(ctx, "", 0, NK_TEXT_LEFT);
-                nk_text(ctx, "", 0, NK_TEXT_LEFT);
-
-                nk_text(ctx, "", 0, NK_TEXT_LEFT);
-
-                color.r = 255; color.g = 255; color.b = 0; color.a = 255;
-
-                if (gui_audio_on == 1) {
-                    color.r = 0;
-                } else {
-                    color.g = 0;
-                }
-                nk_button_color(ctx, color, NK_BUTTON_DEFAULT);
-            }
-            nk_end(ctx);
-
-
             if (nk_begin(ctx, &layout, "CW", nk_rect(320, 390, 180, 155), NK_WINDOW_BORDER|NK_WINDOW_MOVABLE|NK_WINDOW_SCALABLE|NK_WINDOW_MINIMIZABLE|NK_WINDOW_TITLE)) {
 
                 nk_menubar_begin(ctx);