From e25c1c6e43aafbbe6de077f142776da2e00c75cd Mon Sep 17 00:00:00 2001 From: Dave Chapman Date: Tue, 11 Nov 2008 14:46:13 +0000 Subject: Add more driver stubs to make the Fuze and e200v2 main builds compile; Correct the memory definition for the Fuze (8MB) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19090 a1c6a512-1295-4272-9138-f99709370657 --- firmware/target/arm/as3525/ata_sd_as3525.c | 24 +++++++++++ firmware/target/arm/as3525/pcm-as3525.c | 46 ++++++++++++++++++++++ .../target/arm/as3525/sansa-e200v2/lcd-e200v2.c | 5 +++ .../target/arm/as3525/sansa-e200v2/system-target.h | 2 + firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c | 33 +++++++++++++++- .../target/arm/as3525/sansa-fuze/system-target.h | 2 + firmware/target/arm/as3525/system-as3525.c | 16 ++++---- 7 files changed, 120 insertions(+), 8 deletions(-) (limited to 'firmware/target') diff --git a/firmware/target/arm/as3525/ata_sd_as3525.c b/firmware/target/arm/as3525/ata_sd_as3525.c index 828e025870..291b7cbef0 100644 --- a/firmware/target/arm/as3525/ata_sd_as3525.c +++ b/firmware/target/arm/as3525/ata_sd_as3525.c @@ -690,4 +690,28 @@ tCardInfo *card_get_info_target(int card_no) return &card; } +bool card_detect_target(void) +{ +#ifdef HAVE_HOTSWAP + /* TODO */ + return false; +#else + return false; +#endif +} + +#ifdef HAVE_HOTSWAP +void card_enable_monitoring_target(bool on) +{ + if (on) + { + /* TODO */ + } + else + { + /* TODO */ + } +} +#endif + #endif /* BOOTLOADER */ diff --git a/firmware/target/arm/as3525/pcm-as3525.c b/firmware/target/arm/as3525/pcm-as3525.c index e2c31ad047..d91450c9cf 100644 --- a/firmware/target/arm/as3525/pcm-as3525.c +++ b/firmware/target/arm/as3525/pcm-as3525.c @@ -74,3 +74,49 @@ const void * pcm_play_dma_get_peak_buffer(int *count) { return NULL; } + + +/**************************************************************************** + ** Recording DMA transfer + **/ +#ifdef HAVE_RECORDING +void pcm_rec_lock(void) +{ +} + +void pcm_rec_unlock(void) +{ +} + +void pcm_record_more(void *start, size_t size) +{ + (void)start; + (void)size; +} + +void pcm_rec_dma_stop(void) +{ +} + +void pcm_rec_dma_start(void *addr, size_t size) +{ + (void)addr; + (void)size; +} + +void pcm_rec_dma_close(void) +{ +} + + +void pcm_rec_dma_init(void) +{ +} + + +const void * pcm_rec_dma_get_peak_buffer(int *count) +{ + (void)count; +} + +#endif /* HAVE_RECORDING */ diff --git a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c index 7a5c1156ff..84ef108b62 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c +++ b/firmware/target/arm/as3525/sansa-e200v2/lcd-e200v2.c @@ -338,6 +338,11 @@ bool lcd_enabled(void) return display_on; } +void lcd_sleep(void) +{ + /* TODO */ +} + /*** update functions ***/ /* Performance function to blit a YUV bitmap directly to the LCD diff --git a/firmware/target/arm/as3525/sansa-e200v2/system-target.h b/firmware/target/arm/as3525/sansa-e200v2/system-target.h index b712d1c124..19ddd03b7c 100644 --- a/firmware/target/arm/as3525/sansa-e200v2/system-target.h +++ b/firmware/target/arm/as3525/sansa-e200v2/system-target.h @@ -24,5 +24,7 @@ #include "system-arm.h" #define CPUFREQ_MAX 250000000 +#define CPUFREQ_DEFAULT 250000000 +#define CPUFREQ_NORMAL 250000000 #endif /* SYSTEM_TARGET_H */ diff --git a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c index 36006beffb..dd6d4552e0 100644 --- a/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c +++ b/firmware/target/arm/as3525/sansa-fuze/lcd-fuze.c @@ -199,8 +199,9 @@ static void _display_on(void) } /* I'm guessing this function is lcd_enable, but it may not be... */ -void lcd_enable(int r0) +void lcd_enable(bool on) { + int r0 = on; #if 0 r4 = 0x1db12; [r4] = 1; @@ -249,6 +250,36 @@ void lcd_enable(int r0) #endif } +bool lcd_enabled(void) +{ + return display_on; +} + +void lcd_sleep(void) +{ + /* TODO */ +} + +/*** update functions ***/ + +/* Performance function to blit a YUV bitmap directly to the LCD + * src_x, src_y, width and height should be even + * x, y, width and height have to be within LCD bounds + */ +void lcd_blit_yuv(unsigned char * const src[3], + int src_x, int src_y, int stride, + int x, int y, int width, int height) +{ + (void)src; + (void)src_x; + (void)src_y; + (void)stride; + (void)x; + (void)y; + (void)width; + (void)height; +} + void lcd_init_device() { as3525_dbop_init(); diff --git a/firmware/target/arm/as3525/sansa-fuze/system-target.h b/firmware/target/arm/as3525/sansa-fuze/system-target.h index b712d1c124..553ce90846 100644 --- a/firmware/target/arm/as3525/sansa-fuze/system-target.h +++ b/firmware/target/arm/as3525/sansa-fuze/system-target.h @@ -24,5 +24,7 @@ #include "system-arm.h" #define CPUFREQ_MAX 250000000 +#define CPUFREQ_DEFAULT 250000000 +#define CPUFREQ_NORMAL 250000000 #endif /* SYSTEM_TARGET_H */ diff --git a/firmware/target/arm/as3525/system-as3525.c b/firmware/target/arm/as3525/system-as3525.c index 7653985d19..f42387d024 100644 --- a/firmware/target/arm/as3525/system-as3525.c +++ b/firmware/target/arm/as3525/system-as3525.c @@ -167,14 +167,16 @@ static void sdram_init(void) MPMC_DYNAMIC_tRRD = 2; MPMC_DYNAMIC_tMRD = 2; -#if defined(SANSA_CLIP) || defined(SANSA_M200V4) || defined(SANSA_FUZE) -# define MEMORY_MODEL 0x21 - /* 16 bits external bus, low power SDRAM, 16 Mbits = 2 Mbytes */ -#elif defined(SANSA_E200V2) -# define MEMORY_MODEL 0x5 - /* 16 bits external bus, high performance SDRAM, 64 Mbits = 8 Mbytes */ +#if defined(SANSA_CLIP) || defined(SANSA_M200V4) +/* 16 bits external bus, low power SDRAM, 16 Mbits = 2 Mbytes */ +#define MEMORY_MODEL 0x21 + +#elif defined(SANSA_E200V2) || defined(SANSA_FUZE) +/* 16 bits external bus, high performance SDRAM, 64 Mbits = 8 Mbytes */ +#define MEMORY_MODEL 0x5 + #else -# error "The external memory in your player is unknown" +#error "The external memory in your player is unknown" #endif MPMC_DYNAMIC_RASCAS_0 = (2<<8)|2; /* CAS & RAS latency = 2 clock cycles */ -- cgit v1.2.3