Changeset 1068 for trunk/include/camera.h

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.

File:

• trunk/include/camera.h (modified) (2 diffs)

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
 
 //----------------------------------------------------------