From 65a17b848a08dd385b93b2ca6c22672e67f59686 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Tue, 14 Oct 2003 10:18:22 +0000 Subject: [PATCH] More linker safe MP3 buffer handling in the simulator git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3972 a1c6a512-1295-4272-9138-f99709370657 --- firmware/buffer.c | 2 +- firmware/export/buffer.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) 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;