Changeset 1148 for trunk

Timestamp:

04/17/11 17:47:20 (2 years ago)

Author:

reyalP

Message:

g12 and exmem improvements from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg65002#msg65002

• G12 cleanup boot.c task hook (removes changes made while tracking down startup crash that are not needed).
• G12 updated color matrix
• display exmem start address when OPT_EXMEM_TESTING is enabled. This is the value to use for MEMISOSTART when using OPT_CHDK_IN_EXMEM (saves calculating it manually).

Location:

trunk

Files:

• core/gui.c (modified) (2 diffs)
• platform/g12/platform_camera.h (modified) (1 diff)
• platform/g12/sub/100c/boot.c (modified) (2 diffs)
• platform/g12/sub/100e/boot.c (modified) (2 diffs)

trunk/core/gui.c

@@ -2368 +2368 @@
         // If defined the exmem memory is allocated; but not used for CHDK.
         // It is filled with a guard value (see wrappers.c) which is checked here
-        // Any corruption is reported, otherwise 'OK' is displayed on screen.
+    // Any corruption is reported, otherwise 'OK' is displayed on screen (along with the exmem memory start address).
         extern void *exmem_start, *exmem_end;
         // check exmem allocated memory for corruption
@@ -2392 +2392 @@
         else
         {
-                strcpy(osd_buf,"OK");
+                sprintf(osd_buf, "OK 0x%x", exmem_start);
         }
         draw_txt_string(2, 13, osd_buf, conf.osd_color);

trunk/platform/g12/platform_camera.h

@@ -79 +79 @@
         //need fixing *****************************************************
     #define cam_CalibrationIlluminant1  17              // Standard Light A
+/*
     #define CAM_COLORMATRIX1                               \
-      14134, 1000000, -5576, 1000000, -1527, 1000000, \
-     -1991,  1000000, 10719,  1000000, 1273,   1000000, \
-      -1158,   1000000, 1929,   1000000, 3581,  1000000
+      14134, 100000, -5576, 100000, -1527, 100000, \
+      -1991, 100000, 10719, 100000,  1273, 100000, \
+      -1158, 100000,  1929, 100000,  3581, 100000
+*/
+    // From dcraw
+    #define CAM_COLORMATRIX1                       \
+      13244, 10000, -5501, 10000, -1248, 10000, \
+      -1508, 10000,  9858, 10000,  1935, 10000, \
+       -270, 10000,  1083, 10000,  4366, 10000
 
     // cropping

trunk/platform/g12/sub/100c/boot.c

@@ -49 +49 @@
         if(tcb->entry == (void*)task_MovieRecord)               tcb->entry = (void*)movie_record_task;
         if(tcb->entry == (void*)task_ExpDrv)                    tcb->entry = (void*)exp_drv_task;
-}
-
-void taskHook2(context_t **context)
-{ 
-        task_t *tcb=(task_t*)((char*)context-offsetof(task_t, context));
-
-        // Replace firmware task addresses with ours
-        if(tcb->entry == (void*)task_InitFileModules)   tcb->entry = (void*)init_file_modules_task;
 }
 
@@ -182 +174 @@
         //http://chdk.setepontos.com/index.php/topic,4194.0.html
         *(int*)0x1938=(int)taskHook;
-        *(int*)0x193C=(int)taskHook2; // setting this to an empty function seems to fix startup crash in movie mode ???
+        *(int*)0x193C=(int)taskHook;
     
         // replacement of sub_FF864BE0 for correct power-on.

trunk/platform/g12/sub/100e/boot.c

@@ -49 +49 @@
         if(tcb->entry == (void*)task_MovieRecord)               tcb->entry = (void*)movie_record_task;
         if(tcb->entry == (void*)task_ExpDrv)                    tcb->entry = (void*)exp_drv_task;
-}
-
-void taskHook2(context_t **context)
-{ 
 }
 
@@ -178 +174 @@
         //http://chdk.setepontos.com/index.php/topic,4194.0.html
         *(int*)0x1938=(int)taskHook;
-        *(int*)0x193C=(int)taskHook2; // setting this to an empty function seems to fix startup crash in movie mode ???
+        *(int*)0x193C=(int)taskHook;
     
         // replacement of sub_FF864BE0 for correct power-on.