summaryrefslogtreecommitdiffstats
path: root/rbutil
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2008-10-28 11:52:49 +0000
committerRafaël Carré <rafael.carre@gmail.com>2008-10-28 11:52:49 +0000
commit3e7fdbb95e43c824877573b35ba47cce49480bcf (patch)
tree10f61a100ed9f321285a1506305dba63b47aeea7 /rbutil
parentb3ee07c22e1886c4cb1557dbaa4fd65d25cd1be3 (diff)
downloadrockbox-3e7fdbb95e43c824877573b35ba47cce49480bcf.tar.gz
rockbox-3e7fdbb95e43c824877573b35ba47cce49480bcf.tar.bz2
rockbox-3e7fdbb95e43c824877573b35ba47cce49480bcf.zip
Sansav2 dualboot: correctly use keyscan for Clip
Make comments consistent between m200v2 and Clip (e200 doesn't use keyscan) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18900 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'rbutil')
-rw-r--r--rbutil/mkamsboot/dualboot.S21
1 files changed, 13 insertions, 8 deletions
diff --git a/rbutil/mkamsboot/dualboot.S b/rbutil/mkamsboot/dualboot.S
index 1713017060..4fac02f010 100644
--- a/rbutil/mkamsboot/dualboot.S
+++ b/rbutil/mkamsboot/dualboot.S
@@ -95,10 +95,17 @@ uclcopy:
#ifdef SANSA_CLIP
/* HOME button */
+.set row, (1<<6) /* enable output on C6 */
+ ldr r0, =GPIOC
+ mov r1, #row
+ str r1, [r0, #0x400]
+ str r1, [r0, #(4*row)]
+
+.set col, (1<<2) /* read keyscan column B2 */
ldr r0, =GPIOB
mov r1, #0
str r1, [r0, #0x400]
- ldr r1, [r0, #0x10] /* read pin B2 */
+ ldr r1, [r0, #(4*col)]
cmp r1, #0
bne boot_of
@@ -112,21 +119,19 @@ uclcopy:
cmp r1, #0 /* C6 = #0 means button pressed */
beq boot_of
#elif defined(SANSA_M200V2)
-.set row, (1<<5) /* 4 or <<5 or <<6 */
- /* enable output on A3-A5 */
- /* set keyscan row A0-A3 */
+ /* SELECT button */
+.set row, (1<<5) /* enable output on A5 */
ldr r0, =GPIOA
mov r1, #row
str r1, [r0, #0x400]
str r1, [r0, #(4*row)]
-.set col, (1<<0) /* 0 or 1, 2, 3 */
- /* read keyscan column A0-A3 */
+.set col, (1<<0) /* read keyscan column A0 */
ldr r2, [r0, #(4*col)]
- /* check value read (compare to 0!) */
+ /* check value read (0 means button pressed) */
cmp r2, #0
- beq boot_of /* for beginning we jump if button select is not pressed */
+ beq boot_of
#else
#error No target-specific key check defined!
#endif