diff options
author | Jens Arnold <amiconn@rockbox.org> | 2005-07-03 14:05:12 +0000 |
---|---|---|
committer | Jens Arnold <amiconn@rockbox.org> | 2005-07-03 14:05:12 +0000 |
commit | d2456b44f73e6a1310d8dc2c98db92364b70e793 (patch) | |
tree | 5f6a7ff48924ebb9b35dd57775c4538d3388d136 /apps/plugins/rockboy/rockmacros.h | |
parent | d50ed1248de6f347e928bae349c3393696a0383f (diff) | |
download | rockbox-d2456b44f73e6a1310d8dc2c98db92364b70e793.tar.gz rockbox-d2456b44f73e6a1310d8dc2c98db92364b70e793.zip |
Centralised the ICODE_ATTR and IDATA_ATTR #defines. Renamed some musepack and rockboy headers to avoid clashes with rockbox headers.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6991 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins/rockboy/rockmacros.h')
-rw-r--r-- | apps/plugins/rockboy/rockmacros.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/apps/plugins/rockboy/rockmacros.h b/apps/plugins/rockboy/rockmacros.h index e246086f05..71acfdbbcc 100644 --- a/apps/plugins/rockboy/rockmacros.h +++ b/apps/plugins/rockboy/rockmacros.h | |||
@@ -51,16 +51,6 @@ void savestate(int fd); | |||
51 | #define isalpha(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && ((c) <= 'Z'))) | 51 | #define isalpha(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && ((c) <= 'Z'))) |
52 | #define isalnum(c) (isdigit(c) || (isalpha(c))) | 52 | #define isalnum(c) (isdigit(c) || (isalpha(c))) |
53 | 53 | ||
54 | /* FIXME: This is a q&d fix for these #defines not being available from | ||
55 | * rockbox' lcd.h because rockboy has its own lcd.h. Renaming the file and | ||
56 | * adapting the other files produced weird errors I couldn't figure out | ||
57 | * -- amiconn 20050624 -- */ | ||
58 | #define DRMODE_COMPLEMENT 0 | ||
59 | #define DRMODE_BG 1 | ||
60 | #define DRMODE_FG 2 | ||
61 | #define DRMODE_SOLID 3 | ||
62 | #define DRMODE_INVERSEVID 4 /* used as bit modifier for basic modes */ | ||
63 | |||
64 | #ifdef SIMULATOR | 54 | #ifdef SIMULATOR |
65 | #undef opendir | 55 | #undef opendir |
66 | #define opendir(a) rb->sim_opendir((a)) | 56 | #define opendir(a) rb->sim_opendir((a)) |
@@ -72,22 +62,12 @@ void savestate(int fd); | |||
72 | #define open(a,b) rb->sim_open((a),(b)) | 62 | #define open(a,b) rb->sim_open((a),(b)) |
73 | #undef lseek | 63 | #undef lseek |
74 | #define lseek(a,b,c) rb->sim_lseek((a),(b),(c)) | 64 | #define lseek(a,b,c) rb->sim_lseek((a),(b),(c)) |
75 | #define ICODE_ATTR | ||
76 | #define IDATA_ATTR | ||
77 | #else /* !SIMULATOR */ | 65 | #else /* !SIMULATOR */ |
78 | #define opendir(a) rb->opendir((a)) | 66 | #define opendir(a) rb->opendir((a)) |
79 | #define closedir(a) rb->closedir((a)) | 67 | #define closedir(a) rb->closedir((a)) |
80 | #define mkdir(a,b) rb->mkdir((a),(b)) | 68 | #define mkdir(a,b) rb->mkdir((a),(b)) |
81 | #define open(a,b) rb->open((a),(b)) | 69 | #define open(a,b) rb->open((a),(b)) |
82 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) | 70 | #define lseek(a,b,c) rb->lseek((a),(b),(c)) |
83 | #if CONFIG_CPU == MCF5249 | ||
84 | #define ICODE_ATTR __attribute__ ((section(".icode"))) | ||
85 | #define IDATA_ATTR __attribute__ ((section(".idata"))) | ||
86 | #define USE_IRAM 1 | ||
87 | #else | ||
88 | #define ICODE_ATTR | ||
89 | #define IDATA_ATTR | ||
90 | #endif | ||
91 | #endif /* !SIMULATOR */ | 71 | #endif /* !SIMULATOR */ |
92 | 72 | ||
93 | #define strcat(a,b) rb->strcat((a),(b)) | 73 | #define strcat(a,b) rb->strcat((a),(b)) |