1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
Index: dualboot.h
===================================================================
--- dualboot.h  (revision 25638)
+++ dualboot.h  (working copy)
@@ -8,4 +8,4 @@
 extern unsigned char dualboot_fuze[236];
 extern unsigned char dualboot_clipv2[280];
 extern unsigned char dualboot_clipplus[216];
-extern unsigned char dualboot_fuzev2[236];
+extern unsigned char dualboot_fuzev2[208];
Index: dualboot/dualboot.S
===================================================================
--- dualboot/dualboot.S (revision 25638)
+++ dualboot/dualboot.S (working copy)
@@ -101,7 +101,7 @@
 /* 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

@@ -213,20 +213,24 @@

         cmp     r1, #0
         beq     boot_of
-#elif defined(SANSA_E200V2) || defined(SANSA_FUZE) || defined(SANSA_FUZEV2)
+#elif defined(SANSA_E200V2) || defined(SANSA_FUZE)
         ldr     r0, =GPIOC
         mov     r1, #0
         str     r1, [r0, #0x400]
         ldr     r1, [r0, #0x20]    /* read pin C3 */

         cmp     r1, #0             /* C3 = #0 means button pressed */
-#ifdef SANSA_FUZEV2
-        /* the logic is reversed on the fuzev2 */
-        bne     boot_of
-#else
         beq     boot_of
-#endif /* SANSA_FUZEV2 */

+#elif defined(SANSA_FUZEV2)
+        ldr     r0, =GPIOC
+        mov     r1, #0
+        str     r1, [r0, #0x400]
+        ldr     r1, [r0, #0x40]    /* read pin C4 */
+
+        cmp     r1, #0             /* C4 = #0 means button pressed */
+        beq     boot_of
+
 #elif defined(SANSA_CLIPPLUS)
         @ read pins
         ldr     r0, =GPIOC