diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2012-02-18 04:50:33 -0500 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2012-02-18 04:50:33 -0500 |
commit | 9a32a7b40442e54ee6d8e2403e0f9a154dc4c77f (patch) | |
tree | d5aac8ee6999c701c19e69a5f7391517c40216e3 /firmware/asm | |
parent | a794aaa38c9d40e4f0131cd11d8a41441dcd6c4f (diff) | |
download | rockbox-9a32a7b40442e54ee6d8e2403e0f9a154dc4c77f.tar.gz rockbox-9a32a7b40442e54ee6d8e2403e0f9a154dc4c77f.zip |
Split CPU-optimized beep code into the firmware/asm tree.
For now due to current lack of an apps/asm, place the ASM/generic code in the
firmware/asm directory.
Additionally, make generic beep code more generic.
Change-Id: I4a69b6ffcbb97d9e6dfde2209c5a118de19e5638
Diffstat (limited to 'firmware/asm')
-rw-r--r-- | firmware/asm/arm/beep.c | 39 | ||||
-rw-r--r-- | firmware/asm/beep.c | 51 | ||||
-rw-r--r-- | firmware/asm/m68k/beep.c | 42 |
3 files changed, 132 insertions, 0 deletions
diff --git a/firmware/asm/arm/beep.c b/firmware/asm/arm/beep.c new file mode 100644 index 0000000000..f3c3e2e0d2 --- /dev/null +++ b/firmware/asm/arm/beep.c | |||
@@ -0,0 +1,39 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (c) 2011 Michael Sevakis | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | /* Actually output samples into beep_buf */ | ||
23 | static FORCE_INLINE void beep_generate(uint32_t *out, int count, | ||
24 | int32_t *phase, uint32_t step, | ||
25 | uint32_t amplitude) | ||
26 | { | ||
27 | uint32_t s; | ||
28 | |||
29 | asm volatile ( | ||
30 | "1: \n" | ||
31 | "eor %3, %5, %1, asr #31 \n" | ||
32 | "subs %2, %2, #1 \n" | ||
33 | "str %3, [%0], #4 \n" | ||
34 | "add %1, %1, %4 \n" | ||
35 | "bgt 1b \n" | ||
36 | : "+r"(out), "+r"(*phase), "+r"(count), | ||
37 | "=&r"(s) | ||
38 | : "r"(step), "r"(amplitude)); | ||
39 | } | ||
diff --git a/firmware/asm/beep.c b/firmware/asm/beep.c new file mode 100644 index 0000000000..0314e32715 --- /dev/null +++ b/firmware/asm/beep.c | |||
@@ -0,0 +1,51 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (c) 2011 Michael Sevakis | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | #if defined(CPU_ARM) | ||
22 | #include "arm/beep.c" | ||
23 | #elif defined (CPU_COLDFIRE) | ||
24 | #include "m68k/beep.c" | ||
25 | #else /* Generic */ | ||
26 | |||
27 | static FORCE_INLINE void beep_generate(int16_t *out, int count, | ||
28 | uint32_t *phase, uint32_t step, | ||
29 | int16_t amplitude) | ||
30 | { | ||
31 | uint32_t ph = *phase; | ||
32 | |||
33 | do | ||
34 | { | ||
35 | int16_t amp = amplitude; | ||
36 | |||
37 | if (ph > UINT32_MAX / 2) | ||
38 | amp = -amp; | ||
39 | |||
40 | *out++ = amp; | ||
41 | *out++ = amp; | ||
42 | |||
43 | ph += step; | ||
44 | } | ||
45 | while (--count > 0); | ||
46 | |||
47 | *phase = ph; | ||
48 | } | ||
49 | |||
50 | #define BEEP_GENERIC | ||
51 | #endif /* CPU_* */ | ||
diff --git a/firmware/asm/m68k/beep.c b/firmware/asm/m68k/beep.c new file mode 100644 index 0000000000..5461a4ef20 --- /dev/null +++ b/firmware/asm/m68k/beep.c | |||
@@ -0,0 +1,42 @@ | |||
1 | /*************************************************************************** | ||
2 | * __________ __ ___. | ||
3 | * Open \______ \ ____ ____ | | _\_ |__ _______ ___ | ||
4 | * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ / | ||
5 | * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < < | ||
6 | * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \ | ||
7 | * \/ \/ \/ \/ \/ | ||
8 | * $Id$ | ||
9 | * | ||
10 | * Copyright (c) 2011 Michael Sevakis | ||
11 | * | ||
12 | * This program is free software; you can redistribute it and/or | ||
13 | * modify it under the terms of the GNU General Public License | ||
14 | * as published by the Free Software Foundation; either version 2 | ||
15 | * of the License, or (at your option) any later version. | ||
16 | * | ||
17 | * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY | ||
18 | * KIND, either express or implied. | ||
19 | * | ||
20 | ****************************************************************************/ | ||
21 | |||
22 | /* Actually output samples into beep_buf */ | ||
23 | static FORCE_INLINE void beep_generate(uint32_t *out, int count, | ||
24 | int32_t *phase, uint32_t step, | ||
25 | uint32_t amplitude) | ||
26 | { | ||
27 | uint32_t s; | ||
28 | |||
29 | asm volatile ( | ||
30 | "1: \n" | ||
31 | "move.l %1, %3 \n" | ||
32 | "add.l %4, %1 \n" | ||
33 | "add.l %3, %3 \n" | ||
34 | "subx.l %3, %3 \n" | ||
35 | "eor.l %5, %3 \n" | ||
36 | "move.l %3, (%0)+ \n" | ||
37 | "subq.l #1, %2 \n" | ||
38 | "bgt.b 1b \n" | ||
39 | : "+a"(out), "+d"(*phase), "+d"(count), | ||
40 | "=&d"(s) | ||
41 | : "r"(step), "d"(amplitude)); | ||
42 | } | ||