From 5fee03c1287d0e6981e8da0ce05b8a6f70c53b2e Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Sun, 5 Aug 2007 20:41:49 +0000 Subject: [PATCH] Make test_disk and test_fps plugins compile for the simulator. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14201 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/test_disk.c | 4 ++++ apps/plugins/test_fps.c | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/apps/plugins/test_disk.c b/apps/plugins/test_disk.c index 5799f4ce0b..45dc598fc2 100644 --- a/apps/plugins/test_disk.c +++ b/apps/plugins/test_disk.c @@ -114,9 +114,11 @@ static bool test_fs(void) log_init(); log_text("test_disk WRITE&VERIFY", true); +#ifndef SIMULATOR rb->snprintf(text_buf, sizeof(text_buf), "CPU clock: %ld Hz", *rb->cpu_frequency); log_text(text_buf, true); +#endif log_text("----------------------", true); rb->snprintf(text_buf, sizeof text_buf, "Data size: %dKB", (TEST_SIZE>>10)); log_text(text_buf, true); @@ -297,9 +299,11 @@ static bool test_speed(void) rb->memset(audiobuf, 'T', audiobuflen); log_init(); log_text("test_disk SPEED TEST", true); +#ifndef SIMULATOR rb->snprintf(text_buf, sizeof(text_buf), "CPU clock: %ld Hz", *rb->cpu_frequency); log_text(text_buf, true); +#endif log_text("--------------------", true); /* File creation speed */ diff --git a/apps/plugins/test_fps.c b/apps/plugins/test_fps.c index ef1973f8b2..9188d96ba4 100644 --- a/apps/plugins/test_fps.c +++ b/apps/plugins/test_fps.c @@ -39,7 +39,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) char str[64]; /* text buffer */ int time_start; /* start tickcount */ int frame_count; /* frame counter */ +#ifndef SIMULATOR int cpu_freq; +#endif int line = 0; int part14_x = LCD_WIDTH/4; /* x-offset for 1/4 update test */ int part14_w = LCD_WIDTH/2; /* x-size for 1/4 update test */ @@ -67,7 +69,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) #endif rb->lcd_update(); +#ifndef SIMULATOR cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */ +#endif /* TEST 1: FULL LCD UPDATE */ frame_count = 0; @@ -96,12 +100,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) (frame_count%2)*5); rb->lcd_puts(0, line++, str); +#ifndef SIMULATOR if (*rb->cpu_frequency != cpu_freq) rb->snprintf(str, sizeof(str), "CPU: frequency changed!"); else rb->snprintf(str, sizeof(str), "CPU: %d Hz", cpu_freq); rb->lcd_puts(0, line++, str); +#endif rb->lcd_update(); #ifdef HAVE_REMOTE_LCD @@ -110,7 +116,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) rb->lcd_remote_puts(0, r_line++, "Remote LCD"); rb->lcd_remote_update(); +#ifndef SIMULATOR cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */ +#endif /* TEST 1: FULL LCD UPDATE */ frame_count = 0; @@ -140,12 +148,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) (frame_count%2)*5); rb->lcd_puts(0, line++, str); +#ifndef SIMULATOR if (*rb->cpu_frequency != cpu_freq) rb->snprintf(str, sizeof(str), "CPU: frequency changed!"); else rb->snprintf(str, sizeof(str), "CPU: %d Hz", cpu_freq); rb->lcd_puts(0, line++, str); +#endif rb->lcd_update(); #endif