summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCatalin Patulea <cat@vv.carleton.ca>2007-11-20 06:02:05 +0000
committerCatalin Patulea <cat@vv.carleton.ca>2007-11-20 06:02:05 +0000
commit4c4c9f27b608afa097731bdad1ac2c597c867349 (patch)
tree8383d8dbfe24d7a46ffe16ac9ecd786768db455c
parent0a4e217436c48b7a3c9f65efa0da3f741ec5835a (diff)
downloadrockbox-4c4c9f27b608afa097731bdad1ac2c597c867349.tar.gz
rockbox-4c4c9f27b608afa097731bdad1ac2c597c867349.zip
m:robe 500i: Fix DSP loader code
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15716 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/target/arm/tms320dm320/dsp-dm320.c7
-rw-r--r--firmware/target/arm/tms320dm320/dsp_image_helloworld.h1
2 files changed, 5 insertions, 3 deletions
diff --git a/firmware/target/arm/tms320dm320/dsp-dm320.c b/firmware/target/arm/tms320dm320/dsp-dm320.c
index 673182f3fc..24c0145a01 100644
--- a/firmware/target/arm/tms320dm320/dsp-dm320.c
+++ b/firmware/target/arm/tms320dm320/dsp-dm320.c
@@ -20,6 +20,7 @@
20#include "cpu.h" 20#include "cpu.h"
21#include "system.h" 21#include "system.h"
22#include "debug.h" 22#include "debug.h"
23#include "string.h"
23#include "dsp-target.h" 24#include "dsp-target.h"
24 25
25/* A "DSP image" is an array of these, terminated by raw_data_size_half = 0. */ 26/* A "DSP image" is an array of these, terminated by raw_data_size_half = 0. */
@@ -34,7 +35,6 @@ struct dsp_section {
34 35
35#ifdef DEBUG 36#ifdef DEBUG
36static void dsp_status(void) { 37static void dsp_status(void) {
37 unsigned short addr_7fff = DSP_(0x7fff);
38 unsigned short hpib_ctl = IO_DSPC_HPIB_CONTROL; 38 unsigned short hpib_ctl = IO_DSPC_HPIB_CONTROL;
39 unsigned short hpib_stat = IO_DSPC_HPIB_STATUS; 39 unsigned short hpib_stat = IO_DSPC_HPIB_STATUS;
40 char buffer1[80], buffer2[80]; 40 char buffer1[80], buffer2[80];
@@ -42,9 +42,10 @@ static void dsp_status(void) {
42 DEBUGF("dsp_status(): clkc_hpib=%u clkc_dsp=%u", 42 DEBUGF("dsp_status(): clkc_hpib=%u clkc_dsp=%u",
43 !!(IO_CLK_MOD0 & (1 << 11)), !!(IO_CLK_MOD0 & (1 << 10))); 43 !!(IO_CLK_MOD0 & (1 << 11)), !!(IO_CLK_MOD0 & (1 << 10)));
44 44
45 DEBUGF("dsp_status(): irq_dsphint=%u scratch_status=0x%04x" 45 DEBUGF("dsp_status(): irq_dsphint=%u 7fff=%04x scratch_status=%04x"
46 " acked=%04x", 46 " acked=%04x",
47 (IO_INTC_IRQ0 >> IRQ_DSPHINT) & 1, DSP_(_status), DSP_(_acked)); 47 (IO_INTC_IRQ0 >> IRQ_DSPHINT) & 1, DSP_(0x7fff), DSP_(_status),
48 DSP_(_acked));
48#define B(f,w,b,m) if ((w & (1 << b)) == 0) \ 49#define B(f,w,b,m) if ((w & (1 << b)) == 0) \
49 strcat(f, "!"); \ 50 strcat(f, "!"); \
50 strcat(f, #m "|"); 51 strcat(f, #m "|");
diff --git a/firmware/target/arm/tms320dm320/dsp_image_helloworld.h b/firmware/target/arm/tms320dm320/dsp_image_helloworld.h
index 2879fcef7c..6cd3352cea 100644
--- a/firmware/target/arm/tms320dm320/dsp_image_helloworld.h
+++ b/firmware/target/arm/tms320dm320/dsp_image_helloworld.h
@@ -26,5 +26,6 @@ static const struct dsp_section dsp_image_helloworld[] = {
26 26
27/* Symbol table, usable with the DSP_() macro (see dsp-target.h). */ 27/* Symbol table, usable with the DSP_() macro (see dsp-target.h). */
28#define _status 0x0000 28#define _status 0x0000
29#define _acked 0x0000
29 30
30#endif 31#endif