len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 21:55:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

commit FS#10092 (cleanup AMS system init) by Rafaël Carré.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20640 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2009-04-07 16:14:01 +00:00
parent 2f973487dc
commit f5c5983c73
2 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bootloader/sansa_as3525.c
View file

@ -29,7 +29,6 @@
#include "lcd.h" #include "lcd.h"
#include "backlight-target.h" #include "backlight-target.h"
#include "button-target.h" #include "button-target.h"
#include "ascodec-target.h"
#include "common.h" #include "common.h"
#include "storage.h" #include "storage.h"
#include "disk.h" #include "disk.h"
@ -53,7 +52,6 @@ void main(void)
lcd_init(); lcd_init();
show_logo(); show_logo();
ascodec_init(); /* Required for backlight on e200v2 */
_backlight_on(); _backlight_on();
button_init_device(); button_init_device();

15
firmware/target/arm/as3525/system-as3525.c
View file

@ -27,6 +27,7 @@
#include "dma-target.h" #include "dma-target.h"
#include "clock-target.h" #include "clock-target.h"
#include "fmradio_i2c.h" #include "fmradio_i2c.h"
#include "button-target.h"
#define default_interrupt(name) \ #define default_interrupt(name) \
extern __attribute__((weak,alias("UIRQ"))) void name (void) extern __attribute__((weak,alias("UIRQ"))) void name (void)
@ -217,8 +218,14 @@ static void sdram_init(void)
void system_init(void) void system_init(void)
{ {
unsigned int reset_loops = 640;
CCU_SRC = 0x1fffff0
& ~(1<<18); /* FIXME */
while(reset_loops--)
CCU_SRL = CCU_SRL_MAGIC_NUMBER;
CCU_SRC = CCU_SRL = 0;
#ifdef BOOTLOADER /* TODO: makes this work in the main build */
CGU_PROC = 0; /* fclk 24 MHz */ CGU_PROC = 0; /* fclk 24 MHz */
CGU_PERI &= ~0x7f; /* pclk 24 MHz */ CGU_PERI &= ~0x7f; /* pclk 24 MHz */
@ -248,6 +255,7 @@ void system_init(void)
"mcr p15, 0, r0, c1, c0 \n" "mcr p15, 0, r0, c1, c0 \n"
: : : "r0" ); : : : "r0" );
#ifdef BOOTLOADER
sdram_init(); sdram_init();
#endif /* BOOTLOADER */ #endif /* BOOTLOADER */
@ -262,10 +270,11 @@ void system_init(void)
dma_init(); dma_init();
ascodec_init();
#ifndef BOOTLOADER #ifndef BOOTLOADER
/* Disable fast hardware power-off, to use power button normally /* Disable fast hardware power-off, to use power button normally
* We don't need the power button in the bootloader. */ * We don't need the power button in the bootloader. */
ascodec_init();
ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) & (1<<2)); ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) & (1<<2));
#ifdef CONFIG_TUNER #ifdef CONFIG_TUNER
@ -289,7 +298,7 @@ void system_reboot(void)
void system_exception_wait(void) void system_exception_wait(void)
{ {
while (1); while(!button_read_device());
} }
int system_memory_guard(int newmode) int system_memory_guard(int newmode)