summaryrefslogtreecommitdiff
path: root/firmware
diff options
context:
space:
mode:
authorLinus Nielsen Feltzing <linus@haxx.se>2003-10-14 10:18:22 +0000
committerLinus Nielsen Feltzing <linus@haxx.se>2003-10-14 10:18:22 +0000
commit65a17b848a08dd385b93b2ca6c22672e67f59686 (patch)
tree867ccf7a9ab7d82787804f7308882dfb6b44bf29 /firmware
parentcbbbcd1800c91319c98da6d1d98a488fdd79f144 (diff)
More linker safe MP3 buffer handling in the simulator
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3972 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/buffer.c2
-rw-r--r--firmware/export/buffer.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/firmware/buffer.c b/firmware/buffer.c
index 4db0b94889..53e63d091c 100644
--- a/firmware/buffer.c
+++ b/firmware/buffer.c
@@ -21,7 +21,7 @@
#ifdef SIMULATOR
unsigned char mp3buffer[0x100000];
-unsigned char mp3end[1];
+unsigned char *mp3end = mp3buffer + sizeof(mp3buffer);
#else
/* defined in linker script */
extern unsigned char mp3buffer[];
diff --git a/firmware/export/buffer.h b/firmware/export/buffer.h
index 24b676ad93..c031a4f213 100644
--- a/firmware/export/buffer.h
+++ b/firmware/export/buffer.h
@@ -20,7 +20,11 @@
#define BUFFER_H
/* defined in linker script */
+#ifdef SIMULATOR
+extern unsigned char *mp3end;
+#else
extern unsigned char mp3end[];
+#endif
extern unsigned char *mp3buf;