summaryrefslogtreecommitdiff
path: root/firmware/buffer.c
diff options
context:
space:
mode:
authorThomas Martitz <kugel@rockbox.org>2011-08-14 15:37:05 +0000
committerThomas Martitz <kugel@rockbox.org>2011-08-14 15:37:05 +0000
commit8a701e5488989944f120f0c37848de24fbeff455 (patch)
tree291b05e4bddad26c92668192edddd4ba4be310dd /firmware/buffer.c
parent7695b0403f772dd773ba25151bd8b97a7d16537e (diff)
downloadrockbox-8a701e5488989944f120f0c37848de24fbeff455.zip
rockbox-8a701e5488989944f120f0c37848de24fbeff455.tar.gz
rockbox-8a701e5488989944f120f0c37848de24fbeff455.tar.bz2
rockbox-8a701e5488989944f120f0c37848de24fbeff455.tar.xz
Fix errors and warnings.
The buffer_offset paramter of audio_init_recording() is removed as it was unused in both implementations. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30310 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/buffer.c')
-rw-r--r--firmware/buffer.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/firmware/buffer.c b/firmware/buffer.c
index 2168087..e0496fe 100644
--- a/firmware/buffer.c
+++ b/firmware/buffer.c
@@ -31,7 +31,7 @@
/* defined in linker script */
#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
-#if defined(IPOD_VIDEO)
+#if defined(IPOD_VIDEO) && !defined(BOOTLOADER)
extern unsigned char *audiobufend_lds[];
unsigned char *audiobufend;
#else /* !IPOD_VIDEO */
@@ -68,8 +68,8 @@ void buffer_init(void)
{
/* 32-bit aligned */
audiobuf = (void *)(((unsigned long)audiobuffer + 3) & ~3);
-
-#if defined(IPOD_VIDEO)
+
+#if defined(IPOD_VIDEO) && !defined(BOOTLOADER) && !defined(SIMULATOR)
audiobufend=(unsigned char *)audiobufend_lds;
if(MEMORYSIZE==64 && probed_ramsize!=64)
{
@@ -92,7 +92,6 @@ static volatile int lock;
* Note that this does not modify the buffer position (buffer_release_buffer()
* does), so call this if you want to aquire temporary memory
**/
-#define _ALIGN (sizeof(char*))
void *buffer_get_buffer(size_t *size)
{
if (lock)