Changeset 1892

Timestamp:

06/02/12 21:21:49 (12 months ago)

Author:

reyalp

Message:

Merged revision(s) 1891 from trunk:
sx200is - update from ADamb in ​http://chdk.setepontos.com/index.php?topic=650.msg86004#msg86004 + stubs_entry.S update with full dump

Location:

branches/release-1_0

Files:

• . (modified) (1 prop)
• platform/sx200is/lib.c (modified) (1 diff)
• platform/sx200is/sub/100c/stubs_entry.S (modified) (2 diffs)
• platform/sx200is/sub/100c/stubs_min.S (modified) (1 diff)

branches/release-1_0/platform/sx200is/lib.c

@@ -67 +67 @@
 {
     extern int active_palette_buffer;
-    extern char* palette_buffer[];
-    return (palette_buffer[active_palette_buffer]+0xC);
+    extern int** palette_buffer_ptr;
+    return (palette_buffer_ptr[active_palette_buffer]+0x3);
 }
+
 // Function to load CHDK custom colors into active Canon palette
 void load_chdk_palette()

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

@@ -5 +5 @@
 //   DRYOS R31 (DRYOS version 2.3, release #0031)
 //   Firmware Ver GM1.00C
-//   Possible corrupt firmware dump - file size to small for start address 0xff810000
-//     file size = 4.00MB, should be 7.94MB
-//   Could not find Camera name - possible corrupt firmware dump
+//   Canon PowerShot SX200 IS
 
 // Values for makefile.inc
+//   PLATFORMID = 12736 (0x31c0) // Found @ 0xfffe0130
 //   MAXRAMADDR = 0x03ffffff
+//   KEYSYS = d4                 // Found @ 0xffff356c
+//   NEED_ENCODED_DISKBOOT = 2   // Found @ 0xffff357c
 
 // Stubs below should be checked. Stub not matched 100%, or difference found to current 'stubs_entry_2.S'
@@ -33 +34 @@
 DEF(zoom_status                             ,0x0000b850) // Found @0xffa775d0
 DEF(some_flag_for_af_scan                   ,0x00006af8) // Found @0xff93b340
+// focus_len_table contains zoom focus lengths for use in 'get_focal_length' (main.c).
+// each entry contains 3 int value(s), the first is the zoom focus length.
+// there are 126 entries in the table - set NUM_FL to 126
+DEF(focus_len_table                         ,0xfffe8538) // Found @0xfffe8538
 DEF(zoom_busy                               ,0x000064f0) // Found @0xff9342b4
 DEF(focus_busy                              ,0x000063f8) // Found @0xff92e97c

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

@@ -4 +4 @@
 DEF(enabled_refresh_physical_screen,    0x8e04 + 0x30)  //found at FF9D4918 and FF9D4F38
 DEF(led_table,                          0x24AC + 0x04)  // found at FF847374
-DEF(palette_buffer,                 0x15B5A0) // ref by 0x8D9C, sub_FF9CFC10
+DEF(palette_buffer_ptr,               0x8D9C) // points to 0x15B5A0, sub_FF9CFC10
 DEF(active_palette_buffer,            0x8D8C) // sub_FF9CFE34
 DEF(palette_control,                  0x8D88) // sub_FF9CFE34