summaryrefslogtreecommitdiff
path: root/rbutil/mkamsboot/dualboot.S
diff options
context:
space:
mode:
authorDominik Wenger <domonoky@googlemail.com>2008-11-25 18:17:41 +0000
committerDominik Wenger <domonoky@googlemail.com>2008-11-25 18:17:41 +0000
commit032b3d46912ef16aaa20b8fdf85c088c6f444a2a (patch)
tree4c94b5a3a1683ee4b2b1d630b09e16bf10c6e382 /rbutil/mkamsboot/dualboot.S
parentef60fdcb523a76a4d76ef46d5cfffe816ccb9928 (diff)
downloadrockbox-032b3d46912ef16aaa20b8fdf85c088c6f444a2a.tar.gz
rockbox-032b3d46912ef16aaa20b8fdf85c088c6f444a2a.zip
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
Diffstat (limited to 'rbutil/mkamsboot/dualboot.S')
-rw-r--r--rbutil/mkamsboot/dualboot.S6
1 files changed, 3 insertions, 3 deletions
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:
119 cmp r1, #0 /* C3 = #0 means button pressed */ 119 cmp r1, #0 /* C3 = #0 means button pressed */
120 beq boot_of 120 beq boot_of
121#elif defined(SANSA_M200V4) 121#elif defined(SANSA_M200V4)
122 /* SELECT button */ 122 /* LEFT button */
123.set row, (1<<5) /* enable output on A5 */ 123.set row, (1<<5) /* enable output on A5 */
124 ldr r0, =GPIOA 124 ldr r0, =GPIOA
125 mov r1, #row 125 mov r1, #row
@@ -129,9 +129,9 @@ uclcopy:
129.set col, (1<<0) /* read keyscan column A0 */ 129.set col, (1<<0) /* read keyscan column A0 */
130 ldr r2, [r0, #(4*col)] 130 ldr r2, [r0, #(4*col)]
131 131
132 /* check value read (0 means button pressed) */ 132 /* check value read (1 means button pressed) */
133 cmp r2, #0 133 cmp r2, #0
134 beq boot_of 134 bne boot_of
135#else 135#else
136 #error No target-specific key check defined! 136 #error No target-specific key check defined!
137#endif 137#endif