Changeset 2020


Ignore:
Timestamp:
07/29/12 00:56:01 (10 months ago)
Author:
philmoz
Message:

Merged revision(s) 2019 from trunk:
Fix modemap detection in finsig_dryos.c for DryOS R47 cameras.

Location:
branches/release-1_1
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • branches/release-1_1

    • Property svn:mergeinfo changed
      /trunkmerged: 2019

  • branches/release-1_1/platform/a3200/sub/100d/stubs_entry.S

    r1971 r2020  
    2020// Check of modemap from 'platform/CAMERA/shooting.c': 
    2121// Firmware modemap table found @ff895914 -> ff8921c0 -> ff9931ac -> ffac7c28 -> ffbedae8 
    22 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    23 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    24 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    25 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    26 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    27 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
     22// No problems found with modemap table. 
    2823 
    2924// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/a3300/sub/100a/stubs_entry.S

    r1906 r2020  
    2121// Check of modemap from 'platform/CAMERA/shooting.c': 
    2222// Firmware modemap table found @ff8959c4 -> ff892270 -> ff9937f8 -> ffac835c -> ffbeea40 
    23 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    24 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    25 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    26 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    27 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    28 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
     23// No problems found with modemap table. 
    2924 
    3025// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/a3300/sub/100c/stubs_entry.S

    r1906 r2020  
    2121// Check of modemap from 'platform/CAMERA/shooting.c': 
    2222// Firmware modemap table found @ff8959c4 -> ff892270 -> ff9937f8 -> ffac835c -> ffbeea40 
    23 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    24 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    25 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    26 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    27 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    28 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
     23// No problems found with modemap table. 
    2924 
    3025// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/a3300/sub/100d/stubs_entry.S

    r1906 r2020  
    2121// Check of modemap from 'platform/CAMERA/shooting.c': 
    2222// Firmware modemap table found @ff8959c4 -> ff892270 -> ff9937f8 -> ffac8368 -> ffbeea50 
    23 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    24 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    25 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    26 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    27 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    28 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
     23// No problems found with modemap table. 
    2924 
    3025// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/sx220hs/sub/100a/stubs_entry.S

    r1906 r2020  
    2222// Check of modemap from 'platform/CAMERA/shooting.c': 
    2323// Firmware modemap table found @ff0953cc -> ff091c94 -> ff1b2368 -> ff318d34 -> ff48a450 
    24 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    25 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    26 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    27 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    28 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
    29 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    30 // Current modemap entry not found in firmware - MODE_SCN_COLOR_SWAP       8734 
    31 // Current modemap entry not found in firmware - MODE_SCN_COLOR_ACCENT     8733 
     24// No problems found with modemap table. 
    3225 
    3326// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/sx220hs/sub/101a/stubs_entry.S

    r1906 r2020  
    2222// Check of modemap from 'platform/CAMERA/shooting.c': 
    2323// Firmware modemap table found @ff0953cc -> ff091c94 -> ff1b2368 -> ff318d4c -> ff48a468 
    24 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    25 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    26 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    27 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    28 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
    29 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    30 // Current modemap entry not found in firmware - MODE_SCN_COLOR_SWAP       8734 
    31 // Current modemap entry not found in firmware - MODE_SCN_COLOR_ACCENT     8733 
     24// No problems found with modemap table. 
    3225 
    3326// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/sx220hs/sub/101b/stubs_entry.S

    r1906 r2020  
    2222// Check of modemap from 'platform/CAMERA/shooting.c': 
    2323// Firmware modemap table found @ff0953cc -> ff091c94 -> ff1b2368 -> ff318d58 -> ff48a470 
    24 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    25 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    26 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    27 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    28 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
    29 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    30 // Current modemap entry not found in firmware - MODE_SCN_COLOR_SWAP       8734 
    31 // Current modemap entry not found in firmware - MODE_SCN_COLOR_ACCENT     8733 
     24// No problems found with modemap table. 
    3225 
    3326// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/sx230hs/sub/100c/stubs_entry.S

    r1906 r2020  
    2424// Mode 16936 in firmware but not in current modemap 
    2525// Mode 16938 in firmware but not in current modemap 
    26 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    27 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    28 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    29 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
    30 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    31 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    32 // Current modemap entry not found in firmware - MODE_SCN_COLOR_SWAP       8734 
    33 // Current modemap entry not found in firmware - MODE_SCN_COLOR_ACCENT     8733 
    3426 
    3527// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/sx230hs/sub/101a/stubs_entry.S

    r1906 r2020  
    2424// Mode 16936 in firmware but not in current modemap 
    2525// Mode 16938 in firmware but not in current modemap 
    26 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    27 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    28 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    29 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
    30 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    31 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    32 // Current modemap entry not found in firmware - MODE_SCN_COLOR_SWAP       8734 
    33 // Current modemap entry not found in firmware - MODE_SCN_COLOR_ACCENT     8733 
    3426 
    3527// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/platform/sx230hs/sub/101b/stubs_entry.S

    r1906 r2020  
    2424// Mode 16936 in firmware but not in current modemap 
    2525// Mode 16938 in firmware but not in current modemap 
    26 // Current modemap entry not found in firmware - MODE_SCN_MONOCHROME       8754 
    27 // Current modemap entry not found in firmware - MODE_SCN_TOY_CAMERA       8751 
    28 // Current modemap entry not found in firmware - MODE_SCN_MINIATURE        8748 
    29 // Current modemap entry not found in firmware - MODE_SCN_FISHEYE          8747 
    30 // Current modemap entry not found in firmware - MODE_SCN_POSTER_EFFECT    8743 
    31 // Current modemap entry not found in firmware - MODE_SCN_SUPER_VIVID      8742 
    32 // Current modemap entry not found in firmware - MODE_SCN_COLOR_SWAP       8734 
    33 // Current modemap entry not found in firmware - MODE_SCN_COLOR_ACCENT     8733 
    3426 
    3527// Values below can be overridden in 'stubs_min.S': 

  • branches/release-1_1/tools/finsig_dryos.c

    r1906 r2020  
    26632663                                                                while ((*p != 0xFFFF) && (k < 50)) 
    26642664                                                                { 
    2665                                                                         if (((fw->dryos_ver < 49) && ((*p < 8000) || (*p > 8999))) || ((fw->dryos_ver >= 49) && ((*p < 4000) || (*p > 4999)))) 
     2665                                                                        if (((fw->dryos_ver < 47) && ((*p < 8000) || (*p > 8999))) || ((fw->dryos_ver >= 47) && ((*p < 4000) || (*p > 4999)))) 
    26662666                                                                        { 
    26672667                                                                                osig *m = find_sig_val(modemap, *p); 
Note: See TracChangeset for help on using the changeset viewer.