diff options
author | Björn Stenberg <bjorn@haxx.se> | 2009-01-07 09:53:46 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2009-01-07 09:53:46 +0000 |
commit | a36cdf5b37994a301d4fdeab123ee1569a34cf46 (patch) | |
tree | 5794a1f13f93e3d7190572e07709aa1a11e9e892 /apps/plugins | |
parent | f9329e4c9273f1b82aa5dbb36f243546ce55036d (diff) | |
download | rockbox-a36cdf5b37994a301d4fdeab123ee1569a34cf46.tar.gz rockbox-a36cdf5b37994a301d4fdeab123ee1569a34cf46.zip |
Removed the sim_ prefix from the plugin api.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19704 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-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 |
5 files changed, 8 insertions, 38 deletions
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 | } |