summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThom Johansen <thomj@rockbox.org>2006-02-01 09:48:47 +0000
committerThom Johansen <thomj@rockbox.org>2006-02-01 09:48:47 +0000
commit7df51ada07d4b120aed8fe5c17b58cb7c626a789 (patch)
treec214bc82be139f49e33809e36edf8e42dc67bf71
parentb106e010d5974e6e8812028f967a29692e52632d (diff)
downloadrockbox-7df51ada07d4b120aed8fe5c17b58cb7c626a789.tar.gz
rockbox-7df51ada07d4b120aed8fe5c17b58cb7c626a789.zip
Changed meaning of shift parameter to include the EMAC implicit shift
factor. ARM version is already fixed. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8520 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/eq.h4
-rw-r--r--apps/eq_cf.S1
2 files changed, 3 insertions, 2 deletions
diff --git a/apps/eq.h b/apps/eq.h
index c4eb5f16c0..f29d765325 100644
--- a/apps/eq.h
+++ b/apps/eq.h
@@ -23,8 +23,8 @@
23/* These depend on the fixed point formats used by the different filter types 23/* These depend on the fixed point formats used by the different filter types
24 and need to be changed when they change. 24 and need to be changed when they change.
25 */ 25 */
26#define EQ_PEAK_SHIFT 3 26#define EQ_PEAK_SHIFT 4
27#define EQ_SHELF_SHIFT 7 27#define EQ_SHELF_SHIFT 8
28 28
29struct eqfilter { 29struct eqfilter {
30 long coefs[5]; /* Order is b0, b1, b2, a1, a2 */ 30 long coefs[5]; /* Order is b0, b1, b2, a1, a2 */
diff --git a/apps/eq_cf.S b/apps/eq_cf.S
index 0a34d7707e..f2440c2bdd 100644
--- a/apps/eq_cf.S
+++ b/apps/eq_cf.S
@@ -24,6 +24,7 @@ eq_filter:
24 movem.l %d2-%d7/%a2-%a6, (%sp) | save clobbered regs 24 movem.l %d2-%d7/%a2-%a6, (%sp) | save clobbered regs
25 move.l (11*4+8, %sp), %a5 | fetch filter structure address 25 move.l (11*4+8, %sp), %a5 | fetch filter structure address
26 movem.l (11*4+16, %sp), %d6-%d7 | load num. channels and shift count 26 movem.l (11*4+16, %sp), %d6-%d7 | load num. channels and shift count
27 subq.l #1, %d7 | EMAC gives us one free shift
27 movem.l (%a5), %a0-%a4 | load coefs 28 movem.l (%a5), %a0-%a4 | load coefs
28 lea.l (5*4, %a5), %a5 | point to filter history 29 lea.l (5*4, %a5), %a5 | point to filter history
29 30