Changeset 938


Ignore:
Timestamp:
02/01/12 15:48:54 (2 years ago)
Author:
rudi_de
Message:

Funktionen für Motiventfernung korrigiert
http://forum.chdk-treff.de/viewtopic.php?f=7&t=1665&start=195#p24398

Bertifft a470, a1000, a2000, g11, ixus80, ixus85, ixus90, ixus95, ixus100, ixus120, ixus200, ixus860, ixus870, ixus960, ixus970, s90, sx120

  • Funktionen für Motiventfernung in platform/KAMERA/wrappers.c korrigiert
  • a1000, ixus95: GetFocusLensSubjectDistance von Signaturfinder hinugefügt (ungetestet)
Location:
trunk/platform
Files:
23 edited

Legend:

Unmodified
Added
Removed
  • trunk/platform/a1000/sub/100a/stubs_entry.S

    r930 r938  
    1616//    Name                                     Address      Rule  %  Comp to stubs_entry_2.S 
    1717//NSTUB(ExpCtrlTool_StopContiAE               ,0xffc1fbac) //104        *** != 0xffc1fabc 
    18 //NSTUB(GetFocusLensSubjectDistance           ,0xffcff6e4) //102        *** != 0xffdec420 
    1918//NSTUB(Lseek                                 ,0xffc13484) //101        *** != 0xffc1354c 
    2019//NSTUB(PT_PlaySound                          ,0xffc48c7c) //102        *** != 0xffc48fbc 
     
    121120NSTUB(GetDrive_FreeClusters                   ,0xffc40048) //  1 
    122121NSTUB(GetDrive_TotalClusters                  ,0xffc40014) //  1 
     122NSTUB(GetFocusLensSubjectDistance             ,0xffcff6e4) //102 
    123123NSTUB(GetFocusLensSubjectDistanceFromLens     ,0xffcff9f0) //  3 
    124124NSTUB(GetKbdState                             ,0xffc315c8) //109 
  • trunk/platform/a1000/sub/100a/stubs_entry_2.S

    r835 r938  
    44// Override stubs_entry.S 
    55NHSTUB(ExpCtrlTool_StopContiAE,     0xffc1fabc) 
    6 NHSTUB(GetFocusLensSubjectDistance, 0xffdec420) 
    76NHSTUB(Lseek,                       0xffc1354c) 
    87NHSTUB(PT_PlaySound,                0xffc48fbc) 
  • trunk/platform/a1000/sub/100b/stubs_entry.S

    r930 r938  
    1616//    Name                                     Address      Rule  %  Comp to stubs_entry_2.S 
    1717//NSTUB(ExpCtrlTool_StopContiAE               ,0xffc1fbac) //104        *** != 0xffc1fabc 
    18 //NSTUB(GetFocusLensSubjectDistance           ,0xffcff6e4) //102        *** != 0xffdec420 
    1918//NSTUB(Lseek                                 ,0xffc13484) //101        *** != 0xffc1354c 
    2019//NSTUB(PT_PlaySound                          ,0xffc48c7c) //102        *** != 0xffc48fbc 
     
    121120NSTUB(GetDrive_FreeClusters                   ,0xffc40048) //  1 
    122121NSTUB(GetDrive_TotalClusters                  ,0xffc40014) //  1 
     122NSTUB(GetFocusLensSubjectDistance             ,0xffcff6e4) //102 
    123123NSTUB(GetFocusLensSubjectDistanceFromLens     ,0xffcff9f0) //  3 
    124124NSTUB(GetKbdState                             ,0xffc315c8) //109 
  • trunk/platform/a1000/sub/100b/stubs_entry_2.S

    r835 r938  
    44// Override stubs_entry.S 
    55NHSTUB(ExpCtrlTool_StopContiAE,     0xFFC1FABC) 
    6 NHSTUB(GetFocusLensSubjectDistance, 0xffdec420) 
    76NHSTUB(Lseek,                       0xffc1354c) 
    87NHSTUB(PT_PlaySound,                0xFFC48FBC) 
  • trunk/platform/a1000/wrappers.c

    r835 r938  
    33long lens_get_focus_pos() 
    44{ 
    5     //return _GetFocusLensSubjectDistance();    // returns plaintext, calls GetCurrentTargetDistance to get value 
    6     return _GetCurrentTargetDistance();  
     5    return _GetFocusLensSubjectDistance(); 
    76} 
    87 
    98long lens_get_focus_pos_from_lens() 
    109{ 
    11         return _GetCurrentTargetDistance();  
    12     //return _GetFocusLensSubjectDistanceFromLens();  
     10    return _GetFocusLensSubjectDistanceFromLens();  
    1311} 
    1412 
  • trunk/platform/a2000/wrappers.c

    r169 r938  
    88long lens_get_focus_pos_from_lens() 
    99{ 
    10         return _GetCurrentTargetDistance();  
    11     //return _GetFocusLensSubjectDistanceFromLens();  
     10    return _GetFocusLensSubjectDistanceFromLens();  
    1211} 
    1312 
  • trunk/platform/a470/wrappers.c

    r462 r938  
    88long lens_get_focus_pos_from_lens() 
    99{ 
    10         return _GetCurrentTargetDistance();  
    11     //return _GetFocusLensSubjectDistanceFromLens();  
     10    return _GetFocusLensSubjectDistanceFromLens();  
    1211} 
    1312 
  • trunk/platform/g11/wrappers.c

    r835 r938  
    1515long lens_get_target_distance() 
    1616{ 
    17           
    18         //ERR99: TODO G11 
    19     //return _GetCurrentTargetDistance(); 
    20         return 0; 
     17 
     18    return _GetCurrentTargetDistance(); 
    2119} 
    22  
    23  
  • trunk/platform/ixus100_sd780/wrappers.c

    r835 r938  
    33long lens_get_focus_pos() 
    44{ 
    5         //return _GetFocusLensSubjectDistance();    // returns plaintext, calls GetCurrentTargetDistance to get value 
    6         return _GetCurrentTargetDistance();  
     5        return _GetFocusLensSubjectDistance(); 
    76} 
    87 
    98long lens_get_focus_pos_from_lens() 
    109{ 
    11         return _GetCurrentTargetDistance();  
    12         //return _GetFocusLensSubjectDistanceFromLens();  
     10        return _GetFocusLensSubjectDistanceFromLens();  
    1311} 
    1412 
  • trunk/platform/ixus120_sd940/wrappers.c

    r835 r938  
    33long lens_get_focus_pos() 
    44{ 
    5         //return _GetFocusLensSubjectDistance();    // returns plaintext, calls GetCurrentTargetDistance to get value 
    6         return _GetCurrentTargetDistance(); 
     5        return _GetFocusLensSubjectDistance(); 
    76} 
    87 
    98long lens_get_focus_pos_from_lens() 
    109{ 
    11         return _GetCurrentTargetDistance(); 
    12         //return _GetFocusLensSubjectDistanceFromLens(); 
     10        return _GetFocusLensSubjectDistanceFromLens(); 
    1311} 
    1412 
  • trunk/platform/ixus200_sd980/wrappers.c

    r835 r938  
    33long lens_get_focus_pos() 
    44{ 
    5         //return _GetFocusLensSubjectDistance();    // returns plaintext, calls GetCurrentTargetDistance to get value 
    6         return _GetCurrentTargetDistance(); 
     5        return _GetFocusLensSubjectDistance(); 
    76} 
    87 
    98long lens_get_focus_pos_from_lens() 
    109{ 
    11         return _GetCurrentTargetDistance(); 
    12         //return _GetFocusLensSubjectDistanceFromLens(); 
     10        return _GetFocusLensSubjectDistanceFromLens(); 
    1311} 
    1412 
  • trunk/platform/ixus80_sd1100/wrappers.c

    r169 r938  
    88long lens_get_focus_pos_from_lens() 
    99{ 
    10         return _GetCurrentTargetDistance(); 
    11     //return _GetFocusLensSubjectDistanceFromLens(); 
     10    return _GetFocusLensSubjectDistanceFromLens(); 
    1211} 
    1312 
  • trunk/platform/ixus85_sd770/wrappers.c

    r835 r938  
    88long lens_get_focus_pos_from_lens() 
    99{ 
    10         return _GetCurrentTargetDistance();  
    11         //return _GetFocusLensSubjectDistanceFromLens();  
     10        return _GetFocusLensSubjectDistanceFromLens();  
    1211} 
    1312 
  • trunk/platform/ixus860_sd870/wrappers.c

    r169 r938  
    88long lens_get_focus_pos_from_lens() 
    99{ 
    10         return _GetCurrentTargetDistance();  
    11     //return _GetFocusLensSubjectDistanceFromLens();  
     10    return _GetFocusLensSubjectDistanceFromLens();  
    1211} 
    1312 
  • trunk/platform/ixus870_sd880/wrappers.c

    r169 r938  
    33long lens_get_focus_pos() 
    44{ 
    5         //return _GetFocusLensSubjectDistance();    // returns plaintext, calls GetCurrentTargetDistance to get value 
    6         return _GetCurrentTargetDistance();  
     5        return _GetFocusLensSubjectDistance(); 
    76} 
    87 
    98long lens_get_focus_pos_from_lens() 
    109{ 
    11         return _GetCurrentTargetDistance();  
    12         //return _GetFocusLensSubjectDistanceFromLens();  
     10        return _GetFocusLensSubjectDistanceFromLens();  
    1311} 
    1412 
  • trunk/platform/ixus90_sd790/wrappers.c

    r835 r938  
    88long lens_get_focus_pos_from_lens() 
    99{ 
    10         return _GetCurrentTargetDistance();  
    11     //return _GetFocusLensSubjectDistanceFromLens();  
     10    return _GetFocusLensSubjectDistanceFromLens();  
    1211} 
    13  
    1412 
    1513long lens_get_target_distance() 
  • trunk/platform/ixus95_sd1200/sub/100c/stubs_entry.S

    r930 r938  
    1616//    Name                                     Address      Rule  %  Comp to stubs_entry_2.S 
    1717//NSTUB(DoAFLock                              ,0xffc15298) //102        *** != 0xffc47b8c 
    18 //NSTUB(GetFocusLensSubjectDistance           ,0xffcf0434) //102        *** != 0x00000000 
    1918//NSTUB(SetScriptMode                         ,0xffc5d99c) //101        *** != 0x00000000 
    2019//NSTUB(UnlockAF                              ,0xffc152d0) //102        *** != 0xffc47b9c 
     
    125124NSTUB(GetDrive_FreeClusters                   ,0xffc3f874) //  5 
    126125NSTUB(GetDrive_TotalClusters                  ,0xffc3f848) //  5 
     126NSTUB(GetFocusLensSubjectDistance             ,0xffcf0434) //102 
    127127NSTUB(GetFocusLensSubjectDistanceFromLens     ,0xffcf0810) //  3 
    128128NSTUB(GetKbdState                             ,0xffc30e04) //109 
  • trunk/platform/ixus95_sd1200/sub/100c/stubs_entry_2.S

    r835 r938  
    44// Override stubs_entry.S 
    55NHSTUB(DoAFLock,                    0xFFC47B8C) 
    6 NHSTUB(GetFocusLensSubjectDistance, NULL_SUB) 
    76NHSTUB(SetScriptMode,               NULL_SUB) 
    87NHSTUB(UnlockAF,                    0xFFC47B9C) 
  • trunk/platform/ixus95_sd1200/wrappers.c

    r835 r938  
    33long lens_get_focus_pos() 
    44{ 
    5         //return _GetFocusLensSubjectDistance();    // returns plaintext, calls GetCurrentTargetDistance to get value 
    6         return _GetCurrentTargetDistance();  
     5        return _GetFocusLensSubjectDistance(); 
    76} 
    87 
    98long lens_get_focus_pos_from_lens() 
    109{ 
    11         return _GetCurrentTargetDistance();  
    12         //return _GetFocusLensSubjectDistanceFromLens();  
     10        return _GetFocusLensSubjectDistanceFromLens();  
    1311} 
    1412 
     
    1715        return _GetCurrentTargetDistance(); 
    1816} 
    19 /* 
    20 //VERIFY_SD780 Only one arg? 
    21 long OpLog_Get(long i) 
    22 { 
    23         return _OpLog_Get(i); 
    24 } 
    25 */ 
  • trunk/platform/ixus960_sd950/wrappers.c

    r169 r938  
    11#include "../generic/wrappers.c" 
     2 
    23long lens_get_focus_pos() 
    34{ 
     
    67long lens_get_focus_pos_from_lens() 
    78{ 
    8         return _GetCurrentTargetDistance();  
    9         //return _GetFocusLensSubjectDistanceFromLens();  
     9        return _GetFocusLensSubjectDistanceFromLens();  
    1010} 
    1111long lens_get_target_distance() 
  • trunk/platform/ixus970_sd890/wrappers.c

    r835 r938  
    88long lens_get_focus_pos_from_lens() 
    99{ 
    10         return _GetCurrentTargetDistance();  
    11         //return _GetFocusLensSubjectDistanceFromLens();  
     10        return _GetFocusLensSubjectDistanceFromLens();  
    1211} 
    1312 
  • trunk/platform/s90/wrappers.c

    r835 r938  
    33long lens_get_focus_pos() 
    44{ 
    5           
    65    return _GetFocusLensSubjectDistance(); 
    76} 
     
    98long lens_get_focus_pos_from_lens() 
    109{ 
    11           
    1210    return _GetFocusLensSubjectDistanceFromLens();  
    1311} 
     
    1513long lens_get_target_distance() 
    1614{ 
    17           
    18     //return _GetCurrentTargetDistance(); 
    19         return 0; 
     15    return _GetCurrentTargetDistance(); 
    2016} 
    21  
    22  
  • trunk/platform/sx120is/wrappers.c

    r399 r938  
    33long lens_get_focus_pos() 
    44{ 
    5     //return _GetFocusLensSubjectDistance();    // returns plaintext, calls GetCurrentTargetDistance to get value 
    6     return _GetCurrentTargetDistance();  
     5    return _GetFocusLensSubjectDistance(); 
    76} 
    87 
    98long lens_get_focus_pos_from_lens() 
    109{ 
    11         return _GetCurrentTargetDistance();  
    12     //return _GetFocusLensSubjectDistanceFromLens();  
     10    return _GetFocusLensSubjectDistanceFromLens();  
    1311} 
    14  
    1512 
    1613long lens_get_target_distance() 
Note: See TracChangeset for help on using the changeset viewer.