diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2009-03-03 18:05:22 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2009-03-03 18:05:22 +0000 |
commit | 096eb687a68c5ff90436ee0c65b2a1674813b633 (patch) | |
tree | 4242f97b91d2c925ac8d4d4ad9f4d2554e1fb3b7 /firmware/target/arm | |
parent | 1fb8242d968a3ee7091ef86db37b3e8f593eaeeb (diff) | |
download | rockbox-096eb687a68c5ff90436ee0c65b2a1674813b633.tar.gz rockbox-096eb687a68c5ff90436ee0c65b2a1674813b633.zip |
Get the volume controls working on the M:Robe 500 along with some minor code changes.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20194 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm')
-rwxr-xr-x | firmware/target/arm/tms320dm320/debug-dm320.c | 3 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/dsp/main.c | 21 |
2 files changed, 10 insertions, 14 deletions
diff --git a/firmware/target/arm/tms320dm320/debug-dm320.c b/firmware/target/arm/tms320dm320/debug-dm320.c index b630fe4795..db19a16a07 100755 --- a/firmware/target/arm/tms320dm320/debug-dm320.c +++ b/firmware/target/arm/tms320dm320/debug-dm320.c | |||
@@ -39,9 +39,6 @@ | |||
39 | bool __dbg_ports(void) | 39 | bool __dbg_ports(void) |
40 | { | 40 | { |
41 | dsp_init(); | 41 | dsp_init(); |
42 | #ifndef CREATIVE_ZVx | ||
43 | tsc2100_writereg(TSDACGAIN_PAGE, TSDACGAIN_ADDRESS, 0x2020/*x0303*/); | ||
44 | #endif | ||
45 | dsp_wake(); | 42 | dsp_wake(); |
46 | return false; | 43 | return false; |
47 | } | 44 | } |
diff --git a/firmware/target/arm/tms320dm320/dsp/main.c b/firmware/target/arm/tms320dm320/dsp/main.c index 57156e0451..ae2030a310 100644 --- a/firmware/target/arm/tms320dm320/dsp/main.c +++ b/firmware/target/arm/tms320dm320/dsp/main.c | |||
@@ -43,17 +43,6 @@ void main(void) { | |||
43 | 43 | ||
44 | debugf("DSP inited..."); | 44 | debugf("DSP inited..."); |
45 | 45 | ||
46 | #ifdef DATA_32_SINE | ||
47 | for (i = 0; i < 32; i++) { | ||
48 | double ratio = ((double)i)/32.0; | ||
49 | double rad = 3.0*3.141592*ratio; | ||
50 | double normal = sin(rad); | ||
51 | double scaled = 32767.0*(normal); | ||
52 | data[2*i + 0] = -(signed short)scaled; | ||
53 | data[2*i + 1] = (signed short)scaled; | ||
54 | } | ||
55 | #endif | ||
56 | |||
57 | for (;;) { | 46 | for (;;) { |
58 | asm(" IDLE 1"); | 47 | asm(" IDLE 1"); |
59 | asm(" NOP"); | 48 | asm(" NOP"); |
@@ -69,6 +58,16 @@ void main(void) { | |||
69 | memset((unsigned short *)0x7f80, 0, 0x80); | 58 | memset((unsigned short *)0x7f80, 0, 0x80); |
70 | #endif | 59 | #endif |
71 | 60 | ||
61 | #ifdef DATA_32_SINE | ||
62 | for (i = 0; i < 32; i++) { | ||
63 | double ratio = ((double)i)/32.0; | ||
64 | double rad = 3.0*3.141592*ratio; | ||
65 | double normal = sin(rad); | ||
66 | double scaled = 32767.0*(normal); | ||
67 | data[2*i + 0] = -(signed short)scaled; | ||
68 | data[2*i + 1] = (signed short)scaled; | ||
69 | } | ||
70 | #endif | ||
72 | 71 | ||
73 | #ifdef MANUAL_TRANSFER | 72 | #ifdef MANUAL_TRANSFER |
74 | register signed short *p; | 73 | register signed short *p; |