Changeset 1068 for trunk

Timestamp:

02/26/11 23:29:27 (2 years ago)

Author:

reyalP

Message:

sx30 and g12 updates from philmoz in ​http://chdk.setepontos.com/index.php?topic=650.msg62260#msg62260

• updates for exmem memory allocation to allow these cameras to exclude video buffer memory
• fixed set_zoom function to correctly wait until zoom is finished before returning
• fixed startup code for SX30 so that init_file_modules_task gets called correctly in all cases

SX30 startup button change NOT added at this time.

Location:

trunk

Files:

• core/gui_draw.h (modified) (1 diff)
• include/camera.h (modified) (2 diffs)
• platform/generic/wrappers.c (modified) (5 diffs)
• platform/sx30/sub/100e/boot.c (modified) (2 diffs)
• platform/sx30/sub/100h/boot.c (modified) (2 diffs)
• platform/sx30/sub/100l/boot.c (modified) (2 diffs)

trunk/core/gui_draw.h

@@ -203 +203 @@
 #define COLOR_BLUE          0x14
 #define COLOR_YELLOW        0x16
-#define COLOR_BLACK         0x1d
+#define COLOR_BLACK         0xFF
 #define COLOR_BG            0x62
 #define COLOR_FG            COLOR_WHITE

trunk/include/camera.h

@@ -3223 +3223 @@
         #define CAM_DATE_FOLDER_NAMING  1
 
+        // EXMEM memory allocation values
+        #define EXMEM_HEAP_SKIP (0x08000000-0x07D08A00)                 // G12 & SX30 uses movie memory buffers at the top of the memory allocated by exmem_alloc
+        #define EXMEM_BUFFER_SIZE (1024*1024*2)                                 // desired amount of exmem memory to allocate
+
 //----------------------------------------------------------
 #elif defined (CAMERA_g12)
@@ -3325 +3329 @@
 
         #define CAM_CHDK_PTP 1
+
+        // EXMEM memory allocation values
+        #define EXMEM_HEAP_SKIP (0x08000000-0x07D08A00)                 // G12 & SX30 uses movie memory buffers at the top of the memory allocated by exmem_alloc
+        #define EXMEM_BUFFER_SIZE (1024*1024*2)                                 // desired amount of exmem memory to allocate
 
 //----------------------------------------------------------

trunk/platform/generic/wrappers.c

@@ -133 +133 @@
 #if defined(CAMERA_sx30)
 // SX30 - Can't find zoom_status, _MoveZoomLensWithPoint crashes camera
+// _PT_MoveOpticalZoomAt works, and updates PROPCASE_OPTICAL_ZOOM_POSITION; but doesn't wait for zoom to finish
         extern void _PT_MoveOpticalZoomAt(long*);
         if (lens_get_zoom_point() != newpt)
+        {
                 _PT_MoveOpticalZoomAt(&newpt);
+                while (zoom_busy) msleep(10);
+        }
 #elif defined(CAMERA_g12)
-// G12 - Can't find zoom_status, _MoveZoomLensWithPoint works anyway, and updates PROPCASE_OPTICAL_ZOOM_POSITION; but doesn't wait for zoom to finish
+// G12 - Can't find zoom_status, _MoveZoomLensWithPoint works anyway; but doesn't wait for zoom to finish
         if (lens_get_zoom_point() != newpt)
+        {
             _MoveZoomLensWithPoint((short*)&newpt);
-#else
+                while (zoom_busy) msleep(10);
+            _SetPropertyCase(PROPCASE_OPTICAL_ZOOM_POSITION, &newpt, sizeof(newpt));
+        }
+#else   // !CAMERA_g12
     _MoveZoomLensWithPoint((short*)&newpt);
 
@@ -151 +159 @@
                         break;
         }
-#else
+#else   // !CAMERA_s95
         while (zoom_busy) ;
-#endif
+#endif  // CAMERA_s95
 
     if (newpt==0) zoom_status=ZOOM_OPTICAL_MIN;
@@ -159 +167 @@
     else zoom_status=ZOOM_OPTICAL_MEDIUM;
     _SetPropertyCase(PROPCASE_OPTICAL_ZOOM_POSITION, &newpt, sizeof(newpt));
-#endif
+#endif  // CAMERA_g12
 }
 
@@ -517 +525 @@
 #ifdef OPT_EXMEM_MALLOC
 // I set this up to 16 mb and it still booted...
-#define EXMEM_HEAP_SIZE (1024*1024*2)
+#ifndef EXMEM_HEAP_SKIP
+#define EXMEM_HEAP_SKIP 0
+#endif
+#ifndef EXMEM_BUFFER_SIZE
+#define EXMEM_BUFFER_SIZE (1024*1024*2) // default size if not specified by camera
+#endif
+#define EXMEM_HEAP_SIZE (EXMEM_BUFFER_SIZE+EXMEM_HEAP_SKIP)     // desired space + amount to skip for the movie buffers (if needed)
 // these aren't currently needed elsewhere
 /*
@@ -541 +555 @@
         void *mem = _exmem_alloc(0,EXMEM_HEAP_SIZE,0);
         if(mem) {
-                exmem_heap = suba_init(mem,EXMEM_HEAP_SIZE,1,1024);
+                exmem_heap = suba_init(mem,EXMEM_HEAP_SIZE-EXMEM_HEAP_SKIP,1,1024);
         }
 }

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

@@ -33 +33 @@
 //}
 
-int done_delay = 0;
-
 void taskHook(context_t **context)
 { 
         task_t *tcb=(task_t*)((char*)context-offsetof(task_t, context));
-
-        if ((tcb->entry == (void*)mykbd_task) && (done_delay == 0))
-        {
-                done_delay = 1;
-                int i;
-                // Wait a while, otherwise init_file_modules_task doesn't get hooked when starting in play mode
-                for (i=0; i<0x100000; i++)
-                {
-                        asm volatile ( "nop\n" );
-                }
-        }
 
         extern void task_CaptSeq();
@@ -186 +173 @@
         //http://chdk.setepontos.com/index.php/topic,4194.0.html
         *(int*)0x1938=(int)taskHook;
+        *(int*)0x193C=(int)taskHook;    // need this for startup in Playback mode (otherwise init_file_modules_task doesn't hook properly)
     
         // replacement of sub_FF834740 for correct power-on.

trunk/platform/sx30/sub/100h/boot.c

@@ -33 +33 @@
 //}
 
-int done_delay = 0;
-
 void taskHook(context_t **context)
 { 
         task_t *tcb=(task_t*)((char*)context-offsetof(task_t, context));
-
-        if ((tcb->entry == (void*)mykbd_task) && (done_delay == 0))
-        {
-                done_delay = 1;
-                int i;
-                // Wait a while, otherwise init_file_modules_task doesn't get hooked when starting in play mode
-                for (i=0; i<0x100000; i++)
-                {
-                        asm volatile ( "nop\n" );
-                }
-        }
 
         extern void task_CaptSeq();
@@ -187 +174 @@
         //http://chdk.setepontos.com/index.php/topic,4194.0.html
         *(int*)0x1938=(int)taskHook;
+        *(int*)0x193C=(int)taskHook;    // need this for startup in Playback mode (otherwise init_file_modules_task doesn't hook properly)
     
         // replacement of sub_FF834740 for correct power-on.

trunk/platform/sx30/sub/100l/boot.c

@@ -33 +33 @@
 //}
 
-int done_delay = 0;
-
 void taskHook(context_t **context)
 { 
         task_t *tcb=(task_t*)((char*)context-offsetof(task_t, context));
-
-        if ((tcb->entry == (void*)mykbd_task) && (done_delay == 0))
-        {
-                done_delay = 1;
-                int i;
-                // Wait a while, otherwise init_file_modules_task doesn't get hooked when starting in play mode
-                for (i=0; i<0x100000; i++)
-                {
-                        asm volatile ( "nop\n" );
-                }
-        }
 
         extern void task_CaptSeq();
@@ -186 +173 @@
         //http://chdk.setepontos.com/index.php/topic,4194.0.html
         *(int*)0x1938=(int)taskHook;
+        *(int*)0x193C=(int)taskHook;    // need this for startup in Playback mode (otherwise init_file_modules_task doesn't hook properly)
     
         // replacement of sub_FF834740 for correct power-on.