len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

m200v4: correct the BOOTDIR define, and invert the button check in the dualboot.S

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19217 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Dominik Wenger 2008-11-25 18:17:41 +00:00
parent ef60fdcb52
commit 032b3d4691
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/config-m200v4.h
View file

@ -138,7 +138,7 @@
#define BOOTFILE_EXT "sansa" #define BOOTFILE_EXT "sansa"
#define BOOTFILE "rockbox." BOOTFILE_EXT #define BOOTFILE "rockbox." BOOTFILE_EXT
#define BOOTDIR "/" #define BOOTDIR "/.rockbox"
#define IBSS_ATTR_VOICE_STACK #define IBSS_ATTR_VOICE_STACK
#define ICODE_ATTR_TREMOR_NOT_MDCT #define ICODE_ATTR_TREMOR_NOT_MDCT

6
rbutil/mkamsboot/dualboot.S
View file

@ -119,7 +119,7 @@ uclcopy:
cmp r1, #0 /* C3 = #0 means button pressed */ cmp r1, #0 /* C3 = #0 means button pressed */
beq boot_of beq boot_of
#elif defined(SANSA_M200V4) #elif defined(SANSA_M200V4)
/* SELECT button */ /* LEFT button */
.set row, (1<<5) /* enable output on A5 */ .set row, (1<<5) /* enable output on A5 */
ldr r0, =GPIOA ldr r0, =GPIOA
mov r1, #row mov r1, #row
@ -129,9 +129,9 @@ uclcopy:
.set col, (1<<0) /* read keyscan column A0 */ .set col, (1<<0) /* read keyscan column A0 */
ldr r2, [r0, #(4*col)] ldr r2, [r0, #(4*col)]
/* check value read (0 means button pressed) */ /* check value read (1 means button pressed) */
cmp r2, #0 cmp r2, #0
beq boot_of bne boot_of
#else #else
#error No target-specific key check defined! #error No target-specific key check defined!
#endif #endif