Changeset 1722


Ignore:
Timestamp:
03/11/12 07:32:37 (15 months ago)
Author:
philmoz
Message:

Merged revision(s) 1721 from branches/release-1_0:

Location:
trunk
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/camera_list.csv

    r1641 r1722  
    122122ixus980_sd990,100e,,, 
    123123ixus980_sd990,101b,,, 
    124 ixusizoom_sd30,100g,,, 
     124ixusizoom_sd30,100g,,100f, 
    125125ixusW_sd430,110a,,,SKIP_AUTOBUILD 
    126126s2is,100e,,, 
    … …  
    153153sx130is,101f,BETA,, 
    154154sx150is,100a,ALPHA,, 
    155 sx20,100f,BETA,, 
     155sx20,100f,,, 
    156156sx20,102b,,, 
    157157sx20,102d,,102c, 
    … …  
    162162sx230hs,100c,BETA,, 
    163163sx230hs,101a,BETA,, 
    164 sx230hs,101b,BETA,101c, 
     164sx230hs,101b,BETA,101c:101e, 
    165165sx30,100e,,, 
    166166sx30,100h,,, 

  • trunk/core/conf.c

    r1719 r1722  
    398398    CONF_INFO(245, conf.touchscreen_disable_shortcut_controls,  CONF_DEF_VALUE, i:0, NULL), 
    399399 
    400         // USB Icon enable & position 
     400    // USB Icon enable & position 
    401401    CONF_INFO(246, conf.usb_info_enable,            CONF_DEF_VALUE, i:0, NULL), 
    402402    CONF_INFO2(247, conf.usb_info_pos,              CONF_OSD_POS,   95,0), 

  • trunk/core/histogram.c

    r1719 r1722  
    141141        case 2: 
    142142        case 3: 
    143             x = 0;      // count how many blocks we have done on the current row (to skip unused buffer space at end of each row) 
     143            x = 0;  // count how many blocks we have done on the current row (to skip unused buffer space at end of each row) 
    144144            for (i=(histogram_stage-1)*6; i<viewport_size; i+=HISTO_STEP_SIZE*6) { 
    145145                y = img[i+1]; 

  • trunk/core/script.c

    r1719 r1722  
    2929    "@title Default Script\n" 
    3030    "]]\n" 
     31#if defined(VER_CHDK) 
     32    "chdk_def_lang=1\n" 
     33#else 
    3134    "chdk_def_lang=2\n" 
     35#endif 
    3236    "langs     = {}\n" 
    3337    "langs[1]  = {[\"name\"]=\"ENGLISH\",  [\"font_cp\"]=0,  [\"hint\"]=\"CHDK language changed to english\"}\n" 

  • trunk/platform/a1000/sub/100a/stubs_entry_2.S

    r1718 r1722  
    33 
    44// Override stubs_entry.S 
    5 //NHSTUB(ExpCtrlTool_StopContiAE,     0xffc1fabc) 
    6 //NHSTUB(Lseek,                       0xffc1354c) 
    75NHSTUB(PT_PlaySound,                0xffc48fbc) 
    86NHSTUB(SetAE_ShutterSpeed,          0xffe3de6c) 

  • trunk/platform/a1000/sub/100a/stubs_min.S

    r1718 r1722  
    1212DEF(led_table,                          0x2290) // 0x270C + 4 
    1313 
    14 // found in sub_FF957174 (called from MoveZoomLensWithPoint (sub_FF957B34)) 
    15 // ROM:FF957178   LDR     R4, =0xB37C 
    16 // .. 
    17 // ROM:FF9571BC   LDR     R0, [R4,#0x34] 
    18 // ROM:FF9571C0   CMP     R0, #0 
    19 // ROM:FF9571C4   MOVNE   R1, #0xE0 
    20 // ROM:FF9571C8   ADRNE   R0, aZoomlenscontro @ "ZoomLensController.c" 
    21 // ROM:FF9571CC   BLNE    assert 
    22 //DEF(zoom_busy,                          0xB4A4) //0xB37C + 0x34 
    23  
    24 // Found in sub_FF950718 (<- sub_FFA0D148 <- sub_FFA0D394 <- sub_FFA0D408 
    25 //                                    <- MoveFocusLensToDistance (sub_FFA0D41C)) 
    26 // ROM:FF95071C   LDR     R4, =0xB274 
    27 // .. 
    28 // ROM:FF950770   LDR     R0, [R4,#8] 
    29 // ROM:FF950774   CMP     R0, #0 
    30 // ROM:FF950778   MOVNE   R1, #0x90 
    31 // ROM:FF95077C   ADRNE   R0, aFocuslenscontr @ "FocusLensController.c" 
    32 // ROM:FF950780   BLNE    assert 
    33 //DEF(focus_busy, 0x7EE8) //0xB274 + 8 or 7fd4 
    34  
    35 // Same as previous variable, unusable. Originally found it by peeking through 
    36 // memory and it looked suitable at first. This address along with 0xBE64 
    37 // (suitable as canon_shoot_menu_active, code agrees) looked suitable but I got 
    38 // the basic idea wrong. Listed for completeness. 
    39  
    40 // Found in sub_FF982310 (deactivates shoot menu?). Ewavr found it but didn't 
    41 // clearly specify where, so this is a guess. 
    42 // ROM:FF982310   LDR     R1, =0xC05C 
    43 // ROM:FF982314   MOV     R0, #0 
    44 // ROM:FF982318   STRB    R0, [R1] 
    45 // ROM:FF98231C   STRB    R0, [R1,#1] 
    46 //DEF(canon_shoot_menu_active,            0xC05D) // 0xC05C + 1 
    47  
    48  
    49 // Found in sub_FF9754AC. Again, ewavr found this one, he did supply one pointer 
    50 // 'search for LDR R12, =0x3007'. I guess this is the right one then :) 
    51 // ROM:FF9754AC 000                 STMFD   SP!, {R4,LR} 
    52 // ROM:FF9754B0 008                 LDR     R1, =0xBD60 
    53 // ROM:FF9754B4 008                 LDR     R12, =0x3007 
    54 // ROM:FF9754B8 008                 LDR     R2, [R1,#0xCC] 
    55 //DEF(recreview_hold,                     0x94C8) // 0xBD60 + 0xCC 
    56 //DEF(movie_status,                       0x5868 + 0x38) 
    5714DEF(mode_magic,                         0x58D4) 
    5815DEF(enabled_refresh_physical_screen,    0xA460 + 0x30)  // Found in sub_ffd7a36c 

  • trunk/platform/a1000/sub/100b/stubs_entry_2.S

    r1718 r1722  
    33 
    44// Override stubs_entry.S 
    5 //NHSTUB(ExpCtrlTool_StopContiAE,     0xFFC1FABC) 
    6 //NHSTUB(Lseek,                       0xffc1354c) 
    75NHSTUB(PT_PlaySound,                0xFFC48FBC) 
    86NHSTUB(SetAE_ShutterSpeed,          0xFFE3DE6C) 

  • trunk/platform/a1000/sub/100b/stubs_min.S

    r1718 r1722  
    1212DEF(led_table,                          0x2290) // 0x270C + 4 
    1313 
    14 // found in sub_FF957174 (called from MoveZoomLensWithPoint (sub_FF957B34)) 
    15 // ROM:FF957178   LDR     R4, =0xB37C 
    16 // .. 
    17 // ROM:FF9571BC   LDR     R0, [R4,#0x34] 
    18 // ROM:FF9571C0   CMP     R0, #0 
    19 // ROM:FF9571C4   MOVNE   R1, #0xE0 
    20 // ROM:FF9571C8   ADRNE   R0, aZoomlenscontro @ "ZoomLensController.c" 
    21 // ROM:FF9571CC   BLNE    assert 
    22 //DEF(zoom_busy,                          0xB4A4) //0xB37C + 0x34 
    23  
    24 // Found in sub_FF950718 (<- sub_FFA0D148 <- sub_FFA0D394 <- sub_FFA0D408 
    25 //                                    <- MoveFocusLensToDistance (sub_FFA0D41C)) 
    26 // ROM:FF95071C   LDR     R4, =0xB274 
    27 // .. 
    28 // ROM:FF950770   LDR     R0, [R4,#8] 
    29 // ROM:FF950774   CMP     R0, #0 
    30 // ROM:FF950778   MOVNE   R1, #0x90 
    31 // ROM:FF95077C   ADRNE   R0, aFocuslenscontr @ "FocusLensController.c" 
    32 // ROM:FF950780   BLNE    assert 
    33 //DEF(focus_busy,                         0x7EE8) //0xB274 + 8 or 7fd4 
    34  
    35 // Same as previous variable, unusable. Originally found it by peeking through 
    36 // memory and it looked suitable at first. This address along with 0xBE64 
    37 // (suitable as canon_shoot_menu_active, code agrees) looked suitable but I got 
    38 // the basic idea wrong. Listed for completeness. 
    39  
    40 // Found in sub_FF982310 (deactivates shoot menu?). Ewavr found it but didn't 
    41 // clearly specify where, so this is a guess. 
    42 // ROM:FF982310   LDR     R1, =0xC05C 
    43 // ROM:FF982314   MOV     R0, #0 
    44 // ROM:FF982318   STRB    R0, [R1] 
    45 // ROM:FF98231C   STRB    R0, [R1,#1] 
    46 //DEF(canon_shoot_menu_active,            0xC05D) // 0xC05C + 1 
    47  
    48 // Found in sub_FF9754AC. Again, ewavr found this one, he did supply one pointer 
    49 // 'search for LDR R12, =0x3007'. I guess this is the right one then :) 
    50 // ROM:FF9754AC 000                 STMFD   SP!, {R4,LR} 
    51 // ROM:FF9754B0 008                 LDR     R1, =0xBD60 
    52 // ROM:FF9754B4 008                 LDR     R12, =0x3007 
    53 // ROM:FF9754B8 008                 LDR     R2, [R1,#0xCC] 
    54 //DEF(recreview_hold,                     0x94C8) // 0xBD60 + 0xCC 
    55 //DEF(movie_status,                       0x5868 + 0x38) 
    5614DEF(mode_magic,                         0x58D4) 
    5715DEF(enabled_refresh_physical_screen,    0xa460 + 0x30) // found in sub_ffd7a308 

  • trunk/platform/ixus220_elph300hs/sub/100c/stubs_entry.S

    r1718 r1722  
    3636DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74 
    3737DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60 
    38 //DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828) 
     38DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510 
    3939 
    4040// Values below go in 'lib.c': 

  • trunk/platform/ixus220_elph300hs/sub/100c/stubs_min.S

    r1718 r1722  
    11#include "stubs_asm.h" 
    22 
    3 DEF(recreview_hold,                     0x00003828) 
    43DEF(led_table,                          0x258C + 0x04)  // FF0557C4 
    54DEF(focus_len_table,                    0xfffea288)     // search for 21500 (longest focus length in micrometers) & 4300 (shortest length) 

  • trunk/platform/ixus220_elph300hs/sub/101a/stubs_entry.S

    r1718 r1722  
    3636DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74 
    3737DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60 
    38 //DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828) 
     38DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510 
    3939 
    4040// Values below go in 'lib.c': 

  • trunk/platform/ixus220_elph300hs/sub/101a/stubs_min.S

    r1718 r1722  
    11#include "stubs_asm.h" 
    22 
    3 DEF(recreview_hold,                     0x00003828) 
    43DEF(led_table,                          0x258C + 0x04)  // FF0557C4 
    54DEF(focus_len_table,                    0xfffea288)     // search for 21500 (longest focus length in micrometers) & 4300 (shortest length) 

  • trunk/platform/ixus220_elph300hs/sub/101c/stubs_entry.S

    r1718 r1722  
    3636DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74 
    3737DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60 
    38 //DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828) 
     38DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510 
    3939 
    4040// Values below go in 'lib.c': 

  • trunk/platform/ixus220_elph300hs/sub/101c/stubs_min.S

    r1718 r1722  
    11#include "stubs_asm.h" 
    22 
    3 DEF(recreview_hold,                     0x00003828) 
    43DEF(led_table,                          0x258C + 0x04)  // FF0557C4 
    54DEF(focus_len_table,                    0xfffea288)     // search for 21500 (longest focus length in micrometers) & 4300 (shortest length) 

  • trunk/platform/ixus220_elph300hs/sub/101g/stubs_entry.S

    r1718 r1722  
    3636DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74 
    3737DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60 
    38 //DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828) 
     38DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510 
    3939 
    4040// Values below go in 'lib.c': 

  • trunk/platform/ixus220_elph300hs/sub/101g/stubs_min.S

    r1718 r1722  
    77DEF(focus_len_table, 0xfffea288)                  // search for 21500 (longest focus length in micrometers) & 4300 (shortest length) 
    88 
    9 DEF(recreview_hold,                     0x00003828) 
    10  
    119//not touched 
    1210DEF(led_table, 0x258C + 0x04)             // FF0557C4 
Note: See TracChangeset for help on using the changeset viewer.