Changeset 1893

Timestamp:

06/02/12 22:40:08 (12 months ago)

Author:

reyalp

Message:

update live view branch to trunk 1891

Location:

branches/reyalp-ptp-live

Files:

• . (modified) (1 prop)
• core/gui.c (modified) (1 diff)
• core/modules.c (modified) (1 diff)
• core/motion_detector.h (modified) (1 diff)
• core/script.c (modified) (2 diffs)
• 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/reyalp-ptp-live/core/gui.c

@@ -1983 +1983 @@
         {
             --show_md_grid;
-            if (module_mdetect_load())
+            // If motion detect library loaded then display the MD grid
+            // Don't call 'module_mdetect_load' here as we don't want to load
+            // the module, just see if it was already loaded.
+            if (libmotiondetect)
                 libmotiondetect->md_draw_grid();
         }

branches/reyalp-ptp-live/core/modules.c

@@ -164 +164 @@
 }
 
+void module_mdetect_unload()
+{
+        if (libmotiondetect)
+    {
+        module_unload(MODULE_NAME_MDETECT);  
+        libmotiondetect = 0;
+    }
+}
+
 
 /************* DYNAMIC LIBRARY ZEBRA ******/

branches/reyalp-ptp-live/core/motion_detector.h

@@ -119 +119 @@
         extern struct libmotiondetect_sym* libmotiondetect;
     extern struct libmotiondetect_sym* module_mdetect_load();           // 0fail, addr-ok
+    extern void module_mdetect_unload();
 #else
         // This section is for module

branches/reyalp-ptp-live/core/script.c

@@ -612 +612 @@
             break;
         case AS_MOTION_DETECTOR:
-            if (module_mdetect_load())
+            // If motion detect module loaded then run the MD code
+            // Don't call module_mdetect_load here as it may cause the
+            // module to be re-loaded after the script is interrupted
+            if (libmotiondetect)
             {
                 if (libmotiondetect->md_detect_motion()==0)
@@ -717 +720 @@
     }
     // If motion detect library loaded then shut down motion detector
-    // Don't call 'module_mdetect_load' here as we don't want to load
-    // the module, just see if it was already loaded.
-    if (libmotiondetect)
-        libmotiondetect->md_close_motion_detector();
+    module_mdetect_unload();
+
         shot_histogram_set(0);
     kbd_key_release_all();

branches/reyalp-ptp-live/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/reyalp-ptp-live/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
 //   PLATFORMOSVER = 31
+//   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'
@@ -34 +35 @@
 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/reyalp-ptp-live/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