diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/codecs.c | 6 | ||||
-rw-r--r-- | apps/codecs.h | 13 | ||||
-rw-r--r-- | apps/codecs/lib/codeclib.h | 1 | ||||
-rw-r--r-- | apps/plugin.c | 6 | ||||
-rw-r--r-- | apps/plugin.h | 30 | ||||
-rw-r--r-- | apps/plugins/doom/rockmacros.h | 16 | ||||
-rw-r--r-- | apps/plugins/rockboy/rockmacros.h | 14 | ||||
-rw-r--r-- | apps/plugins/solitaire.c | 12 | ||||
-rw-r--r-- | apps/plugins/text_editor.c | 2 | ||||
-rw-r--r-- | apps/plugins/viewer.c | 2 |
10 files changed, 35 insertions, 67 deletions
diff --git a/apps/codecs.c b/apps/codecs.c index 8f5a0e36fd..2c547ffd5d 100644 --- a/apps/codecs.c +++ b/apps/codecs.c | |||
@@ -56,6 +56,12 @@ | |||
56 | #include "logf.h" | 56 | #include "logf.h" |
57 | 57 | ||
58 | #ifdef SIMULATOR | 58 | #ifdef SIMULATOR |
59 | #define PREFIX(_x_) sim_ ## _x_ | ||
60 | #else | ||
61 | #define PREFIX | ||
62 | #endif | ||
63 | |||
64 | #ifdef SIMULATOR | ||
59 | #if CONFIG_CODEC == SWCODEC | 65 | #if CONFIG_CODEC == SWCODEC |
60 | unsigned char codecbuf[CODEC_SIZE]; | 66 | unsigned char codecbuf[CODEC_SIZE]; |
61 | #endif | 67 | #endif |
diff --git a/apps/codecs.h b/apps/codecs.h index d765daba2a..cd3774d191 100644 --- a/apps/codecs.h +++ b/apps/codecs.h | |||
@@ -34,7 +34,6 @@ | |||
34 | #include <stdbool.h> | 34 | #include <stdbool.h> |
35 | #include <stdlib.h> | 35 | #include <stdlib.h> |
36 | #include "config.h" | 36 | #include "config.h" |
37 | #include "kernel.h" | ||
38 | #include "system.h" | 37 | #include "system.h" |
39 | #include "metadata.h" | 38 | #include "metadata.h" |
40 | #include "audio.h" | 39 | #include "audio.h" |
@@ -70,12 +69,6 @@ | |||
70 | 69 | ||
71 | #endif | 70 | #endif |
72 | 71 | ||
73 | #ifdef SIMULATOR | ||
74 | #define PREFIX(_x_) sim_ ## _x_ | ||
75 | #else | ||
76 | #define PREFIX(_x_) _x_ | ||
77 | #endif | ||
78 | |||
79 | /* magic for normal codecs */ | 72 | /* magic for normal codecs */ |
80 | #define CODEC_MAGIC 0x52434F44 /* RCOD */ | 73 | #define CODEC_MAGIC 0x52434F44 /* RCOD */ |
81 | /* magic for encoder codecs */ | 74 | /* magic for encoder codecs */ |
@@ -160,7 +153,7 @@ struct codec_api { | |||
160 | void (*configure)(int setting, intptr_t value); | 153 | void (*configure)(int setting, intptr_t value); |
161 | 154 | ||
162 | /* kernel/ system */ | 155 | /* kernel/ system */ |
163 | void (*PREFIX(sleep))(int ticks); | 156 | void (*sleep)(int ticks); |
164 | void (*yield)(void); | 157 | void (*yield)(void); |
165 | 158 | ||
166 | #if NUM_CORES > 1 | 159 | #if NUM_CORES > 1 |
@@ -227,10 +220,10 @@ struct codec_api { | |||
227 | size_t (*enc_unget_pcm_data)(size_t size); | 220 | size_t (*enc_unget_pcm_data)(size_t size); |
228 | 221 | ||
229 | /* file */ | 222 | /* file */ |
230 | int (*PREFIX(open))(const char* pathname, int flags); | 223 | int (*open)(const char* pathname, int flags); |
231 | int (*close)(int fd); | 224 | int (*close)(int fd); |
232 | ssize_t (*read)(int fd, void* buf, size_t count); | 225 | ssize_t (*read)(int fd, void* buf, size_t count); |
233 | off_t (*PREFIX(lseek))(int fd, off_t offset, int whence); | 226 | off_t (*lseek)(int fd, off_t offset, int whence); |
234 | ssize_t (*write)(int fd, const void* buf, size_t count); | 227 | ssize_t (*write)(int fd, const void* buf, size_t count); |
235 | int (*round_value_to_list32)(unsigned long value, | 228 | int (*round_value_to_list32)(unsigned long value, |
236 | const unsigned long list[], | 229 | const unsigned long list[], |
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 1df85d6bee..52bf72f7dc 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h | |||
@@ -21,7 +21,6 @@ | |||
21 | 21 | ||
22 | #include "config.h" | 22 | #include "config.h" |
23 | #include "codecs.h" | 23 | #include "codecs.h" |
24 | #include "system.h" | ||
25 | #include <sys/types.h> | 24 | #include <sys/types.h> |
26 | 25 | ||
27 | extern struct codec_api *ci; | 26 | extern struct codec_api *ci; |
diff --git a/apps/plugin.c b/apps/plugin.c index 2a6761024b..66d614ec58 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -52,6 +52,12 @@ | |||
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | #ifdef SIMULATOR | 54 | #ifdef SIMULATOR |
55 | #define PREFIX(_x_) sim_ ## _x_ | ||
56 | #else | ||
57 | #define PREFIX | ||
58 | #endif | ||
59 | |||
60 | #ifdef SIMULATOR | ||
55 | static unsigned char pluginbuf[PLUGIN_BUFFER_SIZE]; | 61 | static unsigned char pluginbuf[PLUGIN_BUFFER_SIZE]; |
56 | void *sim_plugin_load(char *plugin, void **pd); | 62 | void *sim_plugin_load(char *plugin, void **pd); |
57 | void sim_plugin_close(void *pd); | 63 | void sim_plugin_close(void *pd); |
diff --git a/apps/plugin.h b/apps/plugin.h index 390a65c7ad..6b198686f2 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -123,12 +123,6 @@ void* plugin_get_buffer(size_t *buffer_size); | |||
123 | 123 | ||
124 | #endif | 124 | #endif |
125 | 125 | ||
126 | #ifdef SIMULATOR | ||
127 | #define PREFIX(_x_) sim_ ## _x_ | ||
128 | #else | ||
129 | #define PREFIX(_x_) _x_ | ||
130 | #endif | ||
131 | |||
132 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ | 126 | #define PLUGIN_MAGIC 0x526F634B /* RocK */ |
133 | 127 | ||
134 | /* increase this every time the api struct changes */ | 128 | /* increase this every time the api struct changes */ |
@@ -369,16 +363,16 @@ struct plugin_api { | |||
369 | #endif /* HAVE_BUTTON_LIGHT */ | 363 | #endif /* HAVE_BUTTON_LIGHT */ |
370 | 364 | ||
371 | /* file */ | 365 | /* file */ |
372 | int (*PREFIX(open))(const char* pathname, int flags); | 366 | int (*open)(const char* pathname, int flags); |
373 | int (*PREFIX(close))(int fd); | 367 | int (*close)(int fd); |
374 | ssize_t (*PREFIX(read))(int fd, void* buf, size_t count); | 368 | ssize_t (*read)(int fd, void* buf, size_t count); |
375 | off_t (*PREFIX(lseek))(int fd, off_t offset, int whence); | 369 | off_t (*lseek)(int fd, off_t offset, int whence); |
376 | int (*PREFIX(creat))(const char *pathname); | 370 | int (*creat)(const char *pathname); |
377 | ssize_t (*PREFIX(write))(int fd, const void* buf, size_t count); | 371 | ssize_t (*write)(int fd, const void* buf, size_t count); |
378 | int (*PREFIX(remove))(const char* pathname); | 372 | int (*remove)(const char* pathname); |
379 | int (*PREFIX(rename))(const char* path, const char* newname); | 373 | int (*rename)(const char* path, const char* newname); |
380 | int (*PREFIX(ftruncate))(int fd, off_t length); | 374 | int (*ftruncate)(int fd, off_t length); |
381 | off_t (*PREFIX(filesize))(int fd); | 375 | off_t (*filesize)(int fd); |
382 | int (*fdprintf)(int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); | 376 | int (*fdprintf)(int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3); |
383 | int (*read_line)(int fd, char* buffer, int buffer_size); | 377 | int (*read_line)(int fd, char* buffer, int buffer_size); |
384 | bool (*settings_parseline)(char* line, char** name, char** value); | 378 | bool (*settings_parseline)(char* line, char** name, char** value); |
@@ -405,7 +399,7 @@ struct plugin_api { | |||
405 | bool (*dir_exists)(const char *path); | 399 | bool (*dir_exists)(const char *path); |
406 | 400 | ||
407 | /* kernel/ system */ | 401 | /* kernel/ system */ |
408 | void (*PREFIX(sleep))(int ticks); | 402 | void (*sleep)(int ticks); |
409 | void (*yield)(void); | 403 | void (*yield)(void); |
410 | volatile long* current_tick; | 404 | volatile long* current_tick; |
411 | long (*default_event_handler)(long event); | 405 | long (*default_event_handler)(long event); |
@@ -577,7 +571,7 @@ struct plugin_api { | |||
577 | int (*playlist_amount)(void); | 571 | int (*playlist_amount)(void); |
578 | int (*playlist_resume)(void); | 572 | int (*playlist_resume)(void); |
579 | int (*playlist_start)(int start_index, int offset); | 573 | int (*playlist_start)(int start_index, int offset); |
580 | void (*PREFIX(audio_play))(long offset); | 574 | void (*audio_play)(long offset); |
581 | void (*audio_stop)(void); | 575 | void (*audio_stop)(void); |
582 | void (*audio_pause)(void); | 576 | void (*audio_pause)(void); |
583 | void (*audio_resume)(void); | 577 | void (*audio_resume)(void); |
diff --git a/apps/plugins/doom/rockmacros.h b/apps/plugins/doom/rockmacros.h index 6e09e6e806..78574c8440 100644 --- a/apps/plugins/doom/rockmacros.h +++ b/apps/plugins/doom/rockmacros.h | |||
@@ -41,28 +41,12 @@ char *my_strtok( char * s, const char * delim ); | |||
41 | #define vsnprintf(...) rb->vsnprintf(__VA_ARGS__) | 41 | #define vsnprintf(...) rb->vsnprintf(__VA_ARGS__) |
42 | #define read_line(a,b,c) rb->read_line((a),(b),(c)) | 42 | #define read_line(a,b,c) rb->read_line((a),(b),(c)) |
43 | 43 | ||
44 | #ifdef SIMULATOR | ||
45 | #undef open | ||
46 | #undef close | ||
47 | #undef lseek | ||
48 | #undef filesize | ||
49 | #undef read | ||
50 | #undef write | ||
51 | #define open(a,b) rb->sim_open((a),(b)) | ||
52 | #define close(a) rb->sim_close((a)) | ||
53 | #define lseek(a,b,c) rb->sim_lseek((a),(b),(c)) | ||
54 | #define filesize(a) rb->sim_filesize((a)) | ||
55 | #define read(a,b,c) rb->sim_read((a),(b),(c)) | ||
56 | #define write(a,b,c) rb->sim_write((a),(b),(c)) | ||
57 | #else /* !SIMULATOR */ | ||
58 | #define open(a,b) my_open((a),(b)) | 44 | #define open(a,b) my_open((a),(b)) |
59 | #define close(a) my_close((a)) | 45 | #define close(a) my_close((a)) |
60 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) | 46 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) |
61 | #define filesize(a) rb->filesize((a)) | 47 | #define filesize(a) rb->filesize((a)) |
62 | #define read(a,b,c) rb->read((a),(b),(c)) | 48 | #define read(a,b,c) rb->read((a),(b),(c)) |
63 | #define write(a,b,c) rb->write((a),(b),(c)) | 49 | #define write(a,b,c) rb->write((a),(b),(c)) |
64 | #endif /* !SIMULATOR */ | ||
65 | |||
66 | #define strtok(a,b) my_strtok((a),(b)) | 50 | #define strtok(a,b) my_strtok((a),(b)) |
67 | #define strcat(a,b) rb->strcat((a),(b)) | 51 | #define strcat(a,b) rb->strcat((a),(b)) |
68 | #define memset(a,b,c) rb->memset((a),(b),(c)) | 52 | #define memset(a,b,c) rb->memset((a),(b),(c)) |
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h index 179de2313f..34e8d0cd3f 100644 --- a/apps/plugins/rockboy/rockmacros.h +++ b/apps/plugins/rockboy/rockmacros.h | |||
@@ -60,25 +60,11 @@ void dynamic_recompile (struct dynarec_block *newblock); | |||
60 | #define isalpha(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && ((c) <= 'Z'))) | 60 | #define isalpha(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && ((c) <= 'Z'))) |
61 | #define isalnum(c) (isdigit(c) || (isalpha(c))) | 61 | #define isalnum(c) (isdigit(c) || (isalpha(c))) |
62 | 62 | ||
63 | #ifdef SIMULATOR | ||
64 | #undef open | ||
65 | #define open(a,b) rb->sim_open((a),(b)) | ||
66 | #undef lseek | ||
67 | #define lseek(a,b,c) rb->sim_lseek((a),(b),(c)) | ||
68 | #undef close | ||
69 | #define close(a) rb->sim_close((a)) | ||
70 | #undef read | ||
71 | #define read(a,b,c) rb->sim_read((a),(b),(c)) | ||
72 | #undef write | ||
73 | #define write(a,b,c) rb->sim_write((a),(b),(c)) | ||
74 | #else /* !SIMULATOR */ | ||
75 | #define open(a,b) rb->open((a),(b)) | 63 | #define open(a,b) rb->open((a),(b)) |
76 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) | 64 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) |
77 | #define close(a) rb->close((a)) | 65 | #define close(a) rb->close((a)) |
78 | #define read(a,b,c) rb->read((a),(b),(c)) | 66 | #define read(a,b,c) rb->read((a),(b),(c)) |
79 | #define write(a,b,c) rb->write((a),(b),(c)) | 67 | #define write(a,b,c) rb->write((a),(b),(c)) |
80 | #endif /* !SIMULATOR */ | ||
81 | |||
82 | #define strcat(a,b) rb->strcat((a),(b)) | 68 | #define strcat(a,b) rb->strcat((a),(b)) |
83 | #define memset(a,b,c) rb->memset((a),(b),(c)) | 69 | #define memset(a,b,c) rb->memset((a),(b),(c)) |
84 | #define strcpy(a,b) rb->strcpy((a),(b)) | 70 | #define strcpy(a,b) rb->strcpy((a),(b)) |
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 3a11d02bda..0a9bf99f51 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -1305,7 +1305,7 @@ void delete_save_file( void ) | |||
1305 | int save_write( int fd, const void *buf, size_t count, int *checksum ) | 1305 | int save_write( int fd, const void *buf, size_t count, int *checksum ) |
1306 | { | 1306 | { |
1307 | size_t i; | 1307 | size_t i; |
1308 | if( rb->PREFIX(write)( fd, buf, count ) < (ssize_t)count ) | 1308 | if( rb->write( fd, buf, count ) < (ssize_t)count ) |
1309 | return 1; | 1309 | return 1; |
1310 | for( i = 0; i < count; i++ ) | 1310 | for( i = 0; i < count; i++ ) |
1311 | *checksum += (int)(((const char *)buf)[i]); | 1311 | *checksum += (int)(((const char *)buf)[i]); |
@@ -1318,7 +1318,7 @@ int save_write( int fd, const void *buf, size_t count, int *checksum ) | |||
1318 | int save_read( int fd, void *buf, size_t count, int *checksum ) | 1318 | int save_read( int fd, void *buf, size_t count, int *checksum ) |
1319 | { | 1319 | { |
1320 | size_t i; | 1320 | size_t i; |
1321 | if( rb->PREFIX(read)( fd, buf, count ) < (ssize_t)count ) | 1321 | if( rb->read( fd, buf, count ) < (ssize_t)count ) |
1322 | return 1; | 1322 | return 1; |
1323 | for( i = 0; i < count; i++ ) | 1323 | for( i = 0; i < count; i++ ) |
1324 | *checksum -= (int)(((const char *)buf)[i]); | 1324 | *checksum -= (int)(((const char *)buf)[i]); |
@@ -1341,7 +1341,7 @@ int save_game( void ) | |||
1341 | || save_write( fd, &cards_per_draw, sizeof( int ), &checksum ) | 1341 | || save_write( fd, &cards_per_draw, sizeof( int ), &checksum ) |
1342 | || save_write( fd, cols, COL_NUM * sizeof( int ), &checksum ) | 1342 | || save_write( fd, cols, COL_NUM * sizeof( int ), &checksum ) |
1343 | || save_write( fd, stacks, SUITS * sizeof( int ), &checksum ) | 1343 | || save_write( fd, stacks, SUITS * sizeof( int ), &checksum ) |
1344 | || ( rb->PREFIX(write)( fd, &checksum, sizeof( int ) ) < (ssize_t)(sizeof( int ) ) ) ) | 1344 | || ( rb->write( fd, &checksum, sizeof( int ) ) < (ssize_t)(sizeof( int ) ) ) ) |
1345 | { | 1345 | { |
1346 | rb->close( fd ); | 1346 | rb->close( fd ); |
1347 | rb->splash( 2*HZ, "Error while saving game. Aborting." ); | 1347 | rb->splash( 2*HZ, "Error while saving game. Aborting." ); |
@@ -1357,9 +1357,9 @@ int load_game( void ) | |||
1357 | int checksum; | 1357 | int checksum; |
1358 | if( fd < 0 ) | 1358 | if( fd < 0 ) |
1359 | return -1; | 1359 | return -1; |
1360 | if( ( rb->PREFIX(lseek)( fd, -sizeof( int ), SEEK_END ) == -((ssize_t)sizeof( int ))-1 ) | 1360 | if( ( rb->lseek( fd, -sizeof( int ), SEEK_END ) == -((ssize_t)sizeof( int ))-1 ) |
1361 | || ( rb->PREFIX(read)( fd, &checksum, sizeof( int ) ) < ((ssize_t)sizeof( int )) ) | 1361 | || ( rb->read( fd, &checksum, sizeof( int ) ) < ((ssize_t)sizeof( int )) ) |
1362 | || ( rb->PREFIX(lseek)( fd, 0, SEEK_SET ) == -1 ) | 1362 | || ( rb->lseek( fd, 0, SEEK_SET ) == -1 ) |
1363 | || save_read( fd, &cur_card, sizeof( int ), &checksum ) | 1363 | || save_read( fd, &cur_card, sizeof( int ), &checksum ) |
1364 | || save_read( fd, &cur_col, sizeof( int ), &checksum ) | 1364 | || save_read( fd, &cur_col, sizeof( int ), &checksum ) |
1365 | || save_read( fd, &sel_card, sizeof( int ), &checksum ) | 1365 | || save_read( fd, &sel_card, sizeof( int ), &checksum ) |
diff --git a/apps/plugins/text_editor.c b/apps/plugins/text_editor.c index c9d973fe22..abb278728f 100644 --- a/apps/plugins/text_editor.c +++ b/apps/plugins/text_editor.c | |||
@@ -141,7 +141,7 @@ int get_eol_string(char* fn) | |||
141 | return 0; | 141 | return 0; |
142 | else if (!fn[0]) | 142 | else if (!fn[0]) |
143 | return 0; | 143 | return 0; |
144 | fd = rb->PREFIX(open(fn,O_RDONLY)); | 144 | fd = rb->open(fn,O_RDONLY); |
145 | if (fd<0) | 145 | if (fd<0) |
146 | return 0; | 146 | return 0; |
147 | eol[0] = '\0'; | 147 | eol[0] = '\0'; |
diff --git a/apps/plugins/viewer.c b/apps/plugins/viewer.c index 9a4b25bffd..fd460e50e0 100644 --- a/apps/plugins/viewer.c +++ b/apps/plugins/viewer.c | |||
@@ -1310,7 +1310,7 @@ static void viewer_save_settings(void)/* same name as global, but not the same f | |||
1310 | b.top_ptr_pos = 0; /* this is only kept for legassy reasons */ | 1310 | b.top_ptr_pos = 0; /* this is only kept for legassy reasons */ |
1311 | rb->memset(&b.filename[0],0,MAX_PATH); | 1311 | rb->memset(&b.filename[0],0,MAX_PATH); |
1312 | rb->strcpy(b.filename,file_name); | 1312 | rb->strcpy(b.filename,file_name); |
1313 | rb->PREFIX(lseek)(settings_fd,sizeof(signed int),SEEK_SET); | 1313 | rb->lseek(settings_fd,sizeof(signed int),SEEK_SET); |
1314 | rb->write (settings_fd, &b, sizeof(struct bookmarked_file_info)); | 1314 | rb->write (settings_fd, &b, sizeof(struct bookmarked_file_info)); |
1315 | rb->close(settings_fd); | 1315 | rb->close(settings_fd); |
1316 | } | 1316 | } |