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

D2: Update dual boot to use the hold switch. Update bootloader to show messages until HOLD released, keep holding POWER to show old debug screen (these modes will eventually be removed).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17032 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rob Purchase 2008-04-08 08:01:18 +00:00
parent d74117450c
commit f4deea6027
2 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
bootloader/telechips.c
View file

@ -43,7 +43,7 @@
#include "common.h"
#if defined(COWON_D2)
#include "i2c.h"
#include "pcf50606.h"
#define LOAD_ADDRESS 0x20000000 /* DRAM_START */
#endif
@ -97,11 +97,11 @@ void show_debug_screen(void)
how such a beast is going to work. Since it needs I2C read/write,
it can't easily go on an interrupt-based tick task. */
{
unsigned char buf[] = { 0x2f, (0xE<<1) | 1, /* ADC start for X+Y */
0, 0, 0 };
int x,y;
i2c_write(0x10, buf, 2);
i2c_readmem(0x10, 0x2e, buf, 5);
unsigned char buf[5];
pcf50606_write(PCF5060X_ADCC2, (0xE<<1) | 1); /* ADC start X+Y */
pcf50606_read_multiple(PCF5060X_ADCC1, buf, 5);
x = (buf[2] << 2) | (buf[3] & 3);
y = (buf[4] << 2) | ((buf[3] & 0xC) >> 2);
printf("X: 0x%03x Y: 0x%03x",x,y);
@ -111,10 +111,8 @@ void show_debug_screen(void)
lcd_hline(x-5, x+5, y);
lcd_vline(x, y-5, y+5);
buf[0] = 0x2f;
buf[1] = (0xF<<1) | 1; /* ADC start for P1+P2 */
i2c_write(0x10, buf, 2);
i2c_readmem(0x10, 0x2e, buf, 5);
pcf50606_write(PCF5060X_ADCC2, (0xF<<1) | 1); /* ADC start P1+P2 */
pcf50606_read_multiple(PCF5060X_ADCC1, buf, 5);
x = (buf[2] << 2) | (buf[3] & 3);
y = (buf[4] << 2) | ((buf[3] & 0xC) >> 2);
printf("P1: 0x%03x P2: 0x%03x",x,y);
@ -188,13 +186,13 @@ void* main(void)
{
int(*kernel_entry)(void);
/* wait for button release to allow debug statememts to be read */
while (button_read_device()) {};
/* wait for hold release to allow debug statements to be read */
while (button_hold()) {};
kernel_entry = (void*) loadbuffer;
/* allow entry to the debug screen if hold is on */
if (!button_hold()) rc = kernel_entry();
/* allow entry to the debug screen if still holding power */
if (!(button_read_device() & POWEROFF_BUTTON)) rc = kernel_entry();
}
#endif
show_debug_screen();

6
firmware/target/arm/tcc780x/crt0.S
View file

@ -72,9 +72,9 @@ start_loc:
#ifdef TCCBOOT
#ifdef COWON_D2
ldr r0, =0xf005a000
ldr r0, [r0, #0x40] /* Read GPIO B */
tst r0, #0x4
ldreq pc, [pc, #-28] /* Jump to original firmware if keypad not pressed */
ldr r0, [r0, #0x20] /* Read GPIO A */
tst r0, #0x8
ldrne pc, [pc, #-28] /* Jump to original firmware if HOLD not pressed */
#else
#error No bootup key detection implemented for this target
#endif