diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2012-02-19 00:33:04 -0500 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2012-02-19 00:38:58 -0500 |
commit | 9a25a6fe19bc798bb7d90ec63e3c54bd8c2892cd (patch) | |
tree | 5df4f8da2de3340b685346c38981e877fa970589 | |
parent | e5b1b0f998f9ac16dc4a5f6be73be535f22533e4 (diff) | |
download | rockbox-9a25a6fe19bc798bb7d90ec63e3c54bd8c2892cd.tar.gz rockbox-9a25a6fe19bc798bb7d90ec63e3c54bd8c2892cd.zip |
beep/mixer code: Code police a bit.
/firmware is in the #include path with makes #include "asm/beep.c" sufficient.
Add a comment to generic beep code and make another express intent better.
Change-Id: I587cd704478b894785927bdfe2e647e28614df62
-rw-r--r-- | apps/beep.c | 2 | ||||
-rw-r--r-- | firmware/asm/beep.c | 1 | ||||
-rw-r--r-- | firmware/pcm_mixer.c | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/apps/beep.c b/apps/beep.c index 79c7f1d2bc..d3345afdf9 100644 --- a/apps/beep.c +++ b/apps/beep.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #include "misc.h" | 27 | #include "misc.h" |
28 | 28 | ||
29 | /** Beep generation, CPU optimized **/ | 29 | /** Beep generation, CPU optimized **/ |
30 | #include "../firmware/asm/beep.c" | 30 | #include "asm/beep.c" |
31 | 31 | ||
32 | static uint32_t beep_phase; /* Phase of square wave generator */ | 32 | static uint32_t beep_phase; /* Phase of square wave generator */ |
33 | static uint32_t beep_step; /* Step of square wave generator on each sample */ | 33 | static uint32_t beep_step; /* Step of square wave generator on each sample */ |
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; |