Changeset 1717

Timestamp:

03/09/12 06:01:51 (15 months ago)

Author:

reyalp

Message:

ixus220_elph300hs updates from srsa_rc in ​http://chdk.setepontos.com/index.php?topic=650.msg82542#msg82542
fix recreview_hold and vid_get_viewport_fb_d()

Location:

branches/release-1_0/platform/ixus220_elph300hs/sub

Files:

• 100c/lib.c (modified) (1 diff)
• 100c/stubs_entry.S (modified) (1 diff)
• 100c/stubs_min.S (modified) (1 diff)
• 101a/lib.c (modified) (1 diff)
• 101a/stubs_entry.S (modified) (1 diff)
• 101a/stubs_min.S (modified) (1 diff)
• 101c/lib.c (modified) (1 diff)
• 101c/stubs_entry.S (modified) (1 diff)
• 101c/stubs_min.S (modified) (1 diff)
• 101g/lib.c (modified) (1 diff)
• 101g/stubs_entry.S (modified) (1 diff)
• 101g/stubs_min.S (modified) (1 diff)

branches/release-1_0/platform/ixus220_elph300hs/sub/100c/lib.c

@@ -59 +59 @@
 void *vid_get_viewport_fb_d()
 {
-        //FF06C580 dword_FF06C580  DCD 0x3C70
-        //FF06D300                 STR     R12, [R5,#0x58
-        return (void*)(*(int*)(0x3C70+0x58));                  
-
+        return (void*)(*(int*)(0x2c08+0x58));
 }
 

branches/release-1_0/platform/ixus220_elph300hs/sub/100c/stubs_entry.S

@@ -36 +36 @@
 DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
-//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510, ** != ** stubs_min = 0x000094c4 (0x93D4+0xF0)
+//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828)
 
 // Values below go in 'lib.c':

branches/release-1_0/platform/ixus220_elph300hs/sub/100c/stubs_min.S

@@ -1 +1 @@
 #include "stubs_asm.h"
 
-DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
+DEF(recreview_hold,                     0x00003828)
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4
 DEF(focus_len_table,                    0xfffea288)     // search for 21500 (longest focus length in micrometers) & 4300 (shortest length)

branches/release-1_0/platform/ixus220_elph300hs/sub/101a/lib.c

@@ -59 +59 @@
 void *vid_get_viewport_fb_d()
 {
-        //FF06C580 dword_FF06C580  DCD 0x3C70
-        //FF06D300                 STR     R12, [R5,#0x58
-        return (void*)(*(int*)(0x3C70+0x58));                  
-
+        return (void*)(*(int*)(0x2c08+0x58));
 }
 

branches/release-1_0/platform/ixus220_elph300hs/sub/101a/stubs_entry.S

@@ -36 +36 @@
 DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
-//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510, ** != ** stubs_min = 0x000094c4 (0x93D4+0xF0)
+//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828)
 
 // Values below go in 'lib.c':

branches/release-1_0/platform/ixus220_elph300hs/sub/101a/stubs_min.S

@@ -1 +1 @@
 #include "stubs_asm.h"
 
-DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
+DEF(recreview_hold,                     0x00003828)
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4
 DEF(focus_len_table,                    0xfffea288)     // search for 21500 (longest focus length in micrometers) & 4300 (shortest length)

branches/release-1_0/platform/ixus220_elph300hs/sub/101c/lib.c

@@ -59 +59 @@
 void *vid_get_viewport_fb_d()
 {
-        //FF06C580 dword_FF06C580  DCD 0x3C70
-        //FF06D300                 STR     R12, [R5,#0x58
-        return (void*)(*(int*)(0x3C70+0x58));                  
-
+        return (void*)(*(int*)(0x2c08+0x58));
 }
 

branches/release-1_0/platform/ixus220_elph300hs/sub/101c/stubs_entry.S

@@ -36 +36 @@
 DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
-//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510, ** != ** stubs_min = 0x000094c4 (0x93D4+0xF0)
+//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828)
 
 // Values below go in 'lib.c':

branches/release-1_0/platform/ixus220_elph300hs/sub/101c/stubs_min.S

@@ -1 +1 @@
 #include "stubs_asm.h"
 
-DEF(recreview_hold,                     0x93D4 + 0xF0)  // FF1B6640
+DEF(recreview_hold,                     0x00003828)
 DEF(led_table,                          0x258C + 0x04)  // FF0557C4
 DEF(focus_len_table,                    0xfffea288)     // search for 21500 (longest focus length in micrometers) & 4300 (shortest length)

branches/release-1_0/platform/ixus220_elph300hs/sub/101g/lib.c

@@ -59 +59 @@
 void *vid_get_viewport_fb_d()
 {
-        //FF06C580 dword_FF06C580  DCD 0x3C70
-        //FF06D300                 STR     R12, [R5,#0x58
-        return (void*)(*(int*)(0x3C70+0x58));                  
-
+        return (void*)(*(int*)(0x2c08+0x58));
 }
 

branches/release-1_0/platform/ixus220_elph300hs/sub/101g/stubs_entry.S

@@ -36 +36 @@
 DEF(zoom_busy                               ,0x00006cf4) // Found @0xff97fd74
 DEF(focus_busy                              ,0x00006b68) // Found @0xff97af60
-//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510, ** != ** stubs_min = 0x000094c4 (0x93D4+0xF0)
+//DEF(recreview_hold                          ,0x00003828) // Found @0xff8a6510,          stubs_min = 0x00003828 (0x00003828)
 
 // Values below go in 'lib.c':

branches/release-1_0/platform/ixus220_elph300hs/sub/101g/stubs_min.S

@@ -7 +7 @@
 DEF(focus_len_table, 0xfffea288)                  // search for 21500 (longest focus length in micrometers) & 4300 (shortest length)
 
+DEF(recreview_hold,                     0x00003828)
+
 //not touched
-DEF(recreview_hold, 0x93D4 + 0xF0)        // FF1B6640
 DEF(led_table, 0x258C + 0x04)             // FF0557C4