Changeset 1444 for trunk/platform/g12/sub/100g/stubs_entry.S

Timestamp:

12/02/11 05:32:17 (18 months ago)

Author:

philmoz

Message:

Updates for finsig_dryos.c:

• The 'ctypes' array used in generic/wrappers.c exists in the firmware for dryos cameras. finsig_dryos.c now adds an entry for this to stubs_entry.S so the array is no longer needed in the CHDK code.
• Values from stubs_min.S that are correctly found by finsig_dryos.c can be removed from stubs_min.S. The entries will then be included in stubs_entry.S (as is done for stubs_entry_2.S). stubs_min.S cleaned up for G12, SX30, SX40 and IXUS310.

File:

• trunk/platform/g12/sub/100g/stubs_entry.S (modified) (2 diffs)

trunk/platform/g12/sub/100g/stubs_entry.S

@@ -22 +22 @@
 // No problems found with modemap table.
 
-// Values below go in 'stubs_min.S':
-//DEF(physw_status                            ,0x00034474) // Found @0xff8349f4,          stubs_min = 0x00034474 (0x34474)
-//DEF(physw_run                               ,0x00001c3c) // Found @0xff8345f0,          stubs_min = 0x00001c3c (0x1C30+0xC)
-//DEF(levent_table                            ,0xffc0c01c) // Found @0xffc0c01c,          stubs_min = 0xffc0c01c (0xffc0c01c)
-//DEF(FlashParamsTable                        ,0xffc898ec) // Found @0xffc898ec,          stubs_min = 0xffc898ec (0xffc898ec)
-//DEF(movie_status                            ,0x000072d4) // Found @0xff986d88,          stubs_min = 0x000072d4 (0x7290+0x44)
-//DEF(full_screen_refresh                     ,0x0000a5dc) // Found @0xffa53cb4,          stubs_min = 0x0000a5dc (0xA5DC)
-//DEF(canon_menu_active                       ,0x00003214) // Found @0xff896098,          stubs_min = 0x00003214 (0x3210+4)
-//DEF(canon_shoot_menu_active                 ,0x00008afd) // Found @0xff9dc738,          stubs_min = 0x00008afd (0x8AFC+1)
-//DEF(playrec_mode                            ,0x00002f38) // Found @0xff8880fc,          stubs_min = 0x00002f38 (0x2F34+0x4)
-//DEF(zoom_status                             ,0x0000e590) // Found @0xffb2290c,          stubs_min = 0x0000e590 (0xE590)
-//DEF(some_flag_for_af_scan                   ,0x000076b4) // Found @0xff98a814,          stubs_min = 0x000076b4 (0x76B4)
+// Values below can be overridden in 'stubs_min.S':
+DEF(physw_status                            ,0x00034474) // Found @0xff8349f4
+DEF(physw_run                               ,0x00001c3c) // Found @0xff8345f0
+DEF(levent_table                            ,0xffc0c01c) // Found @0xffc0c01c
+DEF(FlashParamsTable                        ,0xffc898ec) // Found @0xffc898ec
+DEF(movie_status                            ,0x000072d4) // Found @0xff986d88
+DEF(full_screen_refresh                     ,0x0000a5dc) // Found @0xffa53cb4
+DEF(canon_menu_active                       ,0x00003214) // Found @0xff896098
+DEF(canon_shoot_menu_active                 ,0x00008afd) // Found @0xff9dc738
+DEF(playrec_mode                            ,0x00002f38) // Found @0xff8880fc
+DEF(zoom_status                             ,0x0000e590) // Found @0xffb2290c
+DEF(some_flag_for_af_scan                   ,0x000076b4) // Found @0xff98a814
 
 // Values below go in 'lib.c':
@@ -72 +72 @@
 //#undef  CAM_UNCACHED_BIT
 //#define CAM_UNCACHED_BIT  0x40000000 // Found @0xff83af74
+
+// Misc stuff
+DEF(ctypes, 0xffbb7cce)
 
 // Stubs below matched 100%.