Changeset 1273 for trunk/platform/g12/sub/100e/boot.c

Timestamp:

08/07/11 02:38:23 (22 months ago)

Author:

philmoz

Message:

Update for G12 & SX30:

• Fix for ISO override so it should work regardless of which ISO is selected in the camera. ​http://chdk.setepontos.com/index.php?topic=6713.0
• Cleanup and correction in jogdial task code.
• Add SX30 firmware 1.00p version.

File:

• trunk/platform/g12/sub/100e/boot.c (modified) (5 diffs)

trunk/platform/g12/sub/100e/boot.c

@@ -686 +686 @@
 "                CMP     R0, #0 \n"
 "                LDRNE   R1, =0x262 \n"
-
-//"                ADRNE   R0, aRotaryencoder_ ; "RotaryEncoder.c" \n"
-"                               LDRNE   R0,=0xFF865AA8 \n"
-
+"                                LDRNE   R0,=0xFF865AA8 \n" //aRotaryencoder_ ; "RotaryEncoder.c" \n"
 "                BLNE    _DebugAssert \n"
 "                LDR     R0, [SP] \n"
@@ -704 +701 @@
 "                CMP     R4, #0 \n"
 "                LDRNE   R1, =0x2ED \n"
-
-//"                ADRNE   R0, aRotaryencoder_ ; "RotaryEncoder.c" \n"
-"                               LDRNE   R0,=0xFF865AA8 \n"
-
+"                                LDRNE   R0,=0xFF865AA8 \n" //aRotaryencoder_ ; "RotaryEncoder.c" \n"
 "                BLNE    _DebugAssert \n"
 "                RSB     R0, R4, R4,LSL#3 \n"
@@ -849 +843 @@
 
 "loc_FF865A48: \n"
-//"                ADR     R0, aRotaryencoder_ ; "RotaryEncoder.c" \n"
-"                               LDR             R0,=0xFF865AA8 \n"
-
+"                                LDR     R0,=0xFF865AA8 \n" //aRotaryencoder_ ; "RotaryEncoder.c" \n"
 "                BL      _DebugAssert \n"
 
@@ -877 +869 @@
 
 "loc_FF865A94: \n"
-//"                ADR     R0, aRotaryencoder_ ; "RotaryEncoder.c" \n"
-"                               LDR             R0,=0xFF865AA8 \n"
-
+"                                LDR     R0,=0xFF865AA8 \n" //aRotaryencoder_ ; "RotaryEncoder.c" \n"
 "                BL      _DebugAssert \n"
 "                B       loc_FF865848 \n"
@@ -891 +881 @@
 "                CMP     R0, #0 \n"
 "                MOVEQ   R1, #0x2E0 \n"
-
-//"                ADREQ   R0, aRotaryencoder_ ; "RotaryEncoder.c" \n"
-"                               LDRNE   R0,=0xFF865AA8 \n"
-
+"                                LDREQ   R0,=0xFF865AA8 \n" //aRotaryencoder_ ; "RotaryEncoder.c" \n"
 "                BLEQ    _DebugAssert \n"
 "                RSB     R0, R4, R4,LSL#3 \n"