diff options
author | Karl Kurbjun <kkurbjun@gmail.com> | 2007-10-13 14:53:34 +0000 |
---|---|---|
committer | Karl Kurbjun <kkurbjun@gmail.com> | 2007-10-13 14:53:34 +0000 |
commit | b7a4e101cb1bc8b01a1e6182939a33919814664f (patch) | |
tree | 752aeda80de82349a6215695b94105ce664e721f /firmware/target/arm/tms320dm320 | |
parent | c9d1ab721870b622a3698cd9b1ee9c451fabf85a (diff) | |
download | rockbox-b7a4e101cb1bc8b01a1e6182939a33919814664f.tar.gz rockbox-b7a4e101cb1bc8b01a1e6182939a33919814664f.zip |
M:Robe - Fix compilation and remove some warnings
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15095 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target/arm/tms320dm320')
6 files changed, 39 insertions, 34 deletions
diff --git a/firmware/target/arm/tms320dm320/crt0.S b/firmware/target/arm/tms320dm320/crt0.S index 7ff659d77c..68c0d9e1c5 100755 --- a/firmware/target/arm/tms320dm320/crt0.S +++ b/firmware/target/arm/tms320dm320/crt0.S | |||
@@ -66,7 +66,6 @@ start: | |||
66 | bhi 1b | 66 | bhi 1b |
67 | #endif | 67 | #endif |
68 | #if 1 | 68 | #if 1 |
69 | |||
70 | /* Copy the IRAM */ | 69 | /* Copy the IRAM */ |
71 | ldr r2, =_iramcopy | 70 | ldr r2, =_iramcopy |
72 | ldr r3, =_iramstart | 71 | ldr r3, =_iramstart |
@@ -112,15 +111,14 @@ start: | |||
112 | /* Switch to supervisor mode (no IRQ) */ | 111 | /* Switch to supervisor mode (no IRQ) */ |
113 | msr cpsr_c, #0xd3 | 112 | msr cpsr_c, #0xd3 |
114 | ldr sp, =stackend | 113 | ldr sp, =stackend |
115 | 114 | ||
116 | #ifdef BOOTLOADER | 115 | #ifdef BOOTLOADER |
117 | /* get the high part of our execute address */ | 116 | /* get the high part of our execute address */ |
118 | ldr r2, =0xffffff00 | 117 | ldr r2, =0xffffff00 |
119 | and r4, pc, r2 | 118 | and r4, pc, r2 |
120 | 119 | ||
121 | /* Copy bootloader to safe area - 0x01900000 */ | 120 | /* Copy bootloader to safe area - 0x01900000 */ |
122 | mov r5, #0x00900000 | 121 | mov r5, #0x01900000 |
123 | add r5, r5, #0x01000000 | ||
124 | ldr r6, = _dataend | 122 | ldr r6, = _dataend |
125 | sub r0, r6, r5 /* length of loader */ | 123 | sub r0, r6, r5 /* length of loader */ |
126 | add r0, r4, r0 /* r0 points to start of loader */ | 124 | add r0, r4, r0 /* r0 points to start of loader */ |
diff --git a/firmware/target/arm/tms320dm320/i2c-dm320.c b/firmware/target/arm/tms320dm320/i2c-dm320.c index f1383fee05..4ca5eb7118 100755 --- a/firmware/target/arm/tms320dm320/i2c-dm320.c +++ b/firmware/target/arm/tms320dm320/i2c-dm320.c | |||
@@ -19,14 +19,15 @@ | |||
19 | #include "system.h" | 19 | #include "system.h" |
20 | #include "i2c-dm320.h" | 20 | #include "i2c-dm320.h" |
21 | 21 | ||
22 | #if 0 | ||
22 | static int i2c_getack(void) | 23 | static int i2c_getack(void) |
23 | { | 24 | { |
24 | 25 | return 0; | |
25 | } | 26 | } |
26 | 27 | ||
27 | static int i2c_start(void) | 28 | static int i2c_start(void) |
28 | { | 29 | { |
29 | 30 | return 0; | |
30 | } | 31 | } |
31 | 32 | ||
32 | static void i2c_stop(void) | 33 | static void i2c_stop(void) |
@@ -36,12 +37,16 @@ static void i2c_stop(void) | |||
36 | 37 | ||
37 | static int i2c_outb(unsigned char byte) | 38 | static int i2c_outb(unsigned char byte) |
38 | { | 39 | { |
39 | 40 | (void) byte; | |
41 | return 0; | ||
40 | } | 42 | } |
43 | #endif | ||
41 | 44 | ||
42 | void i2c_write(int addr, const unsigned char *buf, int count) | 45 | void i2c_write(int addr, const unsigned char *buf, int count) |
43 | { | 46 | { |
44 | 47 | (void) addr; | |
48 | (void) buf; | ||
49 | (void) count; | ||
45 | } | 50 | } |
46 | 51 | ||
47 | void i2c_init(void) | 52 | void i2c_init(void) |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c index c30422fc79..21ef7f8534 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include "backlight-target.h" | 30 | #include "backlight-target.h" |
31 | #include "uart-target.h" | 31 | #include "uart-target.h" |
32 | #include "tsc2100.h" | 32 | #include "tsc2100.h" |
33 | #include "string.h" | ||
33 | 34 | ||
34 | #define BUTTON_TIMEOUT 50 | 35 | #define BUTTON_TIMEOUT 50 |
35 | 36 | ||
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c index a41c2333ab..eab0c0a954 100755 --- a/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c | |||
@@ -37,3 +37,8 @@ void audiohw_init(void) | |||
37 | void audiohw_close(void) | 37 | void audiohw_close(void) |
38 | { | 38 | { |
39 | } | 39 | } |
40 | |||
41 | void audiohw_mute(bool mute) | ||
42 | { | ||
43 | (void) mute; | ||
44 | } | ||
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c index aad7733154..8660058b18 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | |||
@@ -147,7 +147,7 @@ void lcd_yuv_blit(unsigned char * const src[3], | |||
147 | { | 147 | { |
148 | /* Caches for chroma data so it only need be recaculated every other | 148 | /* Caches for chroma data so it only need be recaculated every other |
149 | line */ | 149 | line */ |
150 | unsigned char chroma_buf[LCD_HEIGHT/2*3]; /* 480 bytes */ | 150 | /* unsigned char chroma_buf[LCD_HEIGHT/2*3];*/ /* 480 bytes */ |
151 | unsigned char const * yuv_src[3]; | 151 | unsigned char const * yuv_src[3]; |
152 | off_t z; | 152 | off_t z; |
153 | 153 | ||
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c index 3bc9124674..810fedc063 100755 --- a/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c | |||
@@ -16,7 +16,6 @@ | |||
16 | * KIND, either express or implied. | 16 | * KIND, either express or implied. |
17 | * | 17 | * |
18 | ****************************************************************************/ | 18 | ****************************************************************************/ |
19 | #include <stdlib.h> | ||
20 | #include "system.h" | 19 | #include "system.h" |
21 | #include "kernel.h" | 20 | #include "kernel.h" |
22 | #include "logf.h" | 21 | #include "logf.h" |
@@ -24,30 +23,36 @@ | |||
24 | #include "sound.h" | 23 | #include "sound.h" |
25 | #include "file.h" | 24 | #include "file.h" |
26 | 25 | ||
27 | static void _pcm_apply_settings(void) | 26 | void pcm_postinit(void) |
28 | { | 27 | { |
29 | } | ||
30 | 28 | ||
31 | void pcm_apply_settings(void) | ||
32 | { | ||
33 | } | 29 | } |
34 | 30 | ||
35 | void pcm_init(void) | 31 | const void * pcm_play_dma_get_peak_buffer(int *count) |
36 | { | 32 | { |
33 | (void) count; | ||
34 | return 0; | ||
37 | } | 35 | } |
38 | 36 | ||
39 | void pcm_postinit(void) | 37 | void pcm_play_dma_init(void) |
40 | { | 38 | { |
39 | |||
41 | } | 40 | } |
42 | 41 | ||
43 | void pcm_play_dma_start(const void *addr, size_t size) | 42 | void pcm_apply_settings(void) |
44 | { | 43 | { |
45 | 44 | ||
46 | } | 45 | } |
47 | 46 | ||
48 | static void pcm_play_dma_stop_fiq(void) | 47 | void pcm_set_frequency(unsigned int frequency) |
49 | { | 48 | { |
49 | (void) frequency; | ||
50 | } | ||
50 | 51 | ||
52 | void pcm_play_dma_start(const void *addr, size_t size) | ||
53 | { | ||
54 | (void) addr; | ||
55 | (void) size; | ||
51 | } | 56 | } |
52 | 57 | ||
53 | void pcm_play_dma_stop(void) | 58 | void pcm_play_dma_stop(void) |
@@ -55,31 +60,22 @@ void pcm_play_dma_stop(void) | |||
55 | 60 | ||
56 | } | 61 | } |
57 | 62 | ||
58 | void pcm_play_pause_pause(void) | 63 | void pcm_play_lock(void) |
59 | { | 64 | { |
60 | } | ||
61 | 65 | ||
62 | void pcm_play_pause_unpause(void) | ||
63 | { | ||
64 | } | 66 | } |
65 | 67 | ||
66 | void pcm_set_frequency(unsigned int frequency) | 68 | void pcm_play_unlock(void) |
67 | { | 69 | { |
68 | } | ||
69 | 70 | ||
70 | size_t pcm_get_bytes_waiting(void) | ||
71 | { | ||
72 | } | 71 | } |
73 | 72 | ||
74 | void pcm_mute(bool mute) | 73 | void pcm_play_dma_pause(bool pause) |
75 | { | 74 | { |
75 | (void) pause; | ||
76 | } | 76 | } |
77 | 77 | ||
78 | /** | 78 | size_t pcm_get_bytes_waiting(void) |
79 | * Return playback peaks - Peaks ahead in the DMA buffer based upon the | ||
80 | * calling period to attempt to compensate for | ||
81 | * delay. | ||
82 | */ | ||
83 | void pcm_calculate_peaks(int *left, int *right) | ||
84 | { | 79 | { |
85 | } /* pcm_calculate_peaks */ | 80 | return 0; |
81 | } | ||