From 032b3d46912ef16aaa20b8fdf85c088c6f444a2a Mon Sep 17 00:00:00 2001 From: Dominik Wenger Date: Tue, 25 Nov 2008 18:17:41 +0000 Subject: m200v4: correct the BOOTDIR define, and invert the button check in the dualboot.S git-svn-id: svn://svn.rockbox.org/rockbox/trunk@19217 a1c6a512-1295-4272-9138-f99709370657 --- firmware/export/config-m200v4.h | 2 +- rbutil/mkamsboot/dualboot.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firmware/export/config-m200v4.h b/firmware/export/config-m200v4.h index de66788f75..b5c4f56b9f 100644 --- a/firmware/export/config-m200v4.h +++ b/firmware/export/config-m200v4.h @@ -138,7 +138,7 @@ #define BOOTFILE_EXT "sansa" #define BOOTFILE "rockbox." BOOTFILE_EXT -#define BOOTDIR "/" +#define BOOTDIR "/.rockbox" #define IBSS_ATTR_VOICE_STACK #define ICODE_ATTR_TREMOR_NOT_MDCT diff --git a/rbutil/mkamsboot/dualboot.S b/rbutil/mkamsboot/dualboot.S index 8cadca8174..4d19b020a3 100644 --- a/rbutil/mkamsboot/dualboot.S +++ b/rbutil/mkamsboot/dualboot.S @@ -119,7 +119,7 @@ uclcopy: cmp r1, #0 /* C3 = #0 means button pressed */ beq boot_of #elif defined(SANSA_M200V4) - /* SELECT button */ + /* LEFT button */ .set row, (1<<5) /* enable output on A5 */ ldr r0, =GPIOA mov r1, #row @@ -129,9 +129,9 @@ uclcopy: .set col, (1<<0) /* read keyscan column A0 */ ldr r2, [r0, #(4*col)] - /* check value read (0 means button pressed) */ + /* check value read (1 means button pressed) */ cmp r2, #0 - beq boot_of + bne boot_of #else #error No target-specific key check defined! #endif -- cgit v1.2.3