diff options
author | Steve Bavin <pondlife@pondlife.me> | 2008-04-07 17:19:53 +0000 |
---|---|---|
committer | Steve Bavin <pondlife@pondlife.me> | 2008-04-07 17:19:53 +0000 |
commit | 799e9489caa41fde88f5ebabf174d4c8646deb1a (patch) | |
tree | bed81db30255e5dbc3edaa7e8723ed7b52e68a34 | |
parent | 977069a41de8650e9ee2716ff04db6b5365384c6 (diff) | |
download | rockbox-799e9489caa41fde88f5ebabf174d4c8646deb1a.tar.gz rockbox-799e9489caa41fde88f5ebabf174d4c8646deb1a.zip |
Remove some more simulator debugging output.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17019 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | apps/filetree.c | 1 | ||||
-rw-r--r-- | apps/recorder/bmp.c | 1 | ||||
-rw-r--r-- | apps/settings.c | 8 | ||||
-rw-r--r-- | firmware/mp3data.c | 6 | ||||
-rw-r--r-- | uisimulator/common/io.c | 15 |
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) | |||
62 | { | 62 | { |
63 | if((dircache[i].attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO) | 63 | if((dircache[i].attr & FILE_ATTR_MASK) == FILE_ATTR_AUDIO) |
64 | { | 64 | { |
65 | DEBUGF("Adding %s\n", dircache[i].name); | ||
66 | if (playlist_add(dircache[i].name) < 0) | 65 | if (playlist_add(dircache[i].name) < 0) |
67 | break; | 66 | break; |
68 | } | 67 | } |
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, | |||
584 | } | 584 | } |
585 | } | 585 | } |
586 | 586 | ||
587 | DEBUGF("totalsize: %d\n", totalsize); | ||
588 | return totalsize; /* return the used buffer size. */ | 587 | return totalsize; /* return the used buffer size. */ |
589 | } | 588 | } |
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) | |||
205 | supports that, but this will have to do for now 8-) */ | 205 | supports that, but this will have to do for now 8-) */ |
206 | for (i=0; i < NVRAM_BLOCK_SIZE; i++ ) { | 206 | for (i=0; i < NVRAM_BLOCK_SIZE; i++ ) { |
207 | int r = rtc_write(0x14+i, buf[i]); | 207 | int r = rtc_write(0x14+i, buf[i]); |
208 | if (r) { | 208 | if (r) |
209 | DEBUGF( "save_config_buffer: rtc_write failed at addr 0x%02x: %d\n", | ||
210 | 14+i, r ); | ||
211 | return false; | 209 | return false; |
212 | } | ||
213 | } | 210 | } |
214 | #endif | 211 | #endif |
215 | return true; | 212 | return true; |
@@ -221,7 +218,6 @@ static bool write_nvram_data(char* buf, int max_len) | |||
221 | */ | 218 | */ |
222 | void settings_load(int which) | 219 | void settings_load(int which) |
223 | { | 220 | { |
224 | DEBUGF( "reload_all_settings()\n" ); | ||
225 | if (which&SETTINGS_RTC) | 221 | if (which&SETTINGS_RTC) |
226 | read_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); | 222 | read_nvram_data(nvram_buffer,NVRAM_BLOCK_SIZE); |
227 | if (which&SETTINGS_HD) | 223 | if (which&SETTINGS_HD) |
@@ -723,7 +719,6 @@ void settings_apply(bool read_disk) | |||
723 | int i; | 719 | int i; |
724 | #endif | 720 | #endif |
725 | 721 | ||
726 | DEBUGF( "settings_apply()\n" ); | ||
727 | sound_settings_apply(); | 722 | sound_settings_apply(); |
728 | 723 | ||
729 | #ifndef HAVE_FLASH_STORAGE | 724 | #ifndef HAVE_FLASH_STORAGE |
@@ -950,7 +945,6 @@ void settings_apply(bool read_disk) | |||
950 | void settings_reset(void) | 945 | void settings_reset(void) |
951 | { | 946 | { |
952 | int i; | 947 | int i; |
953 | DEBUGF( "settings_reset()\n" ); | ||
954 | 948 | ||
955 | for(i=0; i<nb_settings; i++) | 949 | for(i=0; i<nb_settings; i++) |
956 | { | 950 | { |
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 @@ | |||
38 | #include "file.h" | 38 | #include "file.h" |
39 | #include "buffer.h" | 39 | #include "buffer.h" |
40 | 40 | ||
41 | #define DEBUG_VERBOSE | 41 | // #define DEBUG_VERBOSE |
42 | 42 | ||
43 | #define SYNC_MASK (0x7ffL << 21) | 43 | #define SYNC_MASK (0x7ffL << 21) |
44 | #define VERSION_MASK (3L << 19) | 44 | #define VERSION_MASK (3L << 19) |
@@ -230,7 +230,7 @@ static unsigned long __find_next_frame(int fd, long *offset, long max_offset, | |||
230 | 230 | ||
231 | *offset = pos - 4; | 231 | *offset = pos - 4; |
232 | 232 | ||
233 | #if defined(DEBUG) || defined(SIMULATOR) | 233 | #if defined(DEBUG) |
234 | if(*offset) | 234 | if(*offset) |
235 | DEBUGF("Warning: skipping %ld bytes of garbage\n", *offset); | 235 | DEBUGF("Warning: skipping %ld bytes of garbage\n", *offset); |
236 | #endif | 236 | #endif |
@@ -374,7 +374,7 @@ int get_mp3file_info(int fd, struct mp3info *info) | |||
374 | /* OK, we have found a frame. Let's see if it has a Xing header */ | 374 | /* OK, we have found a frame. Let's see if it has a Xing header */ |
375 | if (info->frame_size-4 >= (int)sizeof(frame)) | 375 | if (info->frame_size-4 >= (int)sizeof(frame)) |
376 | { | 376 | { |
377 | #if defined(DEBUG) || defined(SIMULATOR) | 377 | #if defined(DEBUG) |
378 | DEBUGF("Error: Invalid id3 header, frame_size: %d\n", info->frame_size); | 378 | DEBUGF("Error: Invalid id3 header, frame_size: %d\n", info->frame_size); |
379 | #endif | 379 | #endif |
380 | return -8; | 380 | 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) | |||
342 | { | 342 | { |
343 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); | 343 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); |
344 | 344 | ||
345 | debugf("We open the real file '%s'\n", buffer); | 345 | //debugf("We open the real file '%s'\n", buffer); |
346 | if (num_openfiles < MAX_OPEN_FILES) | 346 | if (num_openfiles < MAX_OPEN_FILES) |
347 | { | 347 | { |
348 | ret = OPEN(buffer, opts, 0666); | 348 | ret = OPEN(buffer, opts, 0666); |
@@ -380,7 +380,7 @@ int sim_creat(const char *name) | |||
380 | { | 380 | { |
381 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); | 381 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); |
382 | 382 | ||
383 | debugf("We create the real file '%s'\n", buffer); | 383 | //debugf("We create the real file '%s'\n", buffer); |
384 | return OPEN(buffer, O_BINARY | O_WRONLY | O_CREAT | O_TRUNC, 0666); | 384 | return OPEN(buffer, O_BINARY | O_WRONLY | O_CREAT | O_TRUNC, 0666); |
385 | } | 385 | } |
386 | fprintf(stderr, "WARNING, bad file name lacks slash: %s\n", name); | 386 | fprintf(stderr, "WARNING, bad file name lacks slash: %s\n", name); |
@@ -434,7 +434,7 @@ int sim_mkdir(const char *name) | |||
434 | 434 | ||
435 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); | 435 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); |
436 | 436 | ||
437 | debugf("We create the real directory '%s'\n", buffer); | 437 | //debugf("We create the real directory '%s'\n", buffer); |
438 | return MKDIR(buffer, 0777); | 438 | return MKDIR(buffer, 0777); |
439 | #endif | 439 | #endif |
440 | } | 440 | } |
@@ -449,7 +449,7 @@ int sim_rmdir(const char *name) | |||
449 | { | 449 | { |
450 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); | 450 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); |
451 | 451 | ||
452 | debugf("We remove the real directory '%s'\n", buffer); | 452 | //debugf("We remove the real directory '%s'\n", buffer); |
453 | return RMDIR(buffer); | 453 | return RMDIR(buffer); |
454 | } | 454 | } |
455 | return RMDIR(name); | 455 | return RMDIR(name); |
@@ -470,7 +470,7 @@ int sim_remove(const char *name) | |||
470 | if(name[0] == '/') { | 470 | if(name[0] == '/') { |
471 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); | 471 | snprintf(buffer, sizeof(buffer), "%s%s", get_sim_rootdir(), name); |
472 | 472 | ||
473 | debugf("We remove the real file '%s'\n", buffer); | 473 | //debugf("We remove the real file '%s'\n", buffer); |
474 | return REMOVE(buffer); | 474 | return REMOVE(buffer); |
475 | } | 475 | } |
476 | return REMOVE(name); | 476 | return REMOVE(name); |
@@ -495,7 +495,7 @@ int sim_rename(const char *oldpath, const char* newpath) | |||
495 | snprintf(buffer2, sizeof(buffer2), "%s%s", get_sim_rootdir(), | 495 | snprintf(buffer2, sizeof(buffer2), "%s%s", get_sim_rootdir(), |
496 | newpath); | 496 | newpath); |
497 | 497 | ||
498 | debugf("We rename the real file '%s' to '%s'\n", buffer1, buffer2); | 498 | //debugf("We rename the real file '%s' to '%s'\n", buffer1, buffer2); |
499 | return RENAME(buffer1, buffer2); | 499 | return RENAME(buffer1, buffer2); |
500 | } | 500 | } |
501 | return -1; | 501 | return -1; |
@@ -526,8 +526,7 @@ void fat_size(IF_MV2(int volume,) unsigned long* size, unsigned long* free) | |||
526 | { | 526 | { |
527 | #ifdef HAVE_MULTIVOLUME | 527 | #ifdef HAVE_MULTIVOLUME |
528 | if (volume != 0) { | 528 | if (volume != 0) { |
529 | debugf("io.c: fat_size(volume=%d); simulator only supports volume 0\n", | 529 | //debugf("io.c: fat_size(volume=%d); simulator only supports volume 0\n",volume); |
530 | volume); | ||
531 | 530 | ||
532 | if (size) *size = 0; | 531 | if (size) *size = 0; |
533 | if (free) *free = 0; | 532 | if (free) *free = 0; |