From 8a701e5488989944f120f0c37848de24fbeff455 Mon Sep 17 00:00:00 2001 From: Thomas Martitz Date: Sun, 14 Aug 2011 15:37:05 +0000 Subject: 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 --- firmware/buffer.c | 7 +++---- firmware/export/audio.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'firmware') diff --git a/firmware/buffer.c b/firmware/buffer.c index 2168087bd9..e0496fe149 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) diff --git a/firmware/export/audio.h b/firmware/export/audio.h index 6757bf143b..2835d8f4c4 100644 --- a/firmware/export/audio.h +++ b/firmware/export/audio.h @@ -193,7 +193,7 @@ struct audio_recording_options }; /* audio recording functions */ -void audio_init_recording(unsigned int buffer_offset); +void audio_init_recording(void); void audio_close_recording(void); void audio_record(const char *filename); void audio_stop_recording(void); -- cgit v1.2.3