diff options
author | Jens Arnold <amiconn@rockbox.org> | 2007-08-05 20:41:49 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2007-08-05 20:41:49 +0000 |
commit | 5fee03c1287d0e6981e8da0ce05b8a6f70c53b2e (patch) | |
tree | 7227e0a2e4a3cb0f5cbe61cc19c447dda95171f4 /apps | |
parent | 5e8e9565a252e4962587e79ca94fb574c31d1c26 (diff) | |
download | rockbox-5fee03c1287d0e6981e8da0ce05b8a6f70c53b2e.tar.gz rockbox-5fee03c1287d0e6981e8da0ce05b8a6f70c53b2e.zip |
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
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/test_disk.c | 4 | ||||
-rw-r--r-- | apps/plugins/test_fps.c | 10 |
2 files changed, 14 insertions, 0 deletions
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) | |||
114 | 114 | ||
115 | log_init(); | 115 | log_init(); |
116 | log_text("test_disk WRITE&VERIFY", true); | 116 | log_text("test_disk WRITE&VERIFY", true); |
117 | #ifndef SIMULATOR | ||
117 | rb->snprintf(text_buf, sizeof(text_buf), "CPU clock: %ld Hz", | 118 | rb->snprintf(text_buf, sizeof(text_buf), "CPU clock: %ld Hz", |
118 | *rb->cpu_frequency); | 119 | *rb->cpu_frequency); |
119 | log_text(text_buf, true); | 120 | log_text(text_buf, true); |
121 | #endif | ||
120 | log_text("----------------------", true); | 122 | log_text("----------------------", true); |
121 | rb->snprintf(text_buf, sizeof text_buf, "Data size: %dKB", (TEST_SIZE>>10)); | 123 | rb->snprintf(text_buf, sizeof text_buf, "Data size: %dKB", (TEST_SIZE>>10)); |
122 | log_text(text_buf, true); | 124 | log_text(text_buf, true); |
@@ -297,9 +299,11 @@ static bool test_speed(void) | |||
297 | rb->memset(audiobuf, 'T', audiobuflen); | 299 | rb->memset(audiobuf, 'T', audiobuflen); |
298 | log_init(); | 300 | log_init(); |
299 | log_text("test_disk SPEED TEST", true); | 301 | log_text("test_disk SPEED TEST", true); |
302 | #ifndef SIMULATOR | ||
300 | rb->snprintf(text_buf, sizeof(text_buf), "CPU clock: %ld Hz", | 303 | rb->snprintf(text_buf, sizeof(text_buf), "CPU clock: %ld Hz", |
301 | *rb->cpu_frequency); | 304 | *rb->cpu_frequency); |
302 | log_text(text_buf, true); | 305 | log_text(text_buf, true); |
306 | #endif | ||
303 | log_text("--------------------", true); | 307 | log_text("--------------------", true); |
304 | 308 | ||
305 | /* File creation speed */ | 309 | /* 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) | |||
39 | char str[64]; /* text buffer */ | 39 | char str[64]; /* text buffer */ |
40 | int time_start; /* start tickcount */ | 40 | int time_start; /* start tickcount */ |
41 | int frame_count; /* frame counter */ | 41 | int frame_count; /* frame counter */ |
42 | #ifndef SIMULATOR | ||
42 | int cpu_freq; | 43 | int cpu_freq; |
44 | #endif | ||
43 | int line = 0; | 45 | int line = 0; |
44 | int part14_x = LCD_WIDTH/4; /* x-offset for 1/4 update test */ | 46 | int part14_x = LCD_WIDTH/4; /* x-offset for 1/4 update test */ |
45 | int part14_w = LCD_WIDTH/2; /* x-size for 1/4 update test */ | 47 | 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) | |||
67 | #endif | 69 | #endif |
68 | rb->lcd_update(); | 70 | rb->lcd_update(); |
69 | 71 | ||
72 | #ifndef SIMULATOR | ||
70 | cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */ | 73 | cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */ |
74 | #endif | ||
71 | 75 | ||
72 | /* TEST 1: FULL LCD UPDATE */ | 76 | /* TEST 1: FULL LCD UPDATE */ |
73 | frame_count = 0; | 77 | frame_count = 0; |
@@ -96,12 +100,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
96 | (frame_count%2)*5); | 100 | (frame_count%2)*5); |
97 | rb->lcd_puts(0, line++, str); | 101 | rb->lcd_puts(0, line++, str); |
98 | 102 | ||
103 | #ifndef SIMULATOR | ||
99 | if (*rb->cpu_frequency != cpu_freq) | 104 | if (*rb->cpu_frequency != cpu_freq) |
100 | rb->snprintf(str, sizeof(str), "CPU: frequency changed!"); | 105 | rb->snprintf(str, sizeof(str), "CPU: frequency changed!"); |
101 | else | 106 | else |
102 | rb->snprintf(str, sizeof(str), "CPU: %d Hz", cpu_freq); | 107 | rb->snprintf(str, sizeof(str), "CPU: %d Hz", cpu_freq); |
103 | 108 | ||
104 | rb->lcd_puts(0, line++, str); | 109 | rb->lcd_puts(0, line++, str); |
110 | #endif | ||
105 | rb->lcd_update(); | 111 | rb->lcd_update(); |
106 | 112 | ||
107 | #ifdef HAVE_REMOTE_LCD | 113 | #ifdef HAVE_REMOTE_LCD |
@@ -110,7 +116,9 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
110 | rb->lcd_remote_puts(0, r_line++, "Remote LCD"); | 116 | rb->lcd_remote_puts(0, r_line++, "Remote LCD"); |
111 | rb->lcd_remote_update(); | 117 | rb->lcd_remote_update(); |
112 | 118 | ||
119 | #ifndef SIMULATOR | ||
113 | cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */ | 120 | cpu_freq = *rb->cpu_frequency; /* remember CPU frequency */ |
121 | #endif | ||
114 | 122 | ||
115 | /* TEST 1: FULL LCD UPDATE */ | 123 | /* TEST 1: FULL LCD UPDATE */ |
116 | frame_count = 0; | 124 | frame_count = 0; |
@@ -140,12 +148,14 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) | |||
140 | (frame_count%2)*5); | 148 | (frame_count%2)*5); |
141 | rb->lcd_puts(0, line++, str); | 149 | rb->lcd_puts(0, line++, str); |
142 | 150 | ||
151 | #ifndef SIMULATOR | ||
143 | if (*rb->cpu_frequency != cpu_freq) | 152 | if (*rb->cpu_frequency != cpu_freq) |
144 | rb->snprintf(str, sizeof(str), "CPU: frequency changed!"); | 153 | rb->snprintf(str, sizeof(str), "CPU: frequency changed!"); |
145 | else | 154 | else |
146 | rb->snprintf(str, sizeof(str), "CPU: %d Hz", cpu_freq); | 155 | rb->snprintf(str, sizeof(str), "CPU: %d Hz", cpu_freq); |
147 | 156 | ||
148 | rb->lcd_puts(0, line++, str); | 157 | rb->lcd_puts(0, line++, str); |
158 | #endif | ||
149 | rb->lcd_update(); | 159 | rb->lcd_update(); |
150 | #endif | 160 | #endif |
151 | 161 | ||