3 files changed, 11 insertions, 11 deletions

diff --git a/apps/recorder/pcm_record.c b/apps/recorder/pcm_record.c
index da4e9b7255..dbbc6901ec 100644
--- a/apps/recorder/pcm_record.c
+++ b/apps/recorder/pcm_record.c
@@ -24,7 +24,7 @@
 #include "logf.h"
 #include "thread.h"
 #include <string.h>
-#include "ata.h"
+#include "storage.h"
 #include "usb.h"
 #include "buffer.h"
 #include "general.h"
@@ -162,7 +162,7 @@ static bool           pcm_buffer_empty; /* all pcm chunks processed?       */
 static int            low_watermark;   /* Low watermark to stop flush      */
 static int            high_watermark;  /* max chunk limit for data flush   */
 static unsigned long  spinup_time = 35*HZ/10;  /* Fudged spinup time       */
-static int            last_ata_spinup_time = -1;/* previous spin time used */
+static int            last_storage_spinup_time = -1;/* previous spin time used */
 #ifdef HAVE_PRIORITY_SCHEDULING
 static int            flood_watermark; /* boost thread priority when here  */
 #endif
@@ -731,7 +731,7 @@ static void pcmrec_end_file(void)
  */
 static void pcmrec_refresh_watermarks(void)
 {
-    logf("ata spinup: %d", ata_spinup_time);
+    logf("ata spinup: %d", storage_spinup_time());
 
     /* set the low mark for when flushing stops if automatic */
     low_watermark = (LOW_SECONDS*4*sample_rate + (enc_chunk_size-1))
@@ -755,7 +755,7 @@ static void pcmrec_refresh_watermarks(void)
 
     logf("flood at: %d", flood_watermark);
 #endif
-    spinup_time = last_ata_spinup_time = ata_spinup_time;
+    spinup_time = last_storage_spinup_time = storage_spinup_time();
 
     /* write at 8s + st remaining in enc_buffer - range 12s to
        20s total - default to 3.5s spinup. */
@@ -816,7 +816,7 @@ static void pcmrec_flush(unsigned flush_num)
         if (!is_recording)
             return;
 
-        if (ata_spinup_time != last_ata_spinup_time)
+        if (storage_spinup_time() != last_storage_spinup_time)
             pcmrec_refresh_watermarks();
 
         /* enough available? no? then leave */
diff --git a/apps/recorder/peakmeter.c b/apps/recorder/peakmeter.c
index ce0974a084..422b138020 100644
--- a/apps/recorder/peakmeter.c
+++ b/apps/recorder/peakmeter.c
@@ -26,7 +26,7 @@
 #include "thread.h"
 #include "kernel.h"
 #include "settings.h"
-#include "ata.h"
+#include "storage.h"
 #include "lcd.h"
 #include "scrollbar.h"
 #include "gwps.h"
@@ -1343,7 +1343,7 @@ int peak_meter_draw_get_btn(int action_context, int x[], int y[],
      * is active, it must not draw too much CPU power or a buffer overrun can
      * happen when saving a recording. As a compromise, poll only once per tick
      * when the disk is active, otherwise spin around as fast as possible. */
-    bool highperf = !ata_disk_is_active();
+    bool highperf = !storage_disk_is_active();
 #endif
     bool dopeek = true;
 
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c
index d29db390c7..5a2aa096db 100644
--- a/apps/recorder/recording.c
+++ b/apps/recorder/recording.c
@@ -65,7 +65,7 @@
 #include "errno.h"
 #include "talk.h"
 #include "sound.h"
-#include "ata.h"
+#include "storage.h"
 #include "splash.h"
 #include "screen_access.h"
 #include "action.h"
@@ -298,7 +298,7 @@ static bool read_peak_levels(int *peak_l, int *peak_r, int *balance)
     peak_valid_mem[peak_time % 3] = *peak_l;
     if (((peak_valid_mem[0] == peak_valid_mem[1]) &&
          (peak_valid_mem[1] == peak_valid_mem[2])) &&
-        ((*peak_l < 32767) || ata_disk_is_active()))
+        ((*peak_l < 32767) || storage_disk_is_active()))
             return false;
 
     if (*peak_r > *peak_l)
@@ -1034,7 +1034,7 @@ bool recording_screen(bool no_source)
     rec_status = RCSTAT_IN_RECSCREEN;
 
 #if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR)
-    ata_set_led_enabled(false);
+    storage_set_led_enabled(false);
 #endif
 
 #if CONFIG_CODEC == SWCODEC
@@ -1905,7 +1905,7 @@ rec_abort:
         reload_directory();
 
 #if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR)
-    ata_set_led_enabled(true);
+    storage_set_led_enabled(true);
 #endif
 
 #if CONFIG_TUNER