
Untitled
By: a guest on
Apr 19th, 2010 | syntax:
Diff | size: 0.85 KB | hits: 109 | expires: Never
diff --git a/rbutil/mkamsboot/dualboot/dualboot.S b/rbutil/mkamsboot/dualboot/dualboot.S
index 8bb2059..2c86a75 100644
--- a/rbutil/mkamsboot/dualboot/dualboot.S
+++ b/rbutil/mkamsboot/dualboot/dualboot.S
@@ -101,7 +101,7 @@ uclcopy:
/* TODO : M200V4 ? */
#if defined(SANSA_CLIP) || defined(SANSA_CLIPV2)
#define USB_PIN 6
-#elif defined(SANSA_FUZE) || defined(SANSA_E200V2) || defined(SANSA_FUZEV2)
+#elif defined(SANSA_FUZE) || defined(SANSA_E200V2)
#define USB_PIN 3
#endif
@@ -223,6 +223,12 @@ uclcopy:
#ifdef SANSA_FUZEV2
/* the logic is reversed on the fuzev2 */
bne boot_of
+
+ @ FAILSAFE @
+ ldr r1, [r0, #0x40] /* read pin C4 */
+ cmp r1, #0 /* C4 != #0 means button pressed */
+ bne boot_of
+
#else
beq boot_of
#endif /* SANSA_FUZEV2 */