From 19d1cacb1a63c306d842f81127d382512c49a062 Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Fri, 31 Oct 2008 21:25:04 +0000
Subject: cleanup storage defines

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18950 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/SOURCES      | 3 ++-
 apps/plugins/alpine_cdc.c | 4 ++--
 apps/plugins/splitedit.c  | 4 ++--
 apps/plugins/test_disk.c  | 2 +-
 apps/plugins/wavplay.c    | 4 ++--
 apps/plugins/wavrecord.c  | 6 +++---
 6 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'apps/plugins')

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index 0c27a5b1de..a4ddbacfd0 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -120,7 +120,8 @@ nim.c
 mp3_encoder.c
 wav2wv.c
 #else                              /* hardware codec platforms */
-#ifndef HAVE_MMC                   /* not for Ondio, has no remote control pin */
+#if !defined(ARCHOS_ONDIOSP) && !defined(ARCHOS_ONDIOFM)
+    /* not for Ondio, has no remote control pin */
 alpine_cdc.c
 #endif
 splitedit.c
diff --git a/apps/plugins/alpine_cdc.c b/apps/plugins/alpine_cdc.c
index f23255aea6..dfffc3b3cd 100644
--- a/apps/plugins/alpine_cdc.c
+++ b/apps/plugins/alpine_cdc.c
@@ -34,7 +34,7 @@
 #include "plugin.h"
 
 /* Only build for (correct) target */
-#if CONFIG_CPU==SH7034 && !defined(HAVE_MMC)
+#if CONFIG_CPU==SH7034 && !(CONFIG_STORAGE & STORAGE_MMC)
 
 PLUGIN_HEADER
 
@@ -1199,4 +1199,4 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
     return (main(parameter)==0) ? PLUGIN_OK : PLUGIN_ERROR;
 }
 
-#endif /* CONFIG_CPU==SH7034 && !defined(HAVE_MMC) */
+#endif /* CONFIG_CPU==SH7034 && !(CONFIG_STORAGE & STORAGE_MMC) */
diff --git a/apps/plugins/splitedit.c b/apps/plugins/splitedit.c
index 8de6a746ab..dda46a0f29 100644
--- a/apps/plugins/splitedit.c
+++ b/apps/plugins/splitedit.c
@@ -1044,7 +1044,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                     case LOOP_MODE_TO:
                         rb->audio_pause();
                         rb->audio_ff_rewind(range_start);
-#ifdef HAVE_MMC
+#if (CONFIG_STORAGE & STORAGE_MMC)
 /* MMC is slow - wait some time to allow track reload to finish */
                         rb->sleep(HZ/20);
                         if (mp3->elapsed > play_end) /* reload in progress */
@@ -1056,7 +1056,7 @@ unsigned long splitedit_editor(struct mp3entry * mp3_to_split,
                     case LOOP_MODE_FROM:
                         rb->audio_pause();
                         rb->audio_ff_rewind(xpos_to_time(split_x));
-#ifdef HAVE_MMC
+#if (CONFIG_STORAGE & STORAGE_MMC)
 /* MMC is slow - wait some time to allow track reload to finish */
                         rb->sleep(HZ/20);
                         if (mp3->elapsed > play_end) /* reload in progress */
diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c
index 7638fbf831..2e421e151e 100644
--- a/apps/plugins/test_disk.c
+++ b/apps/plugins/test_disk.c
@@ -29,7 +29,7 @@ PLUGIN_HEADER
 #define TEST_FILE   TESTBASEDIR "/test_disk.tmp"
 #define FRND_SEED   0x78C3     /* arbirary */
 
-#ifdef HAVE_MMC
+#if (CONFIG_STORAGE & STORAGE_MMC)
 #define TEST_SIZE (20*1024*1024)
 #else
 #define TEST_SIZE (300*1024*1024)
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c
index 333d16135c..c37b656d1c 100644
--- a/apps/plugins/wavplay.c
+++ b/apps/plugins/wavplay.c
@@ -3574,7 +3574,7 @@ int play_file(char* filename)
     while (!(SSR0 & SCI_TEND)); /* wait for end of transfer */
     BRR0 = 0;                   /* maximum speed, ~3 MBit/s */
 
-#ifndef HAVE_MMC
+#if !(CONFIG_STORAGE & STORAGE_MMC)
     low_water =   5 /* seconds */
                 * 2 /* bytes per sample */
                 * channels 
@@ -3603,7 +3603,7 @@ int play_file(char* filename)
             else
             {
                 wanted = MIN(free_space, aud_size - aud_write);
-#ifdef HAVE_MMC
+#if (CONFIG_STORAGE & STORAGE_MMC)
                 wanted = MIN(wanted, 256*1024);
 #elif MEM == 8
                 wanted = MIN(wanted, 1024*1024);
diff --git a/apps/plugins/wavrecord.c b/apps/plugins/wavrecord.c
index d57a61a6a2..d4b8bf1fd2 100644
--- a/apps/plugins/wavrecord.c
+++ b/apps/plugins/wavrecord.c
@@ -3587,7 +3587,7 @@ static int record_file(char *filename)
             if (to_save > aud_size)
             {
                 rec_tick_enable(false);
-#ifdef HAVE_MMC
+#if (CONFIG_STORAGE & STORAGE_MMC)
                 rb->splash(HZ, "Data overrun (slow MMC)");
 #else
                 rb->splash(HZ, "Data overrun");
@@ -3597,7 +3597,7 @@ static int record_file(char *filename)
                 break;
             }
             write_now = MIN(to_save, aud_size - aud_read);
-#ifdef HAVE_MMC
+#if (CONFIG_STORAGE & STORAGE_MMC)
             write_now = MIN(write_now, 256*1024);
 #else
             write_now = MIN(write_now, 1024*1024);
@@ -3802,7 +3802,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
     return rc;
 
 #if 0
-#ifdef HAVE_MMC
+#if (CONFIG_STORAGE & STORAGE_MMC)
     return record_file("/<MMC1>/test.wav");
 #else
     return record_file("/test.wav");
-- 
cgit v1.2.3