From b7a4e101cb1bc8b01a1e6182939a33919814664f Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Sat, 13 Oct 2007 14:53:34 +0000 Subject: M:Robe - Fix compilation and remove some warnings git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15095 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/tms320dm320/crt0.S | 6 +-- firmware/target/arm/tms320dm320/i2c-dm320.c | 13 ++++-- .../arm/tms320dm320/mrobe-500/button-mr500.c | 1 + .../arm/tms320dm320/mrobe-500/dm320codec-mr500.c | 5 +++ .../target/arm/tms320dm320/mrobe-500/lcd-mr500.c | 2 +- .../target/arm/tms320dm320/mrobe-500/pcm-mr500.c | 46 ++++++++++------------ 6 files changed, 39 insertions(+), 34 deletions(-) (limited to 'firmware/target/arm') 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: bhi 1b #endif #if 1 - /* Copy the IRAM */ ldr r2, =_iramcopy ldr r3, =_iramstart @@ -112,15 +111,14 @@ start: /* Switch to supervisor mode (no IRQ) */ msr cpsr_c, #0xd3 ldr sp, =stackend - + #ifdef BOOTLOADER /* get the high part of our execute address */ ldr r2, =0xffffff00 and r4, pc, r2 /* Copy bootloader to safe area - 0x01900000 */ - mov r5, #0x00900000 - add r5, r5, #0x01000000 + mov r5, #0x01900000 ldr r6, = _dataend sub r0, r6, r5 /* length of loader */ 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 @@ #include "system.h" #include "i2c-dm320.h" +#if 0 static int i2c_getack(void) { - + return 0; } static int i2c_start(void) { - + return 0; } static void i2c_stop(void) @@ -36,12 +37,16 @@ static void i2c_stop(void) static int i2c_outb(unsigned char byte) { - + (void) byte; + return 0; } +#endif void i2c_write(int addr, const unsigned char *buf, int count) { - + (void) addr; + (void) buf; + (void) count; } 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 @@ #include "backlight-target.h" #include "uart-target.h" #include "tsc2100.h" +#include "string.h" #define BUTTON_TIMEOUT 50 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) void audiohw_close(void) { } + +void audiohw_mute(bool mute) +{ + (void) mute; +} 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], { /* Caches for chroma data so it only need be recaculated every other line */ - unsigned char chroma_buf[LCD_HEIGHT/2*3]; /* 480 bytes */ +/* unsigned char chroma_buf[LCD_HEIGHT/2*3];*/ /* 480 bytes */ unsigned char const * yuv_src[3]; off_t z; 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 @@ * KIND, either express or implied. * ****************************************************************************/ -#include #include "system.h" #include "kernel.h" #include "logf.h" @@ -24,30 +23,36 @@ #include "sound.h" #include "file.h" -static void _pcm_apply_settings(void) +void pcm_postinit(void) { -} -void pcm_apply_settings(void) -{ } -void pcm_init(void) +const void * pcm_play_dma_get_peak_buffer(int *count) { + (void) count; + return 0; } -void pcm_postinit(void) +void pcm_play_dma_init(void) { + } -void pcm_play_dma_start(const void *addr, size_t size) +void pcm_apply_settings(void) { } -static void pcm_play_dma_stop_fiq(void) +void pcm_set_frequency(unsigned int frequency) { + (void) frequency; +} +void pcm_play_dma_start(const void *addr, size_t size) +{ + (void) addr; + (void) size; } void pcm_play_dma_stop(void) @@ -55,31 +60,22 @@ void pcm_play_dma_stop(void) } -void pcm_play_pause_pause(void) +void pcm_play_lock(void) { -} -void pcm_play_pause_unpause(void) -{ } -void pcm_set_frequency(unsigned int frequency) +void pcm_play_unlock(void) { -} -size_t pcm_get_bytes_waiting(void) -{ } -void pcm_mute(bool mute) +void pcm_play_dma_pause(bool pause) { + (void) pause; } -/** - * Return playback peaks - Peaks ahead in the DMA buffer based upon the - * calling period to attempt to compensate for - * delay. - */ -void pcm_calculate_peaks(int *left, int *right) +size_t pcm_get_bytes_waiting(void) { -} /* pcm_calculate_peaks */ + return 0; +} -- cgit v1.2.3