diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/buffer.c | 7 | ||||
-rw-r--r-- | firmware/export/audio.h | 2 |
2 files changed, 4 insertions, 5 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) |
35 | extern unsigned char *audiobufend_lds[]; | 35 | extern unsigned char *audiobufend_lds[]; |
36 | unsigned char *audiobufend; | 36 | unsigned 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*)) | ||
96 | void *buffer_get_buffer(size_t *size) | 95 | void *buffer_get_buffer(size_t *size) |
97 | { | 96 | { |
98 | if (lock) | 97 | 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 | |||
193 | }; | 193 | }; |
194 | 194 | ||
195 | /* audio recording functions */ | 195 | /* audio recording functions */ |
196 | void audio_init_recording(unsigned int buffer_offset); | 196 | void audio_init_recording(void); |
197 | void audio_close_recording(void); | 197 | void audio_close_recording(void); |
198 | void audio_record(const char *filename); | 198 | void audio_record(const char *filename); |
199 | void audio_stop_recording(void); | 199 | void audio_stop_recording(void); |