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.tar.gz
rockbox-8a701e5488989944f120f0c37848de24fbeff455.zip
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 2168087bd9..e0496fe149 100644
--- a/firmware/buffer.c
+++ b/firmware/buffer.c
@@ -31,7 +31,7 @@
31 31
32/* defined in linker script */ 32/* defined in linker script */
33#if (CONFIG_PLATFORM & PLATFORM_NATIVE) 33#if (CONFIG_PLATFORM & PLATFORM_NATIVE)
34#if defined(IPOD_VIDEO) 34#if defined(IPOD_VIDEO) && !defined(BOOTLOADER)
35extern unsigned char *audiobufend_lds[]; 35extern unsigned char *audiobufend_lds[];
36unsigned char *audiobufend; 36unsigned char *audiobufend;
37#else /* !IPOD_VIDEO */ 37#else /* !IPOD_VIDEO */
@@ -68,8 +68,8 @@ void buffer_init(void)
68{ 68{
69 /* 32-bit aligned */ 69 /* 32-bit aligned */
70 audiobuf = (void *)(((unsigned long)audiobuffer + 3) & ~3); 70 audiobuf = (void *)(((unsigned long)audiobuffer + 3) & ~3);
71 71
72#if defined(IPOD_VIDEO) 72#if defined(IPOD_VIDEO) && !defined(BOOTLOADER) && !defined(SIMULATOR)
73 audiobufend=(unsigned char *)audiobufend_lds; 73 audiobufend=(unsigned char *)audiobufend_lds;
74 if(MEMORYSIZE==64 && probed_ramsize!=64) 74 if(MEMORYSIZE==64 && probed_ramsize!=64)
75 { 75 {
@@ -92,7 +92,6 @@ static volatile int lock;
92 * Note that this does not modify the buffer position (buffer_release_buffer() 92 * Note that this does not modify the buffer position (buffer_release_buffer()
93 * does), so call this if you want to aquire temporary memory 93 * does), so call this if you want to aquire temporary memory
94 **/ 94 **/
95#define _ALIGN (sizeof(char*))
96void *buffer_get_buffer(size_t *size) 95void *buffer_get_buffer(size_t *size)
97{ 96{
98 if (lock) 97 if (lock)