Changeset 1630

Timestamp:

01/31/12 05:10:12 (16 months ago)

Author:

reyalp

Message:

Merged r1629 from trunk: a470 100e and 101b - use sig finder values for stubs_min.S. Sig finder values verified correct on 102c by srsa_4c, assumed correct on other firmwares

Location:

branches/release-1_0

Files:

• . (modified) (1 prop)
• platform/a470/sub/100e/stubs_entry.S (modified) (1 diff)
• platform/a470/sub/100e/stubs_min.S (modified) (2 diffs)
• platform/a470/sub/101b/stubs_entry.S (modified) (1 diff)
• platform/a470/sub/101b/stubs_min.S (modified) (2 diffs)

branches/release-1_0/platform/a470/sub/100e/stubs_entry.S

@@ -31 +31 @@
 //DEF(levent_table                            ,0xffe72ec8) // Found @0xffe72ec8,          stubs_min = 0xffe72ec8 (0xFFE72EC8)
 //DEF(FlashParamsTable                        ,0xffe8fc68) // Found @0xffe8fc68,          stubs_min = 0xffe8fc68 (0xffe8fc68)
-//DEF(movie_status                            ,0x000051d8) // Found @0xffc45174, ** != ** stubs_min = 0x00005200 (0x5200)
+//DEF(movie_status                            ,0x000051d8) // Found @0xffc45174,          stubs_min = 0x000051d8 (0x51d8)
 //DEF(canon_menu_active                       ,0x00009014) // Found @0xffd1eec4,          stubs_min = 0x00009014 (0x9014)
-//DEF(canon_shoot_menu_active                 ,0x000097e1) // Found @0xffd37684, ** != ** stubs_min = 0x00009768 (0x9768)
+//DEF(canon_shoot_menu_active                 ,0x000097e1) // Found @0xffd37684,          stubs_min = 0x000097e1 (0x97e1)
 //DEF(playrec_mode                            ,0x00005348) // Found @0xffc4b760,          stubs_min = 0x00005348 (0x5344+4)
-//DEF(zoom_status                             ,0x0000d020) // Found @0xffde8948, ** != ** stubs_min = 0x0000d7c4 (0xD7C4)
-//DEF(some_flag_for_af_scan                   ,0x0000cd9c) // Found @0xffdd73a8, ** != ** stubs_min = 0x0000cdec (0xCDEC)
-//DEF(zoom_busy                               ,0x000083a4) // Found @0xffd05d3c, ** != ** stubs_min = 0x00008050 (0x8050)
+//DEF(zoom_status                             ,0x0000d020) // Found @0xffde8948,          stubs_min = 0x0000d020 (0xd020)
+//DEF(some_flag_for_af_scan                   ,0x0000cd9c) // Found @0xffdd73a8,          stubs_min = 0x0000cd9c (0xcd9c)
+//DEF(zoom_busy                               ,0x000083a4) // Found @0xffd05d3c,          stubs_min = 0x000083a4 (0x83a4)
 //DEF(focus_busy                              ,0x000082b0) // Found @0xffd018d0,          stubs_min = 0x000082b0 (0x82B0)
-//DEF(recreview_hold                          ,0x00005b3c) // Found @0xffc63e24, ** != ** stubs_min = 0x00009634 (0x9634)
+//DEF(recreview_hold                          ,0x00005b3c) // Found @0xffc63e24,          stubs_min = 0x00005b3c (0x5b3c)
 
 // Values below go in 'lib.c':

branches/release-1_0/platform/a470/sub/100e/stubs_min.S

@@ -4 +4 @@
 DEF(physw_run, 0x1BF0) //Found for A470 in task_PhySw, same as A590
 DEF(FlashParamsTable,  0xffe8fc68) // 100e ok
-DEF(zoom_busy, 0x8050)  //0x803c+14 same as in a590
+DEF(zoom_busy, 0x83a4)  // from sig finder
 DEF(focus_busy, 0x82B0) // 0x82A8+0x08 found in sub_FFD02310
 
@@ -11 +11 @@
 //-
 
-DEF(canon_shoot_menu_active,0x9768)   // 0x9768+1 ??BAD
+DEF(canon_shoot_menu_active,0x97e1)   // from sig finder
 
-DEF(recreview_hold, 0x9634) // ?? found in GetAEIntegralServiceMode_6
+DEF(recreview_hold, 0x5b3c) // from sig finder
 
-DEF(movie_status, 0x5200)  // 0x51C8 + 0x38
-DEF(some_flag_for_af_scan, 0xCDEC) 
-DEF(zoom_status, 0xD7C4) 
+DEF(movie_status, 0x51d8)  // from sig finder
+DEF(some_flag_for_af_scan, 0xcd9c)  //from sig finder
+DEF(zoom_status, 0xd020)  // from sig finder
 DEF(led_table, 0x22AC) //Found using LEDDrv.c
 DEF(levent_table,0xFFE72EC8)

branches/release-1_0/platform/a470/sub/101b/stubs_entry.S

@@ -31 +31 @@
 //DEF(levent_table                            ,0xffe72ec4) // Found @0xffe72ec4,          stubs_min = 0xffe72ec4 (0xFFE72EC4)
 //DEF(FlashParamsTable                        ,0xffe8fc64) // Found @0xffe8fc64,          stubs_min = 0xffe8fc64 (0xffe8fc64)
-//DEF(movie_status                            ,0x000051d8) // Found @0xffc45174, ** != ** stubs_min = 0x00005200 (0x5200)
+//DEF(movie_status                            ,0x000051d8) // Found @0xffc45174,          stubs_min = 0x000051d8 (0x51d8)
 //DEF(canon_menu_active                       ,0x00009014) // Found @0xffd1eec4,          stubs_min = 0x00009014 (0x9014)
-//DEF(canon_shoot_menu_active                 ,0x000097e1) // Found @0xffd37684, ** != ** stubs_min = 0x00009718 (0x9718)
+//DEF(canon_shoot_menu_active                 ,0x000097e1) // Found @0xffd37684,          stubs_min = 0x000097e1 (0x97e1)
 //DEF(playrec_mode                            ,0x00005348) // Found @0xffc4b760,          stubs_min = 0x00005348 (0x5344+4)
-//DEF(zoom_status                             ,0x0000d020) // Found @0xffde8944, ** != ** stubs_min = 0x0000d7c4 (0xD7C4)
-//DEF(some_flag_for_af_scan                   ,0x0000cd9c) // Found @0xffdd73a4, ** != ** stubs_min = 0x0000cdec (0xCDEC)
-//DEF(zoom_busy                               ,0x000083a4) // Found @0xffd05d3c, ** != ** stubs_min = 0x00008050 (0x8050)
+//DEF(zoom_status                             ,0x0000d020) // Found @0xffde8944,          stubs_min = 0x0000d020 (0xd020)
+//DEF(some_flag_for_af_scan                   ,0x0000cd9c) // Found @0xffdd73a4,          stubs_min = 0x0000cd9c (0xcd9c)
+//DEF(zoom_busy                               ,0x000083a4) // Found @0xffd05d3c,          stubs_min = 0x000083a4 (0x83a4)
 //DEF(focus_busy                              ,0x000082b0) // Found @0xffd018d0,          stubs_min = 0x000082b0 (0x82B0)
-//DEF(recreview_hold                          ,0x00005b3c) // Found @0xffc63e24, ** != ** stubs_min = 0x000095e4 (0x95E4)
+//DEF(recreview_hold                          ,0x00005b3c) // Found @0xffc63e24,          stubs_min = 0x00005b3c (0x5b3c)
 
 // Values below go in 'lib.c':

branches/release-1_0/platform/a470/sub/101b/stubs_min.S

@@ -4 +4 @@
 DEF(physw_run, 0x1BF0) //Found for A470 in task_PhySw, same as A590
 DEF(FlashParamsTable,  0xffe8fc64) // 101b ok
-DEF(zoom_busy, 0x8050)  //0x803c+14 same as in a590
+DEF(zoom_busy, 0x83a4)  // from sig finder
 DEF(focus_busy, 0x82B0) // 0x82A8+0x08 found in sub_FFD02310
 
@@ -11 +11 @@
 //-
 
-DEF(canon_shoot_menu_active,0x9718) // from http://chdk.setepontos.com/index.php/topic,3368.msg37738.html#msg37738
+DEF(canon_shoot_menu_active,0x97e1) // from sig finder
 
-DEF(recreview_hold, 0x95E4) // from http://chdk.setepontos.com/index.php/topic,3368.msg37738.html#msg37738
+DEF(recreview_hold, 0x5b3c) // from sig finder
 
-DEF(movie_status, 0x5200)  // 0x51C8 + 0x38
-DEF(some_flag_for_af_scan, 0xCDEC) 
-DEF(zoom_status, 0xD7C4) 
+DEF(movie_status, 0x51d8)  // from sig finder
+DEF(some_flag_for_af_scan, 0xcd9c)  // from sig finder
+DEF(zoom_status, 0xd020) // from sig finder
 DEF(led_table, 0x22AC) //Found using LEDDrv.c
 DEF(levent_table,0xFFE72EC4)