Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Meg F/X: Radically changing divider settings messed up the fake sleep in the bootloader. They aren't reset even after powering off. Make sure they are always specified. Move that code to target tree as well.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19358 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2008-12-07 17:48:42 +00:00
parent 8289b966b8
commit 528ec2a555
2 changed files with 29 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
firmware/kernel.c
View file

@ -245,19 +245,8 @@ void timeout_register(struct timeout *tmo, timeout_cb_type callback,
void sleep(int ticks)
{
#if CONFIG_CPU == S3C2440 && defined(BOOTLOADER)
volatile int counter;
TCON &= ~(1 << 20); // stop timer 4
// TODO: this constant depends on dividers settings inherited from
// firmware. Set them explicitly somwhere.
TCNTB4 = 12193 * ticks / HZ;
TCON |= 1 << 21; // set manual bit
TCON &= ~(1 << 21); // reset manual bit
TCON &= ~(1 << 22); //autoreload Off
TCON |= (1 << 20); // start timer 4
do {
counter = TCNTO4;
} while(counter > 0);
extern void delay(int ticks);
delay(ticks);
#elif defined(CPU_PP) && defined(BOOTLOADER)
unsigned stop = USEC_TIMER + ticks * (1000000/HZ);
while (TIME_BEFORE(USEC_TIMER, stop))

28
firmware/target/arm/s3c2440/gigabeat-fx/kernel-meg-fx.c
View file

@ -24,7 +24,7 @@
#include "timer.h"
#include "thread.h"
void tick_start(unsigned int interval_in_ms)
static inline void tick_set(unsigned int interval_in_ms)
{
/*
* Based on default PCLK of 49.1568MHz - scaling chosen to give
@ -49,6 +49,12 @@ void tick_start(unsigned int interval_in_ms)
TCON |= 1 << 21;
/* reset manual bit */
TCON &= ~(1 << 21);
}
void tick_start(unsigned int interval_in_ms)
{
tick_set(interval_in_ms);
/* interval mode */
TCON |= 1 << 22;
/* start timer 4 */
@ -58,6 +64,26 @@ void tick_start(unsigned int interval_in_ms)
INTMSK &= ~TIMER4_MASK;
}
#ifdef BOOTLOADER
void delay(int ticks)
{
volatile unsigned long counter;
INTMSK |= TIMER4_MASK;
tick_set(1000 * ticks / HZ);
/* autoreload Off */
TCON &= ~(1 << 22);
/* start timer 4 */
TCON |= (1 << 20);
do {
counter = TCNTO4;
} while(counter > 0);
}
#endif /* BOOTLOADER */
void TIMER4(void)
{
/* Run through the list of tick tasks */