Changeset 912 for trunk

Timestamp:

07/10/10 09:22:21 (3 years ago)

Author:

fe50

Message:

• overrides fix for ixus95_sd1200 1.00c, by Yossar, from ​http://chdk.setepontos.com/index.php/topic,4324.msg52628.html#msg52628

File:

• trunk/platform/ixus95_sd1200/sub/100c/capt_seq.c (modified) (1 diff)

trunk/platform/ixus95_sd1200/sub/100c/capt_seq.c

@@ -228 +228 @@
 "jumptable_entry_0:\n"                      // CODE XREF: task_CaptSeqTask+4Cj
 // jumptable FFC4A02C entry 0               // LOCATION: SsPrepareSeq.c:0
-"                BL      sub_FFC4A8B8\n"
+"                BL      sub_FFC4A8B8\n"                // _sub_FFC4A8B8__SsPrepareSeq.c__0
+
+"    STMFD   SP!, {R1-R12,LR}\n"
+"    BL      captseq_hack_override_active\n" // returns 1 if tv or sv override in effect
+"    LDMFD   SP!, {R1-R12,LR}\n"
+"    STR     R0,[SP,#-4]!\n" // push return value
+"    BL      shooting_expo_param_override\n" // saves all regs
+
 "                BL      sub_FFC47F08\n"
+
+"    LDR     R0,[SP],#4\n" // pop override hack
+"    CMP     R0, #1\n"
+"    MOVEQ   R0, #0\n"
+"    STREQ   R0, [R4,#0x24]\n"  // fixes overrides behavior at short shutter press
+
 "                LDR     R0, [R4,#0x24]\n"
 "                CMP     R0, #0\n"