diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/asm/beep.c | 1 | ||||
-rw-r--r-- | firmware/pcm_mixer.c | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/firmware/asm/beep.c b/firmware/asm/beep.c index 0314e32715..d430dff14d 100644 --- a/firmware/asm/beep.c +++ b/firmware/asm/beep.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include "m68k/beep.c" | 24 | #include "m68k/beep.c" |
25 | #else /* Generic */ | 25 | #else /* Generic */ |
26 | 26 | ||
27 | /* Actually output samples into beep_buf */ | ||
27 | static FORCE_INLINE void beep_generate(int16_t *out, int count, | 28 | static FORCE_INLINE void beep_generate(int16_t *out, int count, |
28 | uint32_t *phase, uint32_t step, | 29 | uint32_t *phase, uint32_t step, |
29 | int16_t amplitude) | 30 | int16_t amplitude) |
diff --git a/firmware/pcm_mixer.c b/firmware/pcm_mixer.c index fcd9a1c4fd..4fd96bc97c 100644 --- a/firmware/pcm_mixer.c +++ b/firmware/pcm_mixer.c | |||
@@ -271,7 +271,9 @@ void mixer_channel_play_data(enum pcm_mixer_channel channel, | |||
271 | { | 271 | { |
272 | /* Initial buffer not passed - call the callback now */ | 272 | /* Initial buffer not passed - call the callback now */ |
273 | pcm_play_lock(); | 273 | pcm_play_lock(); |
274 | mixer_deactivate_channel(chan); /* Protect chan struct if active */ | 274 | mixer_deactivate_channel(chan); /* Protect chan struct if active; |
275 | may also be same callback which | ||
276 | must not be reentered */ | ||
275 | pcm_play_unlock(); /* Allow playback while doing callback */ | 277 | pcm_play_unlock(); /* Allow playback while doing callback */ |
276 | 278 | ||
277 | size = 0; | 279 | size = 0; |