summaryrefslogtreecommitdiff
path: root/apps/beep.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-02-23 08:14:46 -0500
committerMichael Sevakis <jethead71@rockbox.org>2012-03-03 07:23:38 +0100
commit286a4c5caa1945c8d1cb365a3d90fb09d5700cb2 (patch)
tree4835f46d16ec78d035ec9f49333079fe618384c1 /apps/beep.c
parent3f82f3aca14eb954e55f761721ffdd2684f0e812 (diff)
downloadrockbox-286a4c5caa1945c8d1cb365a3d90fb09d5700cb2.tar.gz
rockbox-286a4c5caa1945c8d1cb365a3d90fb09d5700cb2.zip
Revise the PCM callback system after adding multichannel audio.
Additional status callback is added to pcm_play/rec_data instead of using a special function to set it. Status includes DMA error reporting to the status callback. Playback and recording callback become more alike except playback uses "const void **addr" (because the data should not be altered) and recording uses "void **addr". "const" is put in place throughout where appropriate. Most changes are fairly trivial. One that should be checked in particular because it isn't so much is telechips, if anyone cares to bother. PP5002 is not so trivial either but that tested as working. Change-Id: I4928d69b3b3be7fb93e259f81635232df9bd1df2 Reviewed-on: http://gerrit.rockbox.org/166 Reviewed-by: Michael Sevakis <jethead71@rockbox.org> Tested-by: Michael Sevakis <jethead71@rockbox.org>
Diffstat (limited to 'apps/beep.c')
-rw-r--r--apps/beep.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/beep.c b/apps/beep.c
index d3345afdf9..3b02e5d8a3 100644
--- a/apps/beep.c
+++ b/apps/beep.c
@@ -46,7 +46,7 @@ static int16_t beep_buf[BEEP_BUF_COUNT*2] IBSS_ATTR __attribute__((aligned(4)));
46/* Callback to generate the beep frames - also don't want inlining of 46/* Callback to generate the beep frames - also don't want inlining of
47 call below in beep_play */ 47 call below in beep_play */
48static void __attribute__((noinline)) 48static void __attribute__((noinline))
49beep_get_more(unsigned char **start, size_t *size) 49beep_get_more(const void **start, size_t *size)
50{ 50{
51 int count = beep_count; 51 int count = beep_count;
52 52
@@ -87,7 +87,7 @@ void beep_play(unsigned int frequency, unsigned int duration,
87#endif 87#endif
88 88
89 /* If it fits - avoid cb overhead */ 89 /* If it fits - avoid cb overhead */
90 unsigned char *start; 90 const void *start;
91 size_t size; 91 size_t size;
92 92
93 /* Generate first frame here */ 93 /* Generate first frame here */