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 | |
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
-rw-r--r-- | firmware/app.lds | 2 | ||||
-rw-r--r-- | firmware/boot.lds | 19 | ||||
-rw-r--r-- | firmware/export/config-mrobe500.h | 3 | ||||
-rw-r--r-- | firmware/export/config.h | 3 | ||||
-rw-r--r-- | firmware/rolo.c | 12 | ||||
-rwxr-xr-x | firmware/target/arm/tms320dm320/crt0.S | 6 | ||||
-rwxr-xr-x | firmware/target/arm/tms320dm320/i2c-dm320.c | 13 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/button-mr500.c | 1 | ||||
-rwxr-xr-x | firmware/target/arm/tms320dm320/mrobe-500/dm320codec-mr500.c | 5 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/lcd-mr500.c | 2 | ||||
-rwxr-xr-x | firmware/target/arm/tms320dm320/mrobe-500/pcm-mr500.c | 46 |
11 files changed, 59 insertions, 53 deletions
diff --git a/firmware/app.lds b/firmware/app.lds index 67a75231dd..a95d871def 100644 --- a/firmware/app.lds +++ b/firmware/app.lds | |||
@@ -165,7 +165,7 @@ SECTIONS | |||
165 | *(.dmabuf) | 165 | *(.dmabuf) |
166 | } >IRAM0 AT> DRAM | 166 | } >IRAM0 AT> DRAM |
167 | #elif CONFIG_CPU==DM320 | 167 | #elif CONFIG_CPU==DM320 |
168 | } AT> IRAM | 168 | } > IRAM AT> DRAM |
169 | #else | 169 | #else |
170 | } AT> DRAM | 170 | } AT> DRAM |
171 | #endif | 171 | #endif |
diff --git a/firmware/boot.lds b/firmware/boot.lds index dcc92deb8e..a8404134ae 100644 --- a/firmware/boot.lds +++ b/firmware/boot.lds | |||
@@ -104,7 +104,7 @@ SECTIONS | |||
104 | *(.text*) | 104 | *(.text*) |
105 | } | 105 | } |
106 | 106 | ||
107 | .data : { | 107 | .data : { |
108 | *(.icode) | 108 | *(.icode) |
109 | *(.irodata) | 109 | *(.irodata) |
110 | *(.idata) | 110 | *(.idata) |
@@ -173,6 +173,8 @@ SECTIONS | |||
173 | . = DRAMORIG + 0x1000000; | 173 | . = DRAMORIG + 0x1000000; |
174 | 174 | ||
175 | .text : { | 175 | .text : { |
176 | loadaddress = .; | ||
177 | _loadaddress = .; | ||
176 | *(.init.text) | 178 | *(.init.text) |
177 | *(.text*) | 179 | *(.text*) |
178 | *(.glue_7) | 180 | *(.glue_7) |
@@ -199,7 +201,7 @@ SECTIONS | |||
199 | *(.data*) | 201 | *(.data*) |
200 | . = ALIGN(0x4); | 202 | . = ALIGN(0x4); |
201 | _dataend = . ; | 203 | _dataend = . ; |
202 | } >DRAM | 204 | } > DRAM |
203 | 205 | ||
204 | .stack : | 206 | .stack : |
205 | { | 207 | { |
@@ -209,27 +211,26 @@ SECTIONS | |||
209 | . += 0x2000; | 211 | . += 0x2000; |
210 | _stackend = .; | 212 | _stackend = .; |
211 | stackend = .; | 213 | stackend = .; |
212 | } >DRAM | 214 | } > DRAM |
213 | 215 | ||
214 | .bss : { | 216 | .bss : |
217 | { | ||
215 | _edata = .; | 218 | _edata = .; |
216 | *(.bss*); | 219 | *(.bss*); |
217 | *(.ibss); | 220 | *(.ibss); |
218 | *(COMMON) | 221 | *(COMMON) |
219 | _end = .; | 222 | _end = .; |
220 | }>DRAM | 223 | } > DRAM |
221 | 224 | ||
222 | .vectors 0x0 : | 225 | .vectors IRAMORIG : |
223 | { | 226 | { |
224 | loadaddress = .; | ||
225 | _loadaddress = .; | ||
226 | _vectorsstart = .; | 227 | _vectorsstart = .; |
227 | KEEP(*(.resetvectors)); | 228 | KEEP(*(.resetvectors)); |
228 | *(.resetvectors); | 229 | *(.resetvectors); |
229 | KEEP(*(.vectors)); | 230 | KEEP(*(.vectors)); |
230 | *(.vectors); | 231 | *(.vectors); |
231 | _vectorsend = .; | 232 | _vectorsend = .; |
232 | } AT> DRAM | 233 | } AT > DRAM |
233 | _vectorscopy = LOADADDR(.vectors); | 234 | _vectorscopy = LOADADDR(.vectors); |
234 | } | 235 | } |
235 | #elif (CONFIG_CPU==IMX31L) | 236 | #elif (CONFIG_CPU==IMX31L) |
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index 328797c79e..cd83c5aa4d 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h | |||
@@ -22,6 +22,8 @@ | |||
22 | */ | 22 | */ |
23 | #define TARGET_TREE /* this target is using the target tree system */ | 23 | #define TARGET_TREE /* this target is using the target tree system */ |
24 | 24 | ||
25 | #define CPU_ARM | ||
26 | |||
25 | #define CONFIG_SDRAM_START 0x00900000 | 27 | #define CONFIG_SDRAM_START 0x00900000 |
26 | 28 | ||
27 | #define OLYMPUS_MROBE_500 1 | 29 | #define OLYMPUS_MROBE_500 1 |
@@ -132,7 +134,6 @@ | |||
132 | #define CONFIG_LCD LCD_MROBE500 | 134 | #define CONFIG_LCD LCD_MROBE500 |
133 | 135 | ||
134 | /* define this if the backlight can be set to a brightness */ | 136 | /* define this if the backlight can be set to a brightness */ |
135 | #define HAVE_BACKLIGHT_SET_FADING | ||
136 | #define __BACKLIGHT_INIT | 137 | #define __BACKLIGHT_INIT |
137 | 138 | ||
138 | /* Offset ( in the firmware file's header ) to the file CRC */ | 139 | /* Offset ( in the firmware file's header ) to the file CRC */ |
diff --git a/firmware/export/config.h b/firmware/export/config.h index 7c55ee88a3..46d4336e70 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
@@ -307,8 +307,7 @@ | |||
307 | 307 | ||
308 | /* define for all cpus from ARM family */ | 308 | /* define for all cpus from ARM family */ |
309 | #if defined(CPU_PP) || (CONFIG_CPU == PNX0101) || (CONFIG_CPU == S3C2440) \ | 309 | #if defined(CPU_PP) || (CONFIG_CPU == PNX0101) || (CONFIG_CPU == S3C2440) \ |
310 | || (CONFIG_CPU == TMS320DSC25) || (CONFIG_CPU == DM320) \ | 310 | || (CONFIG_CPU == TMS320DSC25) || (CONFIG_CPU == IMX31L) |
311 | || (CONFIG_CPU == IMX31L) | ||
312 | #define CPU_ARM | 311 | #define CPU_ARM |
313 | #endif | 312 | #endif |
314 | 313 | ||
diff --git a/firmware/rolo.c b/firmware/rolo.c index 9f9af40d39..fa1748341b 100644 --- a/firmware/rolo.c +++ b/firmware/rolo.c | |||
@@ -183,7 +183,7 @@ int rolo_load(const char* filename) | |||
183 | { | 183 | { |
184 | int fd; | 184 | int fd; |
185 | long length; | 185 | long length; |
186 | #if defined(CPU_COLDFIRE) || defined(CPU_PP) | 186 | #if defined(CPU_COLDFIRE) || defined(CPU_ARM) |
187 | #if !defined(MI4_FORMAT) | 187 | #if !defined(MI4_FORMAT) |
188 | int i; | 188 | int i; |
189 | #endif | 189 | #endif |
@@ -215,7 +215,7 @@ int rolo_load(const char* filename) | |||
215 | 215 | ||
216 | length = filesize(fd) - FIRMWARE_OFFSET_FILE_DATA; | 216 | length = filesize(fd) - FIRMWARE_OFFSET_FILE_DATA; |
217 | 217 | ||
218 | #if defined(CPU_COLDFIRE) || defined(CPU_PP) | 218 | #if defined(CPU_COLDFIRE) || defined(CPU_PP) || (CONFIG_CPU==DM320) |
219 | /* Read and save checksum */ | 219 | /* Read and save checksum */ |
220 | lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET); | 220 | lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET); |
221 | if (read(fd, &file_checksum, 4) != 4) { | 221 | if (read(fd, &file_checksum, 4) != 4) { |
@@ -251,7 +251,7 @@ int rolo_load(const char* filename) | |||
251 | checksum = chksum_crc32 (audiobuf, length); | 251 | checksum = chksum_crc32 (audiobuf, length); |
252 | #else | 252 | #else |
253 | checksum = MODEL_NUMBER; | 253 | checksum = MODEL_NUMBER; |
254 | 254 | ||
255 | for(i = 0;i < length;i++) { | 255 | for(i = 0;i < length;i++) { |
256 | checksum += audiobuf[i]; | 256 | checksum += audiobuf[i]; |
257 | } | 257 | } |
@@ -282,7 +282,7 @@ int rolo_load(const char* filename) | |||
282 | rolo_error("File length mismatch"); | 282 | rolo_error("File length mismatch"); |
283 | return -1; | 283 | return -1; |
284 | } | 284 | } |
285 | 285 | ||
286 | /* Read and save checksum */ | 286 | /* Read and save checksum */ |
287 | lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET); | 287 | lseek(fd, FIRMWARE_OFFSET_FILE_CRC, SEEK_SET); |
288 | if (read(fd, &file_checksum, 2) != 2) { | 288 | if (read(fd, &file_checksum, 2) != 2) { |
@@ -306,7 +306,7 @@ int rolo_load(const char* filename) | |||
306 | lcd_update(); | 306 | lcd_update(); |
307 | 307 | ||
308 | checksum = descramble(audiobuf + length, audiobuf, length); | 308 | checksum = descramble(audiobuf + length, audiobuf, length); |
309 | 309 | ||
310 | /* Verify checksum against file header */ | 310 | /* Verify checksum against file header */ |
311 | if (checksum != file_checksum) { | 311 | if (checksum != file_checksum) { |
312 | rolo_error("Checksum Error"); | 312 | rolo_error("Checksum Error"); |
@@ -317,7 +317,7 @@ int rolo_load(const char* filename) | |||
317 | lcd_update(); | 317 | lcd_update(); |
318 | 318 | ||
319 | set_irq_level(HIGHEST_IRQ_LEVEL); | 319 | set_irq_level(HIGHEST_IRQ_LEVEL); |
320 | 320 | ||
321 | /* Calling these 2 initialization routines was necessary to get the | 321 | /* Calling these 2 initialization routines was necessary to get the |
322 | the origional Archos version of the firmware to load and execute. */ | 322 | the origional Archos version of the firmware to load and execute. */ |
323 | system_init(); /* Initialize system for restart */ | 323 | system_init(); /* Initialize system for restart */ |
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 | } | ||