Changeset 1600


Ignore:
Timestamp:
01/22/12 06:42:43 (17 months ago)
Author:
philmoz
Message:

Merged revision(s) 1599 from branches/release-1_0:
Fix incorrect code in capt_seq.c for IXUS220 (thx mlands).
​http://chdk.setepontos.com/index.php?topic=7409.msg80347#msg80347

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/platform/ixus220_elph300hs/sub/100c/capt_seq.c

    r1448 r1600  
    897897"                CMN     R4, #0xC00 \n" 
    898898"                MOVEQ   R1, #0x14C \n" 
    899 "                LDRNE   R0, =0xFF8B8308 \n" //aShutter_c IXUS220 at FF8B8308 
     899"                LDREQ   R0, =0xFF8B8308 \n" //aShutter_c IXUS220 at FF8B8308 
    900900"                STRH    R4, [R5,#2] \n" 
    901901"                BLEQ    _DebugAssert \n" 

  • trunk/platform/ixus220_elph300hs/sub/101a/capt_seq.c

    r1448 r1600  
    897897"                CMN     R4, #0xC00 \n" 
    898898"                MOVEQ   R1, #0x14C \n" 
    899 "                LDRNE   R0, =0xFF8B8308 \n" //aShutter_c IXUS220 at FF8B8308 
     899"                LDREQ   R0, =0xFF8B8308 \n" //aShutter_c IXUS220 at FF8B8308 
    900900"                STRH    R4, [R5,#2] \n" 
    901901"                BLEQ    _DebugAssert \n" 

  • trunk/platform/ixus220_elph300hs/sub/101c/capt_seq.c

    r1448 r1600  
    897897"                CMN     R4, #0xC00 \n" 
    898898"                MOVEQ   R1, #0x14C \n" 
    899 "                LDRNE   R0, =0xFF8B8308 \n" //aShutter_c IXUS220 at FF8B8308 
     899"                LDREQ   R0, =0xFF8B8308 \n" //aShutter_c IXUS220 at FF8B8308 
    900900"                STRH    R4, [R5,#2] \n" 
    901901"                BLEQ    _DebugAssert \n" 

  • trunk/platform/ixus220_elph300hs/sub/101g/capt_seq.c

    r1550 r1600  
    897897"                CMN     R4, #0xC00 \n" 
    898898"                MOVEQ   R1, #0x14C \n" 
    899 "                LDRNE   R0, =0xFF8B8308 \n" //aShutter_c IXUS220 at FF8B8308 
     899"                LDREQ   R0, =0xFF8B8308 \n" //aShutter_c IXUS220 at FF8B8308 
    900900"                STRH    R4, [R5,#2] \n" 
    901901"                BLEQ    _DebugAssert \n" 
Note: See TracChangeset for help on using the changeset viewer.