Context Navigation

← Previous Changeset
Next Changeset →

Changeset 948

Timestamp:

02/09/12 19:51:54 (17 months ago)

Author:

rudi_de

Message:

Wieder angleichen von CHDK und CHDK-DE (Teil 3)

Betrifft alle

beinhaltet teilweise CHDK Rev. 1175, 1178, 1183

http://trac.assembla.com/chdk/changeset/1175
http://trac.assembla.com/chdk/changeset/1178
http://trac.assembla.com/chdk/changeset/1183

verringerter Speicherbedarf der luascript.c
Doppeleintrag der LUA-Funktion get_av96 entfernt

+ neue LUA-Funktion get_meminfo([heapname])
+ neue Schalter CAM_FIRMWARE_MEMINFO, CAM_NO_MEMPARTINFO in [platform_]camera.h

Location:

trunk

Files:

: 19 edited

core/luascript.c (modified) (6 diffs)
core/main.c (modified) (1 diff)
core/suba.c (modified) (1 diff)
include/camera.h (modified) (4 diffs)
include/lolevel.h (modified) (1 diff)
include/platform.h (modified) (1 diff)
platform/a1100/platform_camera.h (modified) (1 diff)
platform/a540/platform_camera.h (modified) (1 diff)
platform/a590/platform_camera.h (modified) (1 diff)
platform/d10/platform_camera.h (modified) (1 diff)
platform/g10/platform_camera.h (modified) (1 diff)
platform/g12/platform_camera.h (modified) (1 diff)
platform/generic/wrappers.c (modified) (3 diffs)
platform/ixus310_elph500hs/platform_camera.h (modified) (1 diff)
platform/ixus40_sd300/platform_camera.h (modified) (1 diff)
platform/s95/platform_camera.h (modified) (1 diff)
platform/sx20/platform_camera.h (modified) (1 diff)
platform/sx30/platform_camera.h (modified) (1 diff)
platform/sx40hs/platform_camera.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk/core/luascript.c

-                      r933
+                      r948
 #include "motion_detector.h"
 #include "ptp.h"
+#include "core.h"
 #include "gui_fselect.h"
 #include "lang.h"
 …
+}
+static void set_number_field(lua_State* L, const char *key, int val)
+{
+  lua_pushnumber(L, val);
+  lua_setfield(L, -2, key);
+}
 static int luaCB_get_buildinfo( lua_State* L )
+{
 …
 #endif
+/* helper for meminfo to set table field only if valid */
+static void set_meminfo_num( lua_State* L,const char *name, int val) {
+    if(val != -1) {
+        set_number_field( L, name, val );
+    }
+}
+/*
+meminfo=get_meminfo([heapname])
+get camera memory information
+heapname="system" or "exmem" if not given, meminfo is returned for heap used by CHDK for malloc
+meminfo is false if the requested heapname isn't valid ("exmem" when exmem is not enabled, or unknown)
+otherwise, a table of the form
+meminfo = {
+    name -- string "system" or "exmem"
+    chdk_malloc -- bool, this is the heap used by CHDK for malloc
+    chdk_start -- number, load address of CHDK
+    chdk_size -- number, size of CHDK image
+    -- all the following are numbers, will not be set if not available
+    start_address
+    end_address
+    total_size
+    allocated_size
+    allocated_peak
+    allocated_count
+    free_size
+    free_block_max_size
+    free_block_count
+}
+NOTES
+* under vxworks and cameras without GetMemInfo only the only valid fields
+  for the system heap will be those defined by chdk and free_block_max_size
+* the meaning of fields may not correspond exactly between exmem and system
+*/
+static int luaCB_get_meminfo( lua_State* L ) {
+    // for memory info, duplicated from lowlevel
+    extern const char _start,_end;
+#if defined(OPT_EXMEM_MALLOC) && !defined(OPT_EXMEM_TESTING)
+    const char *default_heapname="exmem";
+#else
+    const char *default_heapname="system";
+#endif
+    const char *heapname = luaL_optstring( L, 1, default_heapname );
+    cam_meminfo meminfo;
+    if(strcmp(heapname,"system") == 0) {
+#if defined(CAM_FIRMWARE_MEMINFO)
+        GetMemInfo(&meminfo);
+#else
+        memset(&meminfo,0xFF,sizeof(cam_meminfo));
+        meminfo.free_block_max_size = core_get_free_memory();
+#endif
+    }
+#if defined(OPT_EXMEM_MALLOC) && !defined(OPT_EXMEM_TESTING)
+    else if(strcmp(heapname,"exmem") == 0) {
+        GetExMemInfo(&meminfo);
+        meminfo.allocated_count = -1; // not implemented in suba
+    }
+#endif
+    else {
+        lua_pushboolean(L,0);
+        return 1;
+    }
+    // adjust start and size, if CHDK is loaded at heap start
+    if(meminfo.start_address == (int)(&_start)) {
+        meminfo.start_address += MEMISOSIZE;
+        meminfo.total_size -= MEMISOSIZE;
+    }
+    lua_createtable(L, 0, 13); // might not always use 13, but doesn't hurt
+    set_string_field( L,"name", heapname );
+    lua_pushboolean( L, (strcmp(heapname,default_heapname)==0));
+    lua_setfield(L, -2, "chdk_malloc");
+    set_number_field( L, "chdk_start", (int)(&_start) );
+    set_number_field( L, "chdk_size", MEMISOSIZE );
+    set_meminfo_num( L, "start_address", meminfo.start_address );
+    set_meminfo_num( L, "end_address", meminfo.end_address);
+    set_meminfo_num( L, "total_size", meminfo.total_size);
+    set_meminfo_num( L, "allocated_size", meminfo.allocated_size);
+    set_meminfo_num( L, "allocated_peak", meminfo.allocated_peak);
+    set_meminfo_num( L, "allocated_count", meminfo.allocated_count);
+    set_meminfo_num( L, "free_size", meminfo.free_size);
+    set_meminfo_num( L, "free_block_max_size", meminfo.free_block_max_size);
+    set_meminfo_num( L, "free_block_count", meminfo.free_block_count);
+    return 1;
+}
 /*
 set scheduling parameters
 …
+}
+static void register_func( lua_State* L, const char *name, void *func) {
+  lua_pushcfunction( L, func );
+  lua_setglobal( L, name );
+}
+#define FUNC( X ) { #X, luaCB_##X },
+static const luaL_Reg chdk_funcs[] = {
+    FUNC(shoot)
+    FUNC(sleep)
+    FUNC(cls)
+    FUNC(set_console_layout)
+    FUNC(set_console_autoredraw)
+    FUNC(console_redraw)
+    FUNC(get_av96)
+    FUNC(get_bv96)
+    FUNC(get_day_seconds)
+    FUNC(get_disk_size)
+    FUNC(get_dofinfo)
+    FUNC(get_free_disk_space)
+    FUNC(get_focus)
+    FUNC(get_iso_market)
+    FUNC(get_iso_mode)
+    FUNC(get_iso_real)
+    FUNC(get_jpg_count)
+    FUNC(get_prop)
+    FUNC(get_prop_str)
+    FUNC(get_raw_count)
+    FUNC(get_raw_nr)
+    FUNC(get_raw)
+    FUNC(get_sv96)
+    FUNC(get_tick_count)
+    FUNC(get_tv96)
+    FUNC(get_user_av_id)
+    FUNC(get_user_av96)
+    FUNC(get_user_tv_id)
+    FUNC(get_user_tv96)
+    FUNC(get_vbatt)
+    FUNC(get_zoom)
+    FUNC(get_exp_count)
+    FUNC(get_flash_params_count)
+    FUNC(get_parameter_data)
+    FUNC(set_av96_direct)
+    FUNC(set_av96)
+    FUNC(set_focus)
+    FUNC(set_iso_mode)
+    FUNC(set_iso_real)
+    FUNC(set_led)
+    FUNC(set_nd_filter)
+    FUNC(set_prop)
+    FUNC(set_prop_str)
+    FUNC(set_raw_nr)
+    FUNC(set_raw)
+    FUNC(set_sv96)
+    FUNC(set_tv96_direct)
+    FUNC(set_tv96)
+    FUNC(set_user_av_by_id_rel)
+    FUNC(set_user_av_by_id)
+    FUNC(set_user_av96)
+    FUNC(set_user_tv_by_id_rel)
+    FUNC(set_user_tv_by_id)
+    FUNC(set_user_tv96)
+    FUNC(set_zoom_speed)
+    FUNC(set_zoom_rel)
+    FUNC(set_zoom)
+    FUNC(wait_click)
+    FUNC(is_pressed)
+    FUNC(is_key)
+#ifdef CAM_HAS_JOGDIAL
+    FUNC(wheel_right)
+    FUNC(wheel_left)
+#endif
+    FUNC(md_get_cell_diff)
+    FUNC(md_detect_motion)
+    FUNC(autostarted)
+    FUNC(get_autostart)
+    FUNC(set_autostart)
+    FUNC(get_usb_power)
+    FUNC(enter_alt)
+    FUNC(exit_alt)
+    FUNC(shut_down)
+    FUNC(print_screen)
+#ifdef CAM_MULTIPART
+    FUNC(get_partitionInfo)
+    FUNC(swap_partitions)
+#endif
+    FUNC(get_focus_mode)
+    FUNC(get_focus_state)
+    FUNC(get_focus_ok)
+    FUNC(get_propset)
+    FUNC(get_zoom_steps)
+    FUNC(get_drive_mode)
+    FUNC(get_flash_mode)
+    FUNC(get_shooting)
+    FUNC(get_flash_ready)
+    FUNC(get_IS_mode)
+    FUNC(set_ev)
+    FUNC(get_ev)
+    FUNC(get_orientation_sensor)
+    FUNC(get_nd_present)
+    FUNC(get_movie_status)
+    FUNC(set_movie_status)
+    FUNC(get_histo_range)
+    FUNC(shot_histo_enable)
+    FUNC(play_sound)
+    FUNC(get_temperature)
+    FUNC(peek)
+    FUNC(poke)
+    FUNC(bitand)
+    FUNC(bitor)
+    FUNC(bitxor)
+    FUNC(bitshl)
+    FUNC(bitshri)
+    FUNC(bitshru)
+    FUNC(bitnot)
+    FUNC(get_time)
+    FUNC(get_buildinfo)
+    FUNC(get_mode)
+    FUNC(set_raw_develop)
+    // NOTE these functions normally run in the spytask.
+    // called from lua they will run from kbd task instead
+    FUNC(raw_merge_start)
+    FUNC(raw_merge_add_file)
+    FUNC(raw_merge_end)
+    FUNC(set_backlight)
+    FUNC(set_aflock)
+#ifdef OPT_CURVES
+    FUNC(set_curve_state)
+    FUNC(get_curve_state)
+    FUNC(set_curve_file)
+    FUNC(get_curve_file)
+#endif
+    // get levent definition by name or id, nil if not found
+    FUNC(get_levent_def)
+    // get levent definition by index, nil if out of range
+    FUNC(get_levent_def_by_index)
+    // get levent index from name or ID
+    FUNC(get_levent_index)
+    FUNC(post_levent_to_ui)
+    FUNC(post_levent_for_npt)
+    FUNC(set_levent_active)
+    FUNC(set_levent_script_mode)
+    FUNC(set_capture_mode)
+    FUNC(set_capture_mode_canon)
+    FUNC(is_capture_mode_valid)
+    FUNC(set_record)
+    FUNC(switch_mode_usb)
+#ifdef OPT_LUA_CALL_NATIVE
+    FUNC(call_event_proc)
+    FUNC(call_func_ptr)
+#endif
+    FUNC(reboot)
+    FUNC(get_config_value)
+    FUNC(set_config_value)
+    FUNC(set_file_attributes)
+    FUNC(get_meminfo)
+    FUNC(file_browser)
+    FUNC(draw_pixel)
+    FUNC(draw_line)
+    FUNC(draw_rect)
+    FUNC(draw_rect_filled)
+    FUNC(draw_ellipse)
+    FUNC(draw_ellipse_filled)
+    FUNC(draw_clear)
+    FUNC(draw_string)
+    FUNC(set_yield)
+#ifdef CAM_CHDK_PTP
+    FUNC(read_usb_msg)
+    FUNC(write_usb_msg)
+#endif
+    {NULL, NULL},
+};
 void register_lua_funcs( lua_State* L )
+{
+#define FUNC( X )                       \
+  lua_pushcfunction( L, luaCB_##X );    \
+  lua_setglobal( L, #X )
+  FUNC(shoot);
+  FUNC(sleep);
+  FUNC(cls);
+  FUNC(set_console_layout);
+  FUNC(set_console_autoredraw);
+  FUNC(console_redraw);
+  const luaL_reg *r;
   lua_pushlightuserdata( L, action_push_click );
   lua_pushcclosure( L, luaCB_keyfunc, 1 );
 …
   lua_setglobal( L, "release" );
+  FUNC(get_av96);
+  FUNC(get_av96);
+  FUNC(get_bv96);
+  FUNC(get_day_seconds);
+  FUNC(get_disk_size);
+  FUNC(get_dofinfo);
+  FUNC(get_free_disk_space);
+  FUNC(get_focus);
+  FUNC(get_iso_market);
+  FUNC(get_iso_mode);
+  FUNC(get_iso_real);
+  FUNC(get_jpg_count);
+  FUNC(get_prop);
+  FUNC(get_prop_str);
+  FUNC(get_raw_count);
+  FUNC(get_raw_nr);
+  FUNC(get_raw);
+  FUNC(get_sv96);
+  FUNC(get_tick_count);
+  FUNC(get_tv96);
+  FUNC(get_user_av_id);
+  FUNC(get_user_av96);
+  FUNC(get_user_tv_id);
+  FUNC(get_user_tv96);
+  FUNC(get_vbatt);
+  FUNC(get_zoom);
+  FUNC(get_exp_count);
+  FUNC(get_flash_params_count);
+  FUNC(get_parameter_data);
+  FUNC(set_av96_direct);
+  FUNC(set_av96);
+  FUNC(set_focus);
+  FUNC(set_iso_mode);
+  FUNC(set_iso_real);
+  FUNC(set_led);
+  FUNC(set_nd_filter);
+  FUNC(set_prop);
+  FUNC(set_prop_str);
+  FUNC(set_raw_nr);
+  FUNC(set_raw);
+  FUNC(set_sv96);
+  FUNC(set_tv96_direct);
+  FUNC(set_tv96);
+  FUNC(set_user_av_by_id_rel);
+  FUNC(set_user_av_by_id);
+  FUNC(set_user_av96);
+  FUNC(set_user_tv_by_id_rel);
+  FUNC(set_user_tv_by_id);
+  FUNC(set_user_tv96);
+  FUNC(set_zoom_speed);
+  FUNC(set_zoom_rel);
+  FUNC(set_zoom);
+  FUNC(wait_click);
+  FUNC(is_pressed);
+  FUNC(is_key);
+#ifdef CAM_HAS_JOGDIAL
+  FUNC(wheel_right);
+  FUNC(wheel_left);
+#endif
+  FUNC(md_get_cell_diff);
+  FUNC(md_detect_motion);
+  FUNC(autostarted);
+  FUNC(get_autostart);
+  FUNC(set_autostart);
+  FUNC(get_usb_power);
+  FUNC(enter_alt);
+  FUNC(exit_alt);
+  FUNC(shut_down);
+  FUNC(print_screen);
+#ifdef CAM_MULTIPART
+  FUNC(get_partitionInfo);
+  FUNC(swap_partitions);
+#endif
+  FUNC(get_focus_mode);
+  FUNC(get_focus_state);
+  FUNC(get_focus_ok);
+  FUNC(get_propset);
+  FUNC(get_zoom_steps);
+  FUNC(get_drive_mode);
+  FUNC(get_flash_mode);
+  FUNC(get_shooting);
+  FUNC(get_flash_ready);
+  FUNC(get_IS_mode);
+  FUNC(set_ev);
+  FUNC(get_ev);
+  FUNC(get_orientation_sensor);
+  FUNC(get_nd_present);
+  FUNC(get_movie_status);
+  FUNC(set_movie_status);
+  FUNC(get_histo_range);
+  FUNC(shot_histo_enable);
+  FUNC(play_sound);
+  FUNC(get_temperature);
+  FUNC(peek);
+  FUNC(poke);
+  FUNC(bitand);
+  FUNC(bitor);
+  FUNC(bitxor);
+  FUNC(bitshl);
+  FUNC(bitshri);
+  FUNC(bitshru);
+  FUNC(bitnot);
+  FUNC(get_time);
+  FUNC(get_buildinfo);
+  FUNC(get_mode);
+  FUNC(set_raw_develop);
+  // NOTE these functions normally run in the spytask.
+  // called from lua they will run from kbd task instead
+  FUNC(raw_merge_start);
+  FUNC(raw_merge_add_file);
+  FUNC(raw_merge_end);
+  FUNC(set_backlight);
+   FUNC(set_aflock);
+#ifdef OPT_CURVES
+   FUNC(set_curve_state);
+   FUNC(get_curve_state);
+   FUNC(set_curve_file);
+   FUNC(get_curve_file);
+#endif
+// get levent definition by name or id, nil if not found
+   FUNC(get_levent_def);
+// get levent definition by index, nil if out of range
+   FUNC(get_levent_def_by_index);
+// get levent index from name or ID
+   FUNC(get_levent_index);
+   FUNC(post_levent_to_ui);
+   FUNC(post_levent_for_npt);
+   FUNC(set_levent_active);
+   FUNC(set_levent_script_mode);
+   FUNC(set_capture_mode);
+   FUNC(set_capture_mode_canon);
+   FUNC(is_capture_mode_valid);
+   FUNC(set_record);
+   FUNC(switch_mode_usb);
+#ifdef OPT_LUA_CALL_NATIVE
+   FUNC(call_event_proc);
+   FUNC(call_func_ptr);
+#endif
+   FUNC(reboot);
+   FUNC(get_config_value);
+   FUNC(set_config_value);
+   FUNC(set_file_attributes);
+   FUNC(file_browser);
+   FUNC(draw_pixel);
+   FUNC(draw_line);
+   FUNC(draw_rect);
+   FUNC(draw_rect_filled);
+   FUNC(draw_ellipse);
+   FUNC(draw_ellipse_filled);
+   FUNC(draw_clear);
+   FUNC(draw_string);
+   FUNC(set_yield);
+  for(r=chdk_funcs;r->name;r++) {
+    lua_pushcfunction( L, r->func );
+    lua_setglobal( L, r->name );
+  }
 #ifdef CAM_CHDK_PTP
-   FUNC(read_usb_msg);
-   FUNC(write_usb_msg);
    luaL_dostring(L,"function usb_msg_table_to_string(t)"
                     " local v2s=function(v)"
 …
 #endif
+}
+}

trunk/core/main.c

-                      r932
+                      r948
     // to try allocating memory to find out how much is available
     // Call function to scan free list for the largest free block available.
+    extern int exmem_largest_block();
+    return exmem_largest_block();
+    cam_meminfo camera_meminfo;
+    GetExMemInfo(&camera_meminfo);
+    return camera_meminfo.free_block_max_size;
+#elif defined(CAM_FIRMWARE_MEMINFO)
+    // Call firmware function to fill memory info structure and return size of largest free block
+    cam_meminfo camera_meminfo;
+    GetMemInfo(&camera_meminfo);
+    return camera_meminfo.free_block_max_size;
 #else
     int size, l_size, d;

trunk/core/suba.c

-                      r614
+                      r948
 #define SUBA_MAGIC "\xFF\x15\x15\x15SUBA"
+int suba_largest_block(struct allocator *suba)
+{
+        size_t sz = 0;
+void suba_getmeminfo(struct allocator *suba, int *allocated_size, int *allocated_peak, int *allocated_count, int *free_size, int *largest_block, int *free_block_count)
+{
+        size_t largest = 0;
+    size_t free = 0;
+    size_t count = 0;
         if (suba)
+        {
                 struct cell *c = SADR(suba, suba->tail);
+                if (c->size > sz) sz = c->size;
+                if (c->size > largest) largest = c->size;
+        free += c->size;
+        count++;
                 while (c->next != suba->tail)
+                {
                         c = SADR(suba, c->next);
+                        if (c->size > sz) sz = c->size;
+                }
+        }
+        return sz;
+                        if (c->size > largest) largest = c->size;
+            free += c->size;
+            count++;
+                }
+        }
+    *largest_block = largest;
+    *free_size = free;
+    *free_block_count = count;
+    *allocated_size = suba->size_total;     // TODO check this is a reasonable value for this field
+    *allocated_peak = suba->alloc_total;    // TODO check this is a reasonable value for this field
+    *allocated_count = 0;                   // TODO implement this
+}

trunk/include/camera.h

-                      r933
+                      r948
     #undef  PARAM_DISPLAY_MODE1                 // param number for LCD display mode when camera in playback
     #undef  PARAM_DISPLAY_MODE2                 // param number for LCD display mode when camera in record view hold mode
+    #undef CAM_DRIVE_MODE_FROM_TIMER_MODE       // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.
+    #undef  CAM_FIRMWARE_MEMINFO                // Use 'GetMemInfo' (dryos) or 'memPartInfoGet'/'memPartFindMax' (vxworks)
+                                                // function in firmware to get free memory details
+                                                // GetMemInfo should be found correctly by the gensig/finsig signature
+                                                // finder for all dryos based cameras.
+    #undef  CAM_NO_MEMPARTINFO                  // VXWORKS camera does not have memPartInfoGet, fall back to memPartFindMax
+    #undef  CAM_DRIVE_MODE_FROM_TIMER_MODE      // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.
                                                 // Used to enabled bracketing in custom timer, required on many recent cameras
                                                 // see http://chdk.setepontos.com/index.php/topic,3994.405.html
 …
     #undef  CAM_NEED_SET_ZOOM_DELAY             // Define to add a delay after setting the zoom position before resetting the focus position in shooting_set_zoom
     #undef USE_REAL_AUTOISO                     // Define this to use real-iso instead of marketing-iso as values of autoiso mechanizm
     #undef OVEREXP_COMPENSATE_OVERALL           // Define this to make overexposure_compensation work for all scenes, instead of day-light only
+    #undef  USE_REAL_AUTOISO                    // Define this to use real-iso instead of marketing-iso as values of autoiso mechanizm
+    #undef  OVEREXP_COMPENSATE_OVERALL          // Define this to make overexposure_compensation work for all scenes, instead of day-light only
     #define CAMERA_MIN_DIST         0           // Define min distance that can be set in _MoveFocusLensToDistance (allow override - e.g. G12 min dist = 1)
 …
 // END of Camera-dependent settings
 //==========================================================
+// For newer cameras where the screen bitmap is double the width we need to scale
+// the CHDK horizontal (X) co-ordinates
+#if CAM_USES_ASPECT_CORRECTION
+    #define ASPECT_XCORRECTION(x)   ((x)<<1)    // See comments for CAM_USES_ASPECT_CORRECTION above
+#else
+    #define ASPECT_XCORRECTION(x)   (x)         // See comments for CAM_USES_ASPECT_CORRECTION above
+#endif
 // curves only work in 10bpp for now
 …
 #endif
-// For newer cameras where the screen bitmap is double the width we need to scale
-// the CHDK horizontal (X) co-ordinates
-#if CAM_USES_ASPECT_CORRECTION
-#define ASPECT_XCORRECTION(x)   ((x)<<1)    // See comments for CAM_USES_ASPECT_CORRECTION above
-#else
-#define ASPECT_XCORRECTION(x)   (x)         // See comments for CAM_USES_ASPECT_CORRECTION above
-#endif
 #endif /* CAMERA_H */

trunk/include/lolevel.h

-                      r942
+                      r948
 #endif
+// vxworks only
+// used on a few cameras that don't have memPartInfoGet, see CAM_NO_MEMPARTINFO
+extern int _memPartFindMax(int mempart_id);
+extern int _memPartInfoGet(int mempart_id,int *info);
+// helpful for Eye-Fi cards
 extern void _SetFileAttributes(int fd, int attr);

trunk/include/platform.h

-                      r933
+                      r948
 void ExitTask();
+// Data returned from GetMemInfo & GetExMemInfo functions stored in this data structure
+typedef struct {
+    int start_address;
+    int end_address;
+    int total_size;
+    int allocated_size;
+    int allocated_peak;
+    int allocated_count;
+    int free_size;
+    int free_block_max_size;
+    int free_block_count;
+} cam_meminfo;
+#if defined(CAM_FIRMWARE_MEMINFO)
+extern void GetMemInfo(cam_meminfo*);
+#endif
 #ifdef OPT_EXMEM_MALLOC
     void exmem_malloc_init(void);
+    void GetExMemInfo(cam_meminfo*);
 #endif

trunk/platform/a1100/platform_camera.h

r945	r948
83	83	#define CAM_ZEBRA_ASPECT_ADJUST 1
84	84
	85	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
85	86	//----------------------------------------------------------
86	87

trunk/platform/a540/platform_camera.h

r920	r948
55	55
56	56	#define CAM_EXT_TV_RANGE 1
	57
	58	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
57	59	//----------------------------------------------------------

trunk/platform/a590/platform_camera.h

r933	r948
57	57	#define CAM_MULTIPART 1
58	58	#define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 // enable fix for camera crash at startup when opening the conf / font files see http://chdk.setepontos.com/index.php?topic=6179.0
	59	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
	60
59	61	#undef CAMERA_MIN_DIST
60	62	#define CAMERA_MIN_DIST 100 // Override min subject distance

trunk/platform/d10/platform_camera.h

r920	r948
93	93	// Used to enabled bracketing in custom timer, required on many recent cameras
94	94	// see http://chdk.setepontos.com/index.php/topic,3994.405.html
	95
	96	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
95	97	//----------------------------------------------------------

trunk/platform/g10/platform_camera.h

r920	r948
102	102	// see http://chdk.setepontos.com/index.php/topic,3994.405.html
103	103
	104	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
104	105	//----------------------------------------------------------
105	106

trunk/platform/g12/platform_camera.h

r933	r948
104	104	#define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 // enable fix for camera crash at startup when opening the conf / font files see http://chdk.setepontos.com/index.php?topic=6179.0
105	105
	106	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
	107
106	108	#define CAM_DRIVE_MODE_FROM_TIMER_MODE 1 // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.
107	109	// Used to enabled bracketing in custom timer, required on many recent cameras

trunk/platform/generic/wrappers.c

-                      r942
+                      r948
                 // round MEMISOSIZE up to next 4 byte boundary if needed (just in case)
                 exmem_start = mem + ((MEMISOSIZE+3)&0xFFFFFFFC);
                 exmem_size = EXMEM_HEAP_SIZE - EXMEM_HEAP_SKIP - ((MEMISOSIZE+3)&0xFFFFFFFC);
+                exmem_size = EXMEM_BUFFER_SIZE - ((MEMISOSIZE+3)&0xFFFFFFFC);
 #else
                 // Set start & size based on requested values
                 exmem_start = mem;
                 exmem_size = EXMEM_HEAP_SIZE - EXMEM_HEAP_SKIP;
+                exmem_size = EXMEM_BUFFER_SIZE;
 #endif
                 exmem_end = exmem_start + exmem_size;
 …
+}
+int exmem_largest_block()
+{
+        extern int suba_largest_block(void*);
+        return suba_largest_block(exmem_heap);
+// Use suba functions to fill meminfo structure to match firmware GetMemInfo function
+void GetExMemInfo(cam_meminfo *camera_meminfo)
+{
+        extern void suba_getmeminfo(void*, int*, int*, int*, int*, int*, int*);
+    camera_meminfo->start_address        = (int)exmem_start;
+    camera_meminfo->end_address          = (int)exmem_start + exmem_size;
+    camera_meminfo->total_size           = exmem_size;
+    suba_getmeminfo(exmem_heap,
+                    &camera_meminfo->allocated_size, &camera_meminfo->allocated_peak, &camera_meminfo->allocated_count,
+                    &camera_meminfo->free_size, &camera_meminfo->free_block_max_size, &camera_meminfo->free_block_count);
+}
 // regular malloc
 …
 #endif
+}
+#if defined(CAM_FIRMWARE_MEMINFO)
+// Use firmware GetMemInfo function to retrieve info about Canon heap memory allocation
+void GetMemInfo(cam_meminfo *camera_meminfo)
+{
+#if defined(CAM_DRYOS)
+    // Prior to dryos R39 GetMemInfo returns 9 values, after R39 it returns 10 (all but 1 are used in each case)
+    int fw_info[10];
+    extern void _GetMemInfo(int*);
+    _GetMemInfo(fw_info);
+#if defined(CAM_DRYOS_2_3_R39)
+    // For newer dryos version copy all 9 used values to CHDK structure
+    camera_meminfo->start_address        = fw_info[0];
+    camera_meminfo->end_address          = fw_info[1];
+    camera_meminfo->total_size           = fw_info[2];
+    camera_meminfo->allocated_size       = fw_info[3];
+    camera_meminfo->allocated_peak       = fw_info[4];
+    camera_meminfo->allocated_count      = fw_info[5];
+    camera_meminfo->free_size            = fw_info[6];
+    camera_meminfo->free_block_max_size  = fw_info[7];
+    camera_meminfo->free_block_count     = fw_info[8];
+#else
+    // For older dryos version copy 8 used values to CHDK structure and calculate missing value
+    camera_meminfo->start_address        = fw_info[0];
+    camera_meminfo->end_address          = fw_info[0] + fw_info[1];
+    camera_meminfo->total_size           = fw_info[1];
+    camera_meminfo->allocated_size       = fw_info[2];
+    camera_meminfo->allocated_peak       = fw_info[3];
+    camera_meminfo->allocated_count      = fw_info[4];
+    camera_meminfo->free_size            = fw_info[5];
+    camera_meminfo->free_block_max_size  = fw_info[6];
+    camera_meminfo->free_block_count     = fw_info[7];
+#endif
+#else // vxworks
+extern int sys_mempart_id;
+    int fw_info[5];
+    // -1 for invalid
+    memset(camera_meminfo,0xFF,sizeof(cam_meminfo));
+#ifdef CAM_NO_MEMPARTINFO
+    camera_meminfo->free_block_max_size = _memPartFindMax(sys_mempart_id);
+#else
+    _memPartInfoGet(sys_mempart_id,fw_info);
+    // TODO we could fill in start address from _start + MEMISOSIZE, if chdk not in exmem
+    // these are guessed, look reasonable on a540
+    camera_meminfo->free_size = fw_info[0];
+    camera_meminfo->free_block_count = fw_info[1];
+    camera_meminfo->free_block_max_size = fw_info[2];
+    camera_meminfo->allocated_size = fw_info[3];
+    camera_meminfo->allocated_count = fw_info[4];
+#endif
+#endif
+}
+#endif
 //----------------------------------------------------------------------------

trunk/platform/ixus310_elph500hs/platform_camera.h

r933	r948
119	119	// see http://chdk.setepontos.com/index.php?topic=6179.0
120	120
	121	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
	122
121	123	#define CAM_DRIVE_MODE_FROM_TIMER_MODE // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.
122	124	// Used to enabled bracketing in custom timer, required on many recent cameras

trunk/platform/ixus40_sd300/platform_camera.h

r859	r948
54	54	// camera name
55	55	#define PARAM_CAMERA_NAME 2 // parameter number for GetParameterData
	56	#define CAM_NO_MEMPARTINFO 1 // vxworks function missing
56	57	//----------------------------------------------------------
57	58

trunk/platform/s95/platform_camera.h

r920	r948
83	83	// see http://chdk.setepontos.com/index.php?topic=6179.0
84	84
	85	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
	86
85	87	// todo - we may need this to save memory
86	88	//#define CAM_ZEBRA_NOBUF 1

trunk/platform/sx20/platform_camera.h

r943	r948
91	91	#define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1 // enable fix for camera crash at startup when opening the conf / font files see http://chdk.setepontos.com/index.php?topic=6179.0
92	92
	93	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
	94
93	95	#define CAM_DRIVE_MODE_FROM_TIMER_MODE 1 // use PROPCASE_TIMER_MODE to check for multiple shot custom timer.
94	96	// Used to enabled bracketing in custom timer, required on many recent cameras

trunk/platform/sx30/platform_camera.h

r933	r948
108	108	// see http://chdk.setepontos.com/index.php/topic,3994.405.html
109	109
	110	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
	111
110	112	#define CAM_AV_OVERRIDE_IRIS_FIX 1 // for cameras that require _MoveIrisWithAv function to override Av.
111	113

trunk/platform/sx40hs/platform_camera.h

r933	r948
111	111	// see http://chdk.setepontos.com/index.php/topic,3994.405.html
112	112
	113	#define CAM_FIRMWARE_MEMINFO 1 // Use 'GetMemInfo' to get free memory size.
	114
113	115	#define CAM_AV_OVERRIDE_IRIS_FIX 1 // for cameras that require _MoveIrisWithAv function to override Av in bracketing.
114	116

Note: See TracChangeset for help on using the changeset viewer.

chdkde