More linker safe MP3 buffer handling in the simulator

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3972 a1c6a512-1295-4272-9138-f99709370657

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;