5 files changed, 11 insertions, 20 deletions

diff --git a/apps/filetree.c b/apps/filetree.c
index 97732ccc82..e8fb459d52 100644
--- a/apps/filetree.c
+++ b/apps/filetree.c
@@ -62,7 +62,6 @@ int ft_build_playlist(struct tree_context* c, int start_index)
     {
         if((dircache[i].attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO)
         {
-            DEBUGF("Adding %s\n", dircache[i].name);
             if (playlist_add(dircache[i].name) < 0)
                 break;
         }
diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c
index e2d5713aa5..d977699fe4 100644
--- a/apps/recorder/bmp.c
+++ b/apps/recorder/bmp.c
@@ -584,6 +584,5 @@ int read_bmp_fd(int fd,
         }
     }
 
-    DEBUGF("totalsize: %d\n", totalsize);
     return totalsize; /* return the used buffer size. */
 }
diff --git a/apps/settings.c b/apps/settings.c
index 895db69745..3a9a8060c3 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -205,11 +205,8 @@ static bool write_nvram_data(char* buf, int max_len)
        supports that, but this will have to do for now 8-) */
     for (i=0; i < NVRAM_BLOCK_SIZE; i++ ) {
         int r = rtc_write(0x14+i, buf[i]);
-        if (r) {
-            DEBUGF( "save_config_buffer: rtc_write failed at addr 0x%02x: %d\n",
-                    14+i, r );
+        if (r) 
             return false;
-        }
     }
 #endif
     return true;
@@ -221,7 +218,6 @@ static bool write_nvram_data(char* buf, int max_len)
  */
 void settings_load(int which)
 {
-    DEBUGF( "reload_all_settings()\n" );
     if (which&SETTINGS_RTC)
         read_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE);
     if (which&SETTINGS_HD)
@@ -723,7 +719,6 @@ void settings_apply(bool read_disk)
     int i;
 #endif
 
-    DEBUGF( "settings_apply()\n" );
     sound_settings_apply();
 
 #ifndef HAVE_FLASH_STORAGE
@@ -950,7 +945,6 @@ void settings_apply(bool read_disk)
 void settings_reset(void) 
 {
     int i;
-    DEBUGF( "settings_reset()\n" );
 
     for(i=0; i<nb_settings; i++)
     {
diff --git a/firmware/mp3data.c b/firmware/mp3data.c
index f62afda62f..de204e04f3 100644
--- a/firmware/mp3data.c
+++ b/firmware/mp3data.c
@@ -38,7 +38,7 @@
 #include "file.h"
 #include "buffer.h"
 
-#define DEBUG_VERBOSE
+// #define DEBUG_VERBOSE
 
 #define SYNC_MASK (0x7ffL << 21)
 #define VERSION_MASK (3L << 19)
@@ -230,7 +230,7 @@ static unsigned long __find_next_frame(int fd, long *offset, long max_offset,
 
     *offset = pos - 4;
 
-#if defined(DEBUG) || defined(SIMULATOR)
+#if defined(DEBUG)
     if(*offset)
         DEBUGF("Warning: skipping %ld bytes of garbage\n", *offset);
 #endif
@@ -374,7 +374,7 @@ int get_mp3file_info(int fd, struct mp3info *info)
     /* OK, we have found a frame. Let's see if it has a Xing header */
     if (info->frame_size-4 >= (int)sizeof(frame))
     {
-#if defined(DEBUG) || defined(SIMULATOR)
+#if defined(DEBUG)
         DEBUGF("Error: Invalid id3 header, frame_size: %d\n", info->frame_size);
 #endif
         return -8;
diff --git a/uisimulator/common/io.c b/uisimulator/common/io.c
index 822a43b63d..c44e050fc9 100644
--- a/uisimulator/common/io.c
+++ b/uisimulator/common/io.c
@@ -342,7 +342,7 @@ int sim_open(const char *name, int o)
     {
         snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name);
 
-        debugf("We open the real file '%s'\n", buffer);
+        //debugf("We open the real file '%s'\n", buffer);
         if (num_openfiles < MAX_OPEN_FILES)
         {
             ret = OPEN(buffer, opts, 0666);
@@ -380,7 +380,7 @@ int sim_creat(const char *name)
     {
         snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name);
 
-        debugf("We create the real file '%s'\n", buffer);
+        //debugf("We create the real file '%s'\n", buffer);
         return OPEN(buffer, O_BINARY | O_WRONLY | O_CREAT | O_TRUNC, 0666);
     }
     fprintf(stderr, "WARNING, bad file name lacks slash: %s\n", name);
@@ -434,7 +434,7 @@ int sim_mkdir(const char *name)
 
     snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name);
 
-    debugf("We create the real directory '%s'\n", buffer);
+    //debugf("We create the real directory '%s'\n", buffer);
     return MKDIR(buffer, 0777);
 #endif
 }
@@ -449,7 +449,7 @@ int sim_rmdir(const char *name)
     {
         snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name);
 
-        debugf("We remove the real directory '%s'\n", buffer);
+        //debugf("We remove the real directory '%s'\n", buffer);
         return RMDIR(buffer);
     }
     return RMDIR(name);
@@ -470,7 +470,7 @@ int sim_remove(const char *name)
     if(name[0] == '/') {
         snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name);
 
-        debugf("We remove the real file '%s'\n", buffer);
+        //debugf("We remove the real file '%s'\n", buffer);
         return REMOVE(buffer);
     }
     return REMOVE(name);
@@ -495,7 +495,7 @@ int sim_rename(const char *oldpath, const char* newpath)
         snprintf(buffer2, sizeof(buffer2), "%s%s", get_sim_rootdir(),
                                                    newpath);
 
-        debugf("We rename the real file '%s' to '%s'\n", buffer1, buffer2);
+        //debugf("We rename the real file '%s' to '%s'\n", buffer1, buffer2);
         return RENAME(buffer1, buffer2);
     }
     return -1;
@@ -526,8 +526,7 @@ void fat_size(IF_MV2(int volume,) unsigned long* size, unsigned long* free)
 {
 #ifdef HAVE_MULTIVOLUME
     if (volume != 0) {
-        debugf("io.c: fat_size(volume=%d); simulator only supports volume 0\n",
-            volume);
+        //debugf("io.c: fat_size(volume=%d); simulator only supports volume 0\n",volume);
 
         if (size) *size = 0;
         if (free) *free = 0;