Changeset 1060

Timestamp:

02/14/11 04:00:38 (2 years ago)

Author:

reyalP

Message:

whitespace cleanup

Location:

trunk

Files:

• core/gui.c (modified) (76 diffs)
• core/gui_draw.h (modified) (3 diffs)
• core/kbd.c (modified) (34 diffs)
• lib/ubasic/ubasic.c (modified) (67 diffs)
• platform/generic/kbd.c (modified) (7 diffs)
• platform/generic/shooting.c (modified) (65 diffs)
• platform/generic/wrappers.c (modified) (15 diffs)

trunk/core/gui.c

@@ -62 +62 @@
  #define SHORTCUT_TOGGLE_RAW          KEY_DISPLAY
  #define SHORTCUT_MF_TOGGLE           KEY_UP
-//Half press shoot button   
+//Half press shoot button
  #define SHORTCUT_TOGGLE_HISTO        KEY_DOWN
  #define SHORTCUT_TOGGLE_ZEBRA        KEY_MENU
  #define SHORTCUT_TOGGLE_OSD          KEY_RIGHT
  #define SHORTCUT_DISABLE_OVERRIDES   KEY_LEFT
-//Alt mode & Manual mode    
+//Alt mode & Manual mode
  #define SHORTCUT_SET_INFINITY        KEY_DISPLAY
  #define SHORTCUT_SET_HYPERFOCAL      KEY_DOWN
@@ -74 +74 @@
  // KEY_DISPLAY is used for gui_subj_dist_override_koef_enum;
  // KEY_LEFT/KEY_RIGHT is used for gui_subj_dist_override_value_enum (because of no separate ZOOM_IN/OUT)
- 
+
 #elif defined(CAMERA_g7) || defined(CAMERA_sx10) || defined(CAMERA_sx1) || defined(CAMERA_sx20) || defined(CAMERA_sx30)
 //Alt mode
  #define SHORTCUT_TOGGLE_RAW          KEY_ERASE
-//Half press shoot button    
+//Half press shoot button
  #define SHORTCUT_TOGGLE_HISTO        KEY_DOWN
  #define SHORTCUT_TOGGLE_ZEBRA        KEY_LEFT
  #define SHORTCUT_TOGGLE_OSD          KEY_RIGHT
  #define SHORTCUT_DISABLE_OVERRIDES   KEY_UP
-//Alt mode & Manual mode  
+//Alt mode & Manual mode
  #define SHORTCUT_SET_INFINITY        KEY_UP
  #define SHORTCUT_SET_HYPERFOCAL      KEY_DOWN
@@ -90 +90 @@
 //Alt mode
  #define SHORTCUT_TOGGLE_RAW          KEY_ERASE
-//Half press shoot button    
+//Half press shoot button
  #define SHORTCUT_TOGGLE_HISTO        KEY_UP
  #define SHORTCUT_TOGGLE_ZEBRA        KEY_DOWN
  #define SHORTCUT_TOGGLE_OSD          KEY_RIGHT
  #define SHORTCUT_DISABLE_OVERRIDES   KEY_LEFT
-//Alt mode & Manual mode  
+//Alt mode & Manual mode
  #define SHORTCUT_SET_INFINITY        KEY_UP
  #define SHORTCUT_SET_HYPERFOCAL      KEY_DOWN
@@ -103 +103 @@
 //Alt mode
  #define SHORTCUT_TOGGLE_RAW          KEY_ERASE
-//Half press shoot button    
+//Half press shoot button
  #define SHORTCUT_TOGGLE_HISTO        KEY_UP
  #define SHORTCUT_TOGGLE_ZEBRA        KEY_LEFT
  #define SHORTCUT_TOGGLE_OSD          KEY_RIGHT
  #define SHORTCUT_DISABLE_OVERRIDES   KEY_DOWN
-//Alt mode & Manual mode  
+//Alt mode & Manual mode
  #define SHORTCUT_SET_INFINITY        KEY_UP
  #define SHORTCUT_SET_HYPERFOCAL      KEY_DOWN
@@ -124 +124 @@
 extern const int tv_override_amount;
 extern const int tv_override_zero_shift;
-             
+
 
 static void gui_draw_osd();
@@ -281 +281 @@
 static void cb_zebra_restore_osd();
 #if DNG_SUPPORT
-static void cb_change_dng(); 
+static void cb_change_dng();
 void gui_menuproc_badpixel_create(int arg);
 #endif
 #if defined (DNG_EXT_FROM)
-static void cb_change_dng_usb_ext(); 
+static void cb_change_dng_usb_ext();
 #endif
 
@@ -300 +300 @@
     {0x71,LANG_MENU_REMOTE_ENABLE,            MENUITEM_BOOL,                    &conf.remote_enable},
     {0x0,LANG_MENU_SYNCHABLE_REMOTE,          MENUITEM_SEPARATOR },
-        {0x71,LANG_MENU_SYNCHABLE_REMOTE_ENABLE,  MENUITEM_BOOL,                    &conf.ricoh_ca1_mode            },    
-    {0x5c,LANG_MENU_SYNCH_ENABLE,             MENUITEM_BOOL,                    &conf.synch_enable              },    
-    {0x5c,LANG_MENU_SYNCH_DELAY_ENABLE,       MENUITEM_BOOL,                    &conf.synch_delay_enable        },    
-    {0x5c,LANG_MENU_SYNCH_DELAY_VALUE,        MENUITEM_INT|MENUITEM_F_UNSIGNED, &conf.synch_delay_value         },    
-    {0x5c,LANG_MENU_SYNCH_DELAY_COARSE_VALUE, MENUITEM_INT|MENUITEM_F_UNSIGNED, &conf.synch_delay_coarse_value  },    
+        {0x71,LANG_MENU_SYNCHABLE_REMOTE_ENABLE,  MENUITEM_BOOL,                    &conf.ricoh_ca1_mode            },
+    {0x5c,LANG_MENU_SYNCH_ENABLE,             MENUITEM_BOOL,                    &conf.synch_enable              },
+    {0x5c,LANG_MENU_SYNCH_DELAY_ENABLE,       MENUITEM_BOOL,                    &conf.synch_delay_enable        },
+    {0x5c,LANG_MENU_SYNCH_DELAY_VALUE,        MENUITEM_INT|MENUITEM_F_UNSIGNED, &conf.synch_delay_value         },
+    {0x5c,LANG_MENU_SYNCH_DELAY_COARSE_VALUE, MENUITEM_INT|MENUITEM_F_UNSIGNED, &conf.synch_delay_coarse_value  },
     {0x5c,LANG_MENU_REMOTE_ZOOM_ENABLE,       MENUITEM_BOOL,                    &conf.remote_zoom_enable        },
     {0x5f,LANG_MENU_REMOTE_ZOOM_TIMEOUT,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.zoom_timeout, MENU_MINMAX(2,10)},
@@ -326 +326 @@
     {0x5d,LANG_MENU_SCRIPT_DEFAULT_VAL,     MENUITEM_PROC,                      (int*)gui_load_script_default },
     {0x5e,LANG_MENU_SCRIPT_PARAM_SET,     MENUITEM_ENUM,                         (int*)gui_script_param_set_enum },
-    {0x5c,LANG_MENU_SCRIPT_PARAM_SAVE,             MENUITEM_BOOL,                    &conf.script_param_save              },    
+    {0x5c,LANG_MENU_SCRIPT_PARAM_SAVE,             MENUITEM_BOOL,                    &conf.script_param_save              },
     {0x0,(int)script_title,                 MENUITEM_SEPARATOR },
 //    {0x0,LANG_MENU_SCRIPT_CURRENT,          MENUITEM_SEPARATOR },
@@ -365 +365 @@
     {0x5f,LANG_MENU_AUTOISO_MIN_SHUTTER,   MENUITEM_ENUM,    (int*)gui_autoiso_shutter_enum },
     {0x5f,LANG_MENU_AUTOISO_USER_FACTOR,   MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.autoiso_user_factor, MENU_MINMAX(1, 8)  },
-#if CAM_HAS_IS    
+#if CAM_HAS_IS
     {0x5f,LANG_MENU_AUTOISO_IS_FACTOR,       MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.autoiso_is_factor, MENU_MINMAX(1, 8)  },
-#endif    
+#endif
     {0x5f,LANG_MENU_AUTOISO_MAX_ISO_HI,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.autoiso_max_iso_hi, MENU_MINMAX(20, 160)  },
     {0x5f,LANG_MENU_AUTOISO_MAX_ISO_AUTO, MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.autoiso_max_iso_auto, MENU_MINMAX(10, 80)  },
@@ -462 +462 @@
     {0x66,LANG_MENU_BATT_VOLT_MAX,           MENUITEM_INT|MENUITEM_ARG_ADDR_INC,     &conf.batt_volts_max,   (int)&voltage_step },
     {0x67,LANG_MENU_BATT_VOLT_MIN,           MENUITEM_INT|MENUITEM_ARG_ADDR_INC,     &conf.batt_volts_min,   (int)&voltage_step },
-    {0x68,LANG_MENU_BATT_STEP_25,            MENUITEM_BOOL|MENUITEM_ARG_CALLBACK,    &conf.batt_step_25,     (int)cb_step_25 }, 
+    {0x68,LANG_MENU_BATT_STEP_25,            MENUITEM_BOOL|MENUITEM_ARG_CALLBACK,    &conf.batt_step_25,     (int)cb_step_25 },
     {0x0,(int)"",                           MENUITEM_SEPARATOR },
     {0x73,LANG_MENU_BATT_SHOW_PERCENT,       MENUITEM_BOOL|MENUITEM_ARG_CALLBACK,    &conf.batt_perc_show,   (int)cb_perc },
     {0x73,LANG_MENU_BATT_SHOW_VOLTS,         MENUITEM_BOOL|MENUITEM_ARG_CALLBACK,    &conf.batt_volts_show,  (int)cb_volts },
-    {0x32,LANG_MENU_BATT_SHOW_ICON,          MENUITEM_BOOL,                          &conf.batt_icon_show },    
+    {0x32,LANG_MENU_BATT_SHOW_ICON,          MENUITEM_BOOL,                          &conf.batt_icon_show },
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
     {0}
@@ -475 +475 @@
     {0x5c,LANG_MENU_SPACE_SHOW_ICON,         MENUITEM_BOOL,                          &conf.space_icon_show },
     {0x69,LANG_MENU_SPACE_SHOW_BAR,      MENUITEM_ENUM,                       (int*)gui_space_bar_enum },
-    {0x6a,LANG_MENU_SPACE_BAR_SIZE,      MENUITEM_ENUM,                       (int*)gui_space_bar_size_enum },  
+    {0x6a,LANG_MENU_SPACE_BAR_SIZE,      MENUITEM_ENUM,                       (int*)gui_space_bar_size_enum },
     {0x6b,LANG_MENU_SPACE_BAR_WIDTH,      MENUITEM_ENUM,                       (int*)gui_space_bar_width_enum },
     {0x5c,LANG_MENU_SPACE_SHOW_PERCENT,      MENUITEM_BOOL|MENUITEM_ARG_CALLBACK,    &conf.space_perc_show,   (int)cb_space_perc },
@@ -490 +490 @@
           {0x5f,LANG_MENU_OSD_SHOW_DOF_CALC,            MENUITEM_ENUM,      (int*)gui_dof_show_value_enum },
           {0x5c,LANG_MENU_DOF_SUBJ_DIST_AS_NEAR_LIMIT,  MENUITEM_BOOL,      &conf.dof_subj_dist_as_near_limit},
-          {0x5c,LANG_MENU_DOF_USE_EXIF_SUBJ_DIST,       MENUITEM_BOOL,      &conf.dof_use_exif_subj_dist},        
-          {0x5c,LANG_MENU_DOF_SUBJ_DIST_IN_MISC,        MENUITEM_BOOL,      &conf.dof_subj_dist_in_misc},        
-          {0x5c,LANG_MENU_DOF_NEAR_LIMIT_IN_MISC,       MENUITEM_BOOL,      &conf.dof_near_limit_in_misc},      
-      {0x5c,LANG_MENU_DOF_FAR_LIMIT_IN_MISC,        MENUITEM_BOOL,                       &conf.dof_far_limit_in_misc},  
-      {0x5c,LANG_MENU_DOF_HYPERFOCAL_IN_MISC,       MENUITEM_BOOL,      &conf.dof_hyperfocal_in_misc},                          
-      {0x5c,LANG_MENU_DOF_DEPTH_LIMIT_IN_MISC,      MENUITEM_BOOL,      &conf.dof_depth_in_misc},                       
+          {0x5c,LANG_MENU_DOF_USE_EXIF_SUBJ_DIST,       MENUITEM_BOOL,      &conf.dof_use_exif_subj_dist},
+          {0x5c,LANG_MENU_DOF_SUBJ_DIST_IN_MISC,        MENUITEM_BOOL,      &conf.dof_subj_dist_in_misc},
+          {0x5c,LANG_MENU_DOF_NEAR_LIMIT_IN_MISC,       MENUITEM_BOOL,      &conf.dof_near_limit_in_misc},
+      {0x5c,LANG_MENU_DOF_FAR_LIMIT_IN_MISC,        MENUITEM_BOOL,                       &conf.dof_far_limit_in_misc},
+      {0x5c,LANG_MENU_DOF_HYPERFOCAL_IN_MISC,       MENUITEM_BOOL,      &conf.dof_hyperfocal_in_misc},
+      {0x5c,LANG_MENU_DOF_DEPTH_LIMIT_IN_MISC,      MENUITEM_BOOL,      &conf.dof_depth_in_misc},
 #if !CAM_DRYOS
-      {0x5c,LANG_MENU_DOF_DIST_FROM_LENS,           MENUITEM_BOOL,      &conf.dof_dist_from_lens},                      
-#endif      
+      {0x5c,LANG_MENU_DOF_DIST_FROM_LENS,           MENUITEM_BOOL,      &conf.dof_dist_from_lens},
+#endif
           {0x51,LANG_MENU_BACK,                            MENUITEM_UP },
     {0}
@@ -508 +508 @@
          // {0x43,LANG_MENU_VALUES_SHOW_IN_REVIEW,   MENUITEM_BOOL,      &conf.values_show_in_review},
           {0x5c,LANG_MENU_SHOW_VALUES_IN_VIDEO,           MENUITEM_BOOL,      &conf.show_values_in_video},
-          {0x5c,LANG_MENU_VALUES_SHOW_ZOOM,               MENUITEM_BOOL,      &conf.values_show_zoom},  
-          {0x5f,LANG_MENU_OSD_ZOOM_VALUE,                 MENUITEM_ENUM,      (int*)gui_zoom_value_enum },      
-          {0x60,LANG_MENU_OSD_ZOOM_SCALE,                 MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.zoom_scale,   MENU_MINMAX(0, 1000)},       
-      {0x62,LANG_MENU_VALUES_SHOW_REAL_APERTURE,      MENUITEM_BOOL,      &conf.values_show_real_aperture},             
-      {0x74,LANG_MENU_VALUES_SHOW_REAL_ISO,           MENUITEM_BOOL,      &conf.values_show_real_iso},                  
-      {0x74,LANG_MENU_VALUES_SHOW_MARKET_ISO,         MENUITEM_BOOL,      &conf.values_show_market_iso},                                
-          {0x2d,LANG_MENU_SHOW_ISO_ONLY_IN_AUTOISO_MODE,  MENUITEM_BOOL,             &conf.values_show_iso_only_in_autoiso_mode},                       
+          {0x5c,LANG_MENU_VALUES_SHOW_ZOOM,               MENUITEM_BOOL,      &conf.values_show_zoom},
+          {0x5f,LANG_MENU_OSD_ZOOM_VALUE,                 MENUITEM_ENUM,      (int*)gui_zoom_value_enum },
+          {0x60,LANG_MENU_OSD_ZOOM_SCALE,                 MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.zoom_scale,   MENU_MINMAX(0, 1000)},
+      {0x62,LANG_MENU_VALUES_SHOW_REAL_APERTURE,      MENUITEM_BOOL,      &conf.values_show_real_aperture},
+      {0x74,LANG_MENU_VALUES_SHOW_REAL_ISO,           MENUITEM_BOOL,      &conf.values_show_real_iso},
+      {0x74,LANG_MENU_VALUES_SHOW_MARKET_ISO,         MENUITEM_BOOL,      &conf.values_show_market_iso},
+          {0x2d,LANG_MENU_SHOW_ISO_ONLY_IN_AUTOISO_MODE,  MENUITEM_BOOL,             &conf.values_show_iso_only_in_autoiso_mode},
       {0x5c,LANG_MENU_VALUES_SHOW_EV_SETED,                      MENUITEM_BOOL,      &conf.values_show_ev_seted},
-      {0x5c,LANG_MENU_VALUES_SHOW_EV_MEASURED,        MENUITEM_BOOL,             &conf.values_show_ev_measured},                                
-      {0x5c,LANG_MENU_VALUES_SHOW_BV_SETED,                      MENUITEM_BOOL,      &conf.values_show_bv_seted},                                       
-      {0x5c,LANG_MENU_VALUES_SHOW_BV_MEASURED,           MENUITEM_BOOL,      &conf.values_show_bv_measured},                                    
-      {0x5c,LANG_MENU_VALUES_SHOW_OVEREXPOSURE,      MENUITEM_BOOL,      &conf.values_show_overexposure},       
-      {0x5c,LANG_MENU_SHOW_CANON_OVEREXPOSURE,       MENUITEM_BOOL,      &conf.values_show_canon_overexposure},                                                 
-      {0x5c,LANG_MENU_VALUES_SHOW_LUMINANCE,         MENUITEM_BOOL,      &conf.values_show_luminance},                                                  
+      {0x5c,LANG_MENU_VALUES_SHOW_EV_MEASURED,        MENUITEM_BOOL,             &conf.values_show_ev_measured},
+      {0x5c,LANG_MENU_VALUES_SHOW_BV_SETED,                      MENUITEM_BOOL,      &conf.values_show_bv_seted},
+      {0x5c,LANG_MENU_VALUES_SHOW_BV_MEASURED,           MENUITEM_BOOL,      &conf.values_show_bv_measured},
+      {0x5c,LANG_MENU_VALUES_SHOW_OVEREXPOSURE,      MENUITEM_BOOL,      &conf.values_show_overexposure},
+      {0x5c,LANG_MENU_SHOW_CANON_OVEREXPOSURE,       MENUITEM_BOOL,      &conf.values_show_canon_overexposure},
+      {0x5c,LANG_MENU_VALUES_SHOW_LUMINANCE,         MENUITEM_BOOL,      &conf.values_show_luminance},
           {0x51,LANG_MENU_BACK,                           MENUITEM_UP },
     {0}
@@ -540 +540 @@
 static CMenuItem video_submenu_items[] = {
 #if CAM_CHDK_HAS_EXT_VIDEO_MENU
-          {0x23,LANG_MENU_VIDEO_MODE,              MENUITEM_ENUM,    (int*)gui_video_mode_enum}, 
+          {0x23,LANG_MENU_VIDEO_MODE,              MENUITEM_ENUM,    (int*)gui_video_mode_enum},
 #if !CAM_VIDEO_QUALITY_ONLY
-      {0x5e,LANG_MENU_VIDEO_BITRATE,           MENUITEM_ENUM,    (int*)gui_video_bitrate_enum}, 
-#endif
-      {0x60,LANG_MENU_VIDEO_QUALITY,           MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.video_quality, MENU_MINMAX(1, 99)}, 
+      {0x5e,LANG_MENU_VIDEO_BITRATE,           MENUITEM_ENUM,    (int*)gui_video_bitrate_enum},
+#endif
+      {0x60,LANG_MENU_VIDEO_QUALITY,           MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.video_quality, MENU_MINMAX(1, 99)},
       {0x5c,LANG_MENU_CLEAR_VIDEO_VALUES,    MENUITEM_BOOL,    (int*)&conf.clear_video},
 #endif
@@ -554 +554 @@
 #endif
 #if CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
-      {0x5c,LANG_MENU_OPTICAL_ZOOM_IN_VIDEO,   MENUITEM_BOOL,  &conf.unlock_optical_zoom_for_video},                                                    
+      {0x5c,LANG_MENU_OPTICAL_ZOOM_IN_VIDEO,   MENUITEM_BOOL,  &conf.unlock_optical_zoom_for_video},
 #endif
 #if CAM_CAN_MUTE_MICROPHONE
       {0x83,LANG_MENU_MUTE_ON_ZOOM,   MENUITEM_BOOL,  &conf.mute_on_zoom},
 #endif
-#if CAM_AF_SCAN_DURING_VIDEO_RECORD 
-      {0x82,LANG_MENU_VIDEO_AF_KEY,   MENUITEM_ENUM,    (int*)gui_video_af_key_enum}, 
+#if CAM_AF_SCAN_DURING_VIDEO_RECORD
+      {0x82,LANG_MENU_VIDEO_AF_KEY,   MENUITEM_ENUM,    (int*)gui_video_af_key_enum},
 #endif
                 {0x5c,LANG_MENU_OSD_SHOW_VIDEO_TIME,         MENUITEM_ENUM,      (int*)gui_show_movie_time },
@@ -573 +573 @@
 #if CAM_HAS_IRIS_DIAPHRAGM
           {0x62,LANG_MENU_AV_BRACKET_VALUE,             MENUITEM_ENUM,    (int*)gui_av_bracket_values_enum },
-#endif    
-#if CAM_CAN_SD_OVERRIDE 
-          {0x5e,LANG_MENU_SUBJ_DIST_BRACKET_VALUE,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.subj_dist_bracket_value, MENU_MINMAX(0, 100)}, 
+#endif
+#if CAM_CAN_SD_OVERRIDE
+          {0x5e,LANG_MENU_SUBJ_DIST_BRACKET_VALUE,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.subj_dist_bracket_value, MENU_MINMAX(0, 100)},
           {0x5f,LANG_MENU_SUBJ_DIST_BRACKET_KOEF,       MENUITEM_ENUM,    (int*)gui_subj_dist_bracket_koef_enum},
-#endif    
-          {0x74,LANG_MENU_ISO_BRACKET_VALUE,            MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.iso_bracket_value, MENU_MINMAX(0, 100)}, 
+#endif
+          {0x74,LANG_MENU_ISO_BRACKET_VALUE,            MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.iso_bracket_value, MENU_MINMAX(0, 100)},
           {0x5f,LANG_MENU_ISO_BRACKET_KOEF,             MENUITEM_ENUM,    (int*)gui_iso_bracket_koef_enum},
           {0x60,LANG_MENU_BRACKET_TYPE,                 MENUITEM_ENUM,    (int*)gui_bracket_type_enum },
@@ -602 +602 @@
 
 static CMenuItem operation_submenu_items[] = {
-      {0x5c,LANG_MENU_OVERRIDE_DISABLE,         MENUITEM_ENUM,    (int*)gui_override_disable_enum},//&conf.override_disable },  
+      {0x5c,LANG_MENU_OVERRIDE_DISABLE,         MENUITEM_ENUM,    (int*)gui_override_disable_enum},//&conf.override_disable },
       {0x5c,LANG_MENU_OVERRIDE_DISABLE_ALL,     MENUITEM_BOOL,    &conf.override_disable_all },
-          {0x61,LANG_MENU_OVERRIDE_TV_VALUE,        MENUITEM_ENUM,    (int*)gui_tv_override_value_enum}, 
+          {0x61,LANG_MENU_OVERRIDE_TV_VALUE,        MENUITEM_ENUM,    (int*)gui_tv_override_value_enum},
           {0x5f,LANG_MENU_OVERRIDE_TV_KOEF,         MENUITEM_ENUM,    (int*)gui_tv_override_koef_enum},
           {0x59,LANG_MENU_TV_ENUM_TYPE,             MENUITEM_ENUM,    (int*)gui_tv_enum_type_enum},
 #if CAM_HAS_IRIS_DIAPHRAGM
           {0x62,LANG_MENU_OVERRIDE_AV_VALUE,        MENUITEM_ENUM,    (int*)gui_av_override_enum },
-#endif    
+#endif
 #if CAM_HAS_ND_FILTER
       {0x62,LANG_MENU_OVERRIDE_ND_FILTER,       MENUITEM_ENUM,    (int*)gui_nd_filter_state_enum },
-#endif      
-#if CAM_CAN_SD_OVERRIDE  
+#endif
+#if CAM_CAN_SD_OVERRIDE
       {0x5e,LANG_MENU_OVERRIDE_SUBJ_DIST_VALUE, MENUITEM_ENUM,    (int*)gui_subj_dist_override_value_enum},
           {0x5f,LANG_MENU_OVERRIDE_SUBJ_DIST_KOEF,  MENUITEM_ENUM,    (int*)gui_subj_dist_override_koef_enum},
-#endif    
-          {0x74,LANG_MENU_OVERRIDE_ISO_VALUE,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.iso_override_value, MENU_MINMAX(0, 800)}, 
+#endif
+          {0x74,LANG_MENU_OVERRIDE_ISO_VALUE,      MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.iso_override_value, MENU_MINMAX(0, 800)},
           {0x5f,LANG_MENU_OVERRIDE_ISO_KOEF,        MENUITEM_ENUM,    (int*)gui_iso_override_koef_enum},
 #if ZOOM_OVERRIDE
     {0x5c,LANG_MENU_OVERRIDE_ZOOM,         MENUITEM_BOOL,    &conf.zoom_override},
-    {0x5f,LANG_MENU_OVERRIDE_ZOOM_VALUE,          MENUITEM_ENUM,    (int*)gui_zoom_override_enum },   
-          
+    {0x5f,LANG_MENU_OVERRIDE_ZOOM_VALUE,          MENUITEM_ENUM,    (int*)gui_zoom_override_enum },
+
           {0x5c,LANG_MENU_CLEAR_ZOOM_OVERRIDE_VALUES,    MENUITEM_BOOL,    (int*)&conf.clear_zoom_override},
 #endif
-          {0x2c,LANG_MENU_BRACKET_IN_CONTINUOUS,           MENUITEM_SUBMENU, (int*)&bracketing_in_continuous_submenu }, 
+          {0x2c,LANG_MENU_BRACKET_IN_CONTINUOUS,           MENUITEM_SUBMENU, (int*)&bracketing_in_continuous_submenu },
           {0x2d,LANG_MENU_AUTOISO,                  MENUITEM_SUBMENU, (int*)&autoiso_submenu },
       //{LANG_MENU_EXPOSURE,               MENUITEM_SUBMENU, (int*)&exposure_submenu },
           {0x5b,LANG_MENU_CLEAR_OVERRIDE_VALUES,    MENUITEM_BOOL,    (int*)&conf.clear_override},
- 
+
       {0x5c,LANG_MENU_MISC_FAST_EV,         MENUITEM_BOOL,    &conf.fast_ev },
       {0x5f,LANG_MENU_MISC_FAST_EV_STEP,    MENUITEM_ENUM,    (int*)gui_fast_ev_step },
@@ -700 +700 @@
     {0x65,LANG_MENU_VIS_BATT_ICON,           MENUITEM_COLOR_FG,  (int*)&conf.batt_icon_color },
     {0x65,LANG_MENU_VIS_SPACE_ICON,          MENUITEM_COLOR_FG,  (int*)&conf.space_color },
-    {0x65,LANG_MENU_VIS_SPACE_ICON_BKG,      MENUITEM_COLOR_BG,  (int*)&conf.space_color },    
+    {0x65,LANG_MENU_VIS_SPACE_ICON_BKG,      MENUITEM_COLOR_BG,  (int*)&conf.space_color },
     {0x65,LANG_MENU_VIS_MENU_TEXT,           MENUITEM_COLOR_FG,  (int*)&conf.menu_color },
     {0x65,LANG_MENU_VIS_MENU_BKG,            MENUITEM_COLOR_BG,  (int*)&conf.menu_color },
-    {0x65,LANG_MENU_VIS_MENU_TITLE_TEXT,     MENUITEM_COLOR_FG,  (int*)&conf.menu_title_color }, 
+    {0x65,LANG_MENU_VIS_MENU_TITLE_TEXT,     MENUITEM_COLOR_FG,  (int*)&conf.menu_title_color },
     {0x65,LANG_MENU_VIS_MENU_TITLE_BKG,      MENUITEM_COLOR_BG,  (int*)&conf.menu_title_color },
-    {0x65,LANG_MENU_VIS_MENU_CURSOR_TEXT,    MENUITEM_COLOR_FG,  (int*)&conf.menu_cursor_color }, 
+    {0x65,LANG_MENU_VIS_MENU_CURSOR_TEXT,    MENUITEM_COLOR_FG,  (int*)&conf.menu_cursor_color },
     {0x65,LANG_MENU_VIS_MENU_CURSOR_BKG,     MENUITEM_COLOR_BG,  (int*)&conf.menu_cursor_color },
-    {0x65,LANG_MENU_VIS_MENU_SYMBOL_TEXT,    MENUITEM_COLOR_FG,  (int*)&conf.menu_symbol_color }, 
+    {0x65,LANG_MENU_VIS_MENU_SYMBOL_TEXT,    MENUITEM_COLOR_FG,  (int*)&conf.menu_symbol_color },
     {0x65,LANG_MENU_VIS_MENU_SYMBOL_BKG,     MENUITEM_COLOR_BG,  (int*)&conf.menu_symbol_color },
     {0x65,LANG_MENU_VIS_READER_TEXT,         MENUITEM_COLOR_FG,  (int*)&conf.reader_color },
@@ -724 +724 @@
  * wish and everything automagically works.
 */
- 
+
 static CMenuItem user_submenu_items[USER_MENU_ITEMS + 2] = {
         {0x20,LANG_MENU_MAIN_TITLE,     MENUITEM_PROC,  (int*)rinit}
 };
- 
+
 static CMenu user_submenu = {0x2e,LANG_MENU_USER_MENU, NULL, user_submenu_items };
 
 static CMenuItem raw_state_submenu_items[] = {
-    {0x5c,LANG_MENU_OSD_SHOW_RAW_STATE,      MENUITEM_BOOL,      &conf.show_raw_state },    
-    {0x5c,LANG_MENU_OSD_SHOW_REMAINING_RAW,  MENUITEM_BOOL,      &conf.show_remaining_raw },    
+    {0x5c,LANG_MENU_OSD_SHOW_RAW_STATE,      MENUITEM_BOOL,      &conf.show_raw_state },
+    {0x5c,LANG_MENU_OSD_SHOW_REMAINING_RAW,  MENUITEM_BOOL,      &conf.show_remaining_raw },
     {0x60,LANG_MENU_OSD_RAW_TRESHOLD,        MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX,  &conf.remaining_raw_treshold,   MENU_MINMAX(0, 200)},
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
@@ -746 +746 @@
     {0x5c,LANG_MENU_OSD_HIDE_PLAYBACK,       MENUITEM_ENUM,      (int*)gui_hide_osd_enum },
     {0x81,LANG_MENU_VIS_MENU_CENTER,         MENUITEM_BOOL,         &conf.menu_center },
-    {0x81,LANG_MENU_SELECT_FIRST_ENTRY,         MENUITEM_BOOL,      &conf.menu_select_first_entry },       
-    {0x64,LANG_MENU_VIS_SYMBOL,             MENUITEM_BOOL,          &conf.menu_symbol_enable },    
+    {0x81,LANG_MENU_SELECT_FIRST_ENTRY,         MENUITEM_BOOL,      &conf.menu_select_first_entry },
+    {0x64,LANG_MENU_VIS_SYMBOL,             MENUITEM_BOOL,          &conf.menu_symbol_enable },
     {0x2e,LANG_MENU_USER_MENU,                          MENUITEM_SUBMENU,   (int*)&user_submenu},
     {0x5f,LANG_MENU_USER_MENU_ENABLE,           MENUITEM_ENUM,      (int*)gui_user_menu_show_enum },
@@ -840 +840 @@
     {0x5c,LANG_MENU_ZEBRA_RESTORE_OSD,       MENUITEM_BOOL|MENUITEM_ARG_CALLBACK,      &conf.zebra_restore_osd,        (int)cb_zebra_restore_osd },
     {0x5f,LANG_MENU_ZEBRA_DRAW_OVER,         MENUITEM_ENUM,                            (int*)gui_zebra_draw_osd_enum },
-    {0x5c,LANG_MENU_ZEBRA_MULTICHANNEL,      MENUITEM_BOOL,                            &conf.zebra_multichannel},    
+    {0x5c,LANG_MENU_ZEBRA_MULTICHANNEL,      MENUITEM_BOOL,                            &conf.zebra_multichannel},
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
     {0}
@@ -848 +848 @@
 #ifdef OPT_CURVES
 static CMenuItem curve_submenu_items[] = {
-    {0x5f,LANG_MENU_CURVE_ENABLE,        MENUITEM_ENUM,      (int*)gui_conf_curve_enum },    
-    {0x35,LANG_MENU_CURVE_LOAD,          MENUITEM_PROC,      (int*)gui_load_curve },    
+    {0x5f,LANG_MENU_CURVE_ENABLE,        MENUITEM_ENUM,      (int*)gui_conf_curve_enum },
+    {0x35,LANG_MENU_CURVE_LOAD,          MENUITEM_PROC,      (int*)gui_load_curve },
     {0x51,LANG_MENU_BACK,                MENUITEM_UP },
     {0}
@@ -905 +905 @@
                                 user_submenu_items[i] = user_submenu_items[i+1];
                         }
- 
+
                         /*
                          * there were no valid entries below this one, so
@@ -912 +912 @@
                         if(!user_submenu_items[*cur_memnu_item_indx].text)
                                 *cur_memnu_item_indx -= 1;
- 
+
                         break;
- 
+
                 case 1:
                         /*
@@ -926 +926 @@
                         }
                         break;
- 
+
                 case 2:
                         /*
                          * Move entry up
                          */
- 
+
                         if((*cur_memnu_item_indx > 1)) {
                                 tmp_menu_item = user_submenu_items[*cur_memnu_item_indx -1];
@@ -953 +953 @@
                         }
                         break;
- 
-        }       
+
+        }
 }
 
@@ -1363 +1363 @@
     static const char* modes[]={ "Never", "Alt", "Script", "Always" };
         gui_enum_value_change(&conf.alt_prevent_shutdown,change,sizeof(modes)/sizeof(modes[0]));
-        
+
         conf_update_prevent_shutdown();
 
@@ -1441 +1441 @@
         conf.tv_override_koef=0;
     }
-    
-    return modes[conf.tv_override_koef]; 
+
+    return modes[conf.tv_override_koef];
 }
 
@@ -1462 +1462 @@
        else if ((unsigned)conf.tv_override_value>=(tv_override_amount))
          conf.tv_override_value=0;
-       return tv_override[conf.tv_override_value]; 
+       return tv_override[conf.tv_override_value];
      }
-     else 
+     else
       {
        if (conf.tv_override_value<0) {
@@ -1473 +1473 @@
        if(!buf) return "";
        sprintf(buf, "%d",  conf.tv_override_value);
-       return buf; 
+       return buf;
       }
 }
@@ -1482 +1482 @@
     gui_enum_value_change(&conf.tv_enum_type,change,sizeof(modes)/sizeof(modes[0]));
     if (change) {
-        conf.tv_override_koef=6;        
-        if (conf.tv_enum_type)  
+        conf.tv_override_koef=6;
+        if (conf.tv_enum_type)
             conf.tv_override_value=tv_override_zero_shift;
-        else conf.tv_override_value=1; 
-    }
-    return modes[conf.tv_enum_type]; 
+        else conf.tv_override_value=1;
+    }
+    return modes[conf.tv_enum_type];
 }
 
@@ -1505 +1505 @@
         conf.subj_dist_override_value=0;
     sprintf(buf, "%d", (int)conf.subj_dist_override_value);
-    return buf; 
+    return buf;
 }
 
@@ -1530 +1530 @@
      {
        conf.iso_exposure_order=0;
-     } 
-
-    return modes[conf.tv_exposure_order]; 
+     }
+
+    return modes[conf.tv_exposure_order];
 }
 
@@ -1550 +1550 @@
      {
        conf.iso_exposure_order=0;
-     } 
-    return modes[conf.av_exposure_order]; 
+     }
+    return modes[conf.av_exposure_order];
 }
 
@@ -1569 +1569 @@
      {
        conf.av_exposure_order=0;
-     } 
-
-    return modes[conf.iso_exposure_order]; 
+     }
+
+    return modes[conf.iso_exposure_order];
 }
 */
@@ -1582 +1582 @@
     if (conf.av_override_value == 0)  return "Off";
     else {
-     short prop_id=shooting_get_aperture_from_av96(shooting_get_av96_override_value());         
+     short prop_id=shooting_get_aperture_from_av96(shooting_get_av96_override_value());
          sprintf(buf, "%d.%02d", (int)prop_id/100, (int)prop_id%100 );
-         return buf; 
+         return buf;
         }
 }
@@ -1595 +1595 @@
     else if (conf.zoom_override_value>zoom_points-1) conf.zoom_override_value=0;
                 sprintf(buf,"%i",conf.zoom_override_value);
-                return buf; 
+                return buf;
 }
 #endif
@@ -1605 +1605 @@
         return gui_change_simple_enum(&conf.user_menu_enable,change,modes,sizeof(modes)/sizeof(modes[0]));
 }
- 
-const char* gui_video_af_key_enum(int change, int arg){ 
+
+const char* gui_video_af_key_enum(int change, int arg){
 #if CAMERA_g12
-    static const char* names[]={ "", "Shutter", "Set", "AE Lock"}; 
-    static const int keys[]={0, KEY_SHOOT_HALF, KEY_SET, KEY_AE_LOCK }; 
+    static const char* names[]={ "", "Shutter", "Set", "AE Lock"};
+    static const int keys[]={0, KEY_SHOOT_HALF, KEY_SET, KEY_AE_LOCK };
 #else
-    static const char* names[]={ "", "Shutter", "Set"}; 
-    static const int keys[]={0, KEY_SHOOT_HALF, KEY_SET }; 
-#endif
-    int i; 
- 
-    for (i=0; i<sizeof(names)/sizeof(names[0]); ++i) { 
-        if (conf.video_af_key==keys[i]) { 
-            break; 
-        } 
-    } 
- 
-    i+=change; 
-    if (i<0) 
-        i=(sizeof(names)/sizeof(names[0]))-1; 
-    else if (i>=(sizeof(names)/sizeof(names[0]))) 
-        i=0; 
- 
-    conf.video_af_key = keys[i]; 
-    return names[i]; 
-}
-    
-const char* gui_bad_pixel_enum(int change, int arg) { 
-    int modes[]={LANG_MENU_BAD_PIXEL_OFF, LANG_MENU_BAD_PIXEL_INTERPOLATION, LANG_MENU_BAD_PIXEL_RAW_CONVERTER}; 
+    static const char* names[]={ "", "Shutter", "Set"};
+    static const int keys[]={0, KEY_SHOOT_HALF, KEY_SET };
+#endif
+    int i;
+
+    for (i=0; i<sizeof(names)/sizeof(names[0]); ++i) {
+        if (conf.video_af_key==keys[i]) {
+            break;
+        }
+    }
+
+    i+=change;
+    if (i<0)
+        i=(sizeof(names)/sizeof(names[0]))-1;
+    else if (i>=(sizeof(names)/sizeof(names[0])))
+        i=0;
+
+    conf.video_af_key = keys[i];
+    return names[i];
+}
+
+const char* gui_bad_pixel_enum(int change, int arg) {
+    int modes[]={LANG_MENU_BAD_PIXEL_OFF, LANG_MENU_BAD_PIXEL_INTERPOLATION, LANG_MENU_BAD_PIXEL_RAW_CONVERTER};
         return lang_str((int)gui_change_simple_enum(&conf.bad_pixel_removal,change,(const char **)modes,sizeof(modes)/sizeof(modes[0])));
-} 
+}
 
 //-------------------------------------------------------------------
@@ -1737 +1737 @@
             else if (conf.debug_display == DEBUG_DISPLAY_PROPS || conf.debug_display == DEBUG_DISPLAY_PARAMS) {
                 conf.debug_propcase_page += debug_display_direction*1;
-                if(conf.debug_propcase_page > 128 || conf.debug_propcase_page < 0) 
+                if(conf.debug_propcase_page > 128 || conf.debug_propcase_page < 0)
                     conf.debug_propcase_page = 0;
             }
@@ -1764 +1764 @@
 static void gui_menuproc_swap_partitions(int arg){
  if (get_part_count()<2) gui_mbox_init(LANG_ERROR, LANG_ONLY_ONE_PARTITION, MBOX_BTN_OK|MBOX_TEXT_CENTER, NULL);
- else 
+ else
         {
                 swap_partitions();
@@ -1805 +1805 @@
         // initialize curves, loading files if required by current mode
         curve_init_mode();
-#endif          
+#endif
 #if ZOOM_OVERRIDE
 // reyalp - need to do this in capt_seq
@@ -1905 +1905 @@
     gui_in_redraw = 1;
     gui_mode_old = gui_mode;
-    
-    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009 
+
+    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009
     //the different modes arises because games are designed on a 360x240 basis and are difficult to downscale to 320x240
     if (gui_mode == GUI_MODE_REVERSI || gui_mode == GUI_MODE_SOKOBAN || gui_mode == GUI_MODE_4WINS || gui_mode == GUI_MODE_MASTERMIND) {
@@ -1914 +1914 @@
       draw_set_environment(NULL, NULL, vid_get_bitmap_screen_width(), vid_get_bitmap_screen_height());
    }
-    #endif   
+    #endif
     switch (gui_mode) {
         case GUI_MODE_MENU:
@@ -1997 +1997 @@
             break;
     }
-    
+
     gui_in_redraw = 0;
     if ((gui_mode_old != gui_mode && (gui_mode_old != GUI_MODE_NONE && gui_mode_old != GUI_MODE_ALT) && (gui_mode != GUI_MODE_MBOX && gui_mode != GUI_MODE_MPOPUP)) || gui_restore) {
@@ -2092 +2092 @@
         return;
     }
-    
+
     switch (gui_mode) {
         case GUI_MODE_ALT:
@@ -2098 +2098 @@
                 if (conf.debug_shortcut_action > 0) {
 #ifdef OPT_DEBUGGING
-                                        gui_debug_shortcut(); 
+                                        gui_debug_shortcut();
 #endif
 }
 #if !CAM_HAS_ERASE_BUTTON && CAM_CAN_SD_OVERRIDE
                 if (!shooting_get_common_focus_mode())
-#else                
-                                else 
-#endif                                                  
+#else
+                                else
+#endif
                                    {conf.save_raw = !conf.save_raw;
                     draw_restore();
@@ -2141 +2141 @@
 #endif
 
-#if CAM_CAN_SD_OVERRIDE           
+#if CAM_CAN_SD_OVERRIDE
                           {
   #if CAM_HAS_ZOOM_LEVER
@@ -2151 +2151 @@
                   shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
                                   }
-                                else if (kbd_is_key_clicked(KEY_LEFT)) 
+                                else if (kbd_is_key_clicked(KEY_LEFT))
                                   {
                                   gui_subj_dist_override_koef_enum(-1,0);
@@ -2159 +2159 @@
                   shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
                                   }
-                                else if (kbd_is_key_clicked(SHORTCUT_SET_INFINITY)) 
+                                else if (kbd_is_key_clicked(SHORTCUT_SET_INFINITY))
                                   {
-                                  conf.subj_dist_override_value=MAX_DIST;       
+                                  conf.subj_dist_override_value=MAX_DIST;
                   shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
                                   }
@@ -2167 +2167 @@
   #endif
                                 if (kbd_is_key_clicked(SHORTCUT_SET_HYPERFOCAL))
-                                  {     
+                                  {
                                   int m=mode_get()&MODE_SHOOTING_MASK;
-                                  if ((m==MODE_M) || (m==MODE_AV)) 
+                                  if ((m==MODE_M) || (m==MODE_AV))
                                     conf.subj_dist_override_value=(int)shooting_get_hyperfocal_distance_f(shooting_get_aperture_from_av96(shooting_get_user_av96()),get_focal_length(lens_get_zoom_point()));
-                                  else conf.subj_dist_override_value=(int)shooting_get_hyperfocal_distance();           
+                                  else conf.subj_dist_override_value=(int)shooting_get_hyperfocal_distance();
                   shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW);
-                                  }   
-                                else  
+                                  }
+                                else
                   switch (kbd_get_autoclicked_key()) {
   #if CAM_HAS_ZOOM_LEVER
@@ -2194 +2194 @@
                   }
               }
-#endif                           
+#endif
             }
             break;
@@ -2302 +2302 @@
         conf_update_prevent_shutdown();
 }
-//------------------------------------------------------------------- 
- 
-void other_kbd_process(){ 
+//-------------------------------------------------------------------
+
+void other_kbd_process(){
  int key;
-#if CAM_AF_SCAN_DURING_VIDEO_RECORD 
-   
- if (movie_status==VIDEO_RECORD_IN_PROGRESS) { 
-  if (kbd_is_key_clicked(conf.video_af_key)) MakeAFScan(); 
- } 
- 
-#endif 
+#if CAM_AF_SCAN_DURING_VIDEO_RECORD
+
+ if (movie_status==VIDEO_RECORD_IN_PROGRESS) {
+  if (kbd_is_key_clicked(conf.video_af_key)) MakeAFScan();
+ }
+
+#endif
 
 #if CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO
@@ -2340 +2340 @@
  if ((movie_status==VIDEO_RECORD_IN_PROGRESS) && !kbd_is_key_pressed(KEY_SHOOT_HALF)){
   #if CAM_HAS_ERASE_BUTTON
-  if (kbd_is_key_clicked(KEY_ERASE)){ 
+  if (kbd_is_key_clicked(KEY_ERASE)){
   #else
   #if !defined (CAMERA_a480)
-  if (kbd_is_key_clicked(KEY_DISPLAY)){ 
+  if (kbd_is_key_clicked(KEY_DISPLAY)){
   #else
-  if (kbd_is_key_clicked(KEY_MENU)){ 
+  if (kbd_is_key_clicked(KEY_MENU)){
   #endif
   #endif
-   set_ev_video_avail(!get_ev_video_avail()); 
+   set_ev_video_avail(!get_ev_video_avail());
   }
   if (get_ev_video_avail()) {
@@ -2418 +2418 @@
 
         if (conf.debug_display == DEBUG_DISPLAY_PARAMS){
-            extern long* FlashParamsTable[]; 
+            extern long* FlashParamsTable[];
             char s[30];
             int count;
@@ -2430 +2430 @@
                     len=FlashParamsTable[p][1]>>16;
                     if ((len==1)||(len==2)||(len==4)){
-                        get_parameter_data(p, &r, len); 
+                        get_parameter_data(p, &r, len);
                         sprintf(sbuf, "%3d: %30d :%2d ", p, r,len);
                     }
@@ -2482 +2482 @@
     }
 #endif
-    
+
     if (kbd_is_key_pressed(KEY_SHOOT_HALF)) {
         if (kbd_is_key_pressed(SHORTCUT_TOGGLE_ZEBRA)) {
@@ -2522 +2522 @@
         pressed = 0;
     }
-    
+
         // TODO some of the ifs below should probably use this
         mode_video = MODE_IS_VIDEO(m);
 
-    mode_photo = (m&MODE_MASK) == MODE_PLAY || 
+    mode_photo = (m&MODE_MASK) == MODE_PLAY ||
                  !( mode_video ||
                                  (m&MODE_SHOOTING_MASK)==MODE_STITCH);
 
     half_disp_press=mode_photo && kbd_is_key_pressed(KEY_SHOOT_HALF) && kbd_is_key_pressed(KEY_DISPLAY);
-    if (half_disp_press && ! half_disp_press_old) 
+    if (half_disp_press && ! half_disp_press_old)
                 need_restore = 1;
     half_disp_press_old=half_disp_press;
@@ -2538 +2538 @@
                 draw_restore();
 
-    if (half_disp_press) 
+    if (half_disp_press)
                 return;
 
@@ -2547 +2547 @@
         }
 #if !CAM_SHOW_OSD_IN_SHOOT_MENU
-      if (!(conf.show_osd && (canon_menu_active==(int)&canon_menu_active-4) && (canon_shoot_menu_active==0)))  return;    
+      if (!(conf.show_osd && (canon_menu_active==(int)&canon_menu_active-4) && (canon_shoot_menu_active==0)))  return;
 #else
       if (!(conf.show_osd && (canon_menu_active==(int)&canon_menu_active-4) /*&& (canon_shoot_menu_active==0)*/ ))  return;
-#endif  
-
-    
+#endif
+
+
     if ((gui_mode==GUI_MODE_NONE || gui_mode==GUI_MODE_ALT) && (
-     (kbd_is_key_pressed(KEY_SHOOT_HALF) && ((conf.show_histo==SHOW_HALF)/* || (m&MODE_MASK) == MODE_PLAY*/)) || 
+     (kbd_is_key_pressed(KEY_SHOOT_HALF) && ((conf.show_histo==SHOW_HALF)/* || (m&MODE_MASK) == MODE_PLAY*/)) ||
      ((conf.show_histo==SHOW_ALWAYS)  &&  !((m&MODE_MASK) == MODE_PLAY) && (recreview_hold==0))
-    ) && 
+    ) &&
     (mode_photo || (m&MODE_SHOOTING_MASK)==MODE_STITCH)) {
         gui_osd_draw_histo();
@@ -2566 +2566 @@
         }
         if ((gui_mode==GUI_MODE_NONE || gui_mode==GUI_MODE_ALT) && (((kbd_is_key_pressed(KEY_SHOOT_HALF) || (state_kbd_script_run) || (shooting_get_common_focus_mode())) && (mode_photo || (m&MODE_SHOOTING_MASK)==MODE_STITCH )) || ((mode_video || movie_status > 1) && conf.show_values_in_video) )) {
-                 
+
            if (conf.show_dof!=DOF_DONT_SHOW) gui_osd_calc_dof();
-           
-           if (conf.show_dof==DOF_SHOW_IN_DOF) gui_osd_draw_dof();  
-           
-           if (conf.values_show_real_iso || conf.values_show_market_iso || conf.values_show_ev_seted || conf.values_show_ev_measured || conf.values_show_bv_measured || conf.values_show_bv_seted || conf.values_show_overexposure || conf.values_show_canon_overexposure || conf.values_show_luminance) gui_osd_calc_expo_param();                        
+
+           if (conf.show_dof==DOF_SHOW_IN_DOF) gui_osd_draw_dof();
+
+           if (conf.values_show_real_iso || conf.values_show_market_iso || conf.values_show_ev_seted || conf.values_show_ev_measured || conf.values_show_bv_measured || conf.values_show_bv_seted || conf.values_show_overexposure || conf.values_show_canon_overexposure || conf.values_show_luminance) gui_osd_calc_expo_param();
         }
         if (conf.show_state) gui_osd_draw_state();
         if (conf.save_raw && conf.show_raw_state && !mode_video && (!kbd_is_key_pressed(KEY_SHOOT_HALF))) gui_osd_draw_raw_info();
-        
+
             if ((conf.show_values==SHOW_ALWAYS && mode_photo) || ((mode_video || movie_status > 1)&& conf.show_values_in_video) || ((kbd_is_key_pressed(KEY_SHOOT_HALF) || (recreview_hold==1)) && (conf.show_values==SHOW_HALF)))
                    gui_osd_draw_values(1);
-        else if  (shooting_get_common_focus_mode() && mode_photo && conf.show_values && !(conf.show_dof==DOF_SHOW_IN_DOF) )   
+        else if  (shooting_get_common_focus_mode() && mode_photo && conf.show_values && !(conf.show_dof==DOF_SHOW_IN_DOF) )
            gui_osd_draw_values(2);
             else if  (conf.show_values==SHOW_HALF)
-                   gui_osd_draw_values(0);   
+                   gui_osd_draw_values(0);
     }
 
@@ -2590 +2590 @@
         if (conf.fast_ev && !mode_video && (m&MODE_MASK) == MODE_REC ) gui_osd_draw_ev();
     }
-    
+
     if ((conf.show_clock) && (recreview_hold==0) &&  ((!kbd_is_key_pressed(KEY_SHOOT_HALF) &&  (  ((m&MODE_MASK) == MODE_REC) || (!((m&MODE_MASK) == MODE_REC) &&  !((conf.hide_osd == 1) || (conf.hide_osd == 3)) )) && !(((conf.hide_osd == 2) || (conf.hide_osd == 3))&& (shooting_get_prop(PROPCASE_DISPLAY_MODE) == 1)))|| (conf.clock_halfpress==0) )) {
         gui_osd_draw_clock(0,0,0);
@@ -2597 +2597 @@
         gui_osd_draw_seconds();
     }
- 
+
     if ((conf.show_temp>0) && (recreview_hold==0) &&  ((!kbd_is_key_pressed(KEY_SHOOT_HALF) &&  (  ((m&MODE_MASK) == MODE_REC) || (!((m&MODE_MASK) == MODE_REC) &&  !((conf.hide_osd == 1) || (conf.hide_osd == 3)) )) && !(((conf.hide_osd == 2) || (conf.hide_osd == 3))&& (shooting_get_prop(PROPCASE_DISPLAY_MODE) == 1)) )|| (conf.clock_halfpress==0) )) {
         gui_osd_draw_temp();
@@ -2604 +2604 @@
         gui_osd_draw_movie_time_left();
     }
- 
+
 #if CAM_DRAW_EXPOSITION
     if (gui_mode==GUI_MODE_NONE && kbd_is_key_pressed(KEY_SHOOT_HALF) && ((m&MODE_MASK)==MODE_REC) && ((m&MODE_SHOOTING_MASK))!=MODE_VIDEO_STD && (m&MODE_SHOOTING_MASK)!=MODE_VIDEO_COMPACT) {
@@ -2650 +2650 @@
 void gui_menuproc_reset(int arg)
 {
-    gui_mbox_init(LANG_MSG_RESET_OPTIONS_TITLE, 
+    gui_mbox_init(LANG_MSG_RESET_OPTIONS_TITLE,
                   LANG_MSG_RESET_OPTIONS_TEXT,
                   MBOX_FUNC_RESTORE|MBOX_TEXT_CENTER|MBOX_BTN_YES_NO|MBOX_DEF_BTN2, gui_menuproc_reset_selected);
@@ -2682 +2682 @@
 void gui_show_memory_info(int arg) {
     static char buf[64];
-    
+
     sprintf(buf, lang_str(LANG_MSG_MEMORY_INFO_TEXT), core_get_free_memory(), MEMISOSIZE, &_start, &_end);
     gui_mbox_init(LANG_MSG_MEMORY_INFO_TITLE, (int)buf, MBOX_FUNC_RESTORE|MBOX_TEXT_CENTER, NULL);
@@ -2695 +2695 @@
         return;
     }
-    
-    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009 
+
+    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009
       draw_set_environment(aspect_xcorrection_games_360, aspect_ycorrection_games_360, GAMES_SCREEN_WIDTH, GAMES_SCREEN_HEIGHT);
     #endif
@@ -2712 +2712 @@
         return;
     }
-    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009 
+    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009
       draw_set_environment(aspect_xcorrection_games_360, aspect_ycorrection_games_360, GAMES_SCREEN_WIDTH, GAMES_SCREEN_HEIGHT);
     #endif
@@ -2727 +2727 @@
         return;
     }
-    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009 
+    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009
       draw_set_environment(aspect_xcorrection_games_360, aspect_ycorrection_games_360, GAMES_SCREEN_WIDTH, GAMES_SCREEN_HEIGHT);
     #endif
@@ -2742 +2742 @@
         return;
     }
-    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009 
+    #if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009
      draw_set_environment(aspect_xcorrection_games_360, aspect_ycorrection_games_360, GAMES_SCREEN_WIDTH, GAMES_SCREEN_HEIGHT);
     #endif
@@ -2771 +2771 @@
     coord w, h, x, y;
     static const char *text[] = {
-        "CHDK Firmware '" HDK_VERSION " " BUILD_NUMBER "'" , 
+        "CHDK Firmware '" HDK_VERSION " " BUILD_NUMBER "'" ,
         "Build: " __DATE__ " " __TIME__ ,
         "Camera: " PLATFORM " - " PLATFORMSUB };
@@ -2778 +2778 @@
 
     gui_splash_mode = (mode_get()&MODE_MASK);
-    
+
     h=sizeof(text)/sizeof(text[0])*FONT_HEIGHT+8;
     w=0;
@@ -2818 +2818 @@
               }else{
                   mx++;
-              }     
+              }
           }
       }
@@ -2883 +2883 @@
 void gui_draw_read_last(int arg) {
     int fd;
-    
+
     fd = open(conf.reader_file, O_RDONLY, 0777);
     if (fd >= 0) {
@@ -3026 +3026 @@
 }
 
-int find_mnu(CMenu *curr_menu, int mnu, int count) 
+int find_mnu(CMenu *curr_menu, int mnu, int count)
 {
         int gui_menu_curr_item;
@@ -3036 +3036 @@
                         return 1;
                 }
-                if ((curr_menu->menu[gui_menu_curr_item].type & MENUITEM_MASK) == MENUITEM_SUBMENU) 
+                if ((curr_menu->menu[gui_menu_curr_item].type & MENUITEM_MASK) == MENUITEM_SUBMENU)
                         if (curr_menu->menu[gui_menu_curr_item].text != LANG_MENU_USER_MENU)
                                 if (find_mnu((CMenu*)(curr_menu->menu[gui_menu_curr_item].value), mnu, count)) return 1;
@@ -3054 +3054 @@
         }
 }
- 
+
 void user_menu_restore() {
      int x;

trunk/core/gui_draw.h

@@ -50 +50 @@
 #define COLOR_YELLOW        0x44
 #define COLOR_BLACK         0xFF
-#define COLOR_BG            0x22 
+#define COLOR_BG            0x22
 #define COLOR_FG            COLOR_WHITE
 #define COLOR_SELECTED_BG   COLOR_RED
@@ -58 +58 @@
 #define COLOR_SPLASH_PINK   0x4C
 #define COLOR_SPLASH_GREY   0x16
-// colors for blended histo 
+// colors for blended histo
 // many of these probably wrong on this cam
 #define COLOR_HISTO_R       COLOR_RED
@@ -302 +302 @@
 
 
-#if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009 
+#if CAM_USES_ASPECT_CORRECTION //nandoide sept-2009
 void draw_set_aspect_xcorrection_proc(unsigned int (*xcorrection_proc)(unsigned int x));
 void draw_set_aspect_ycorrection_proc(unsigned int (*ycorrection_proc)(unsigned int y));
 unsigned int aspect_xcorrection_games_360(unsigned int x);
 unsigned int aspect_ycorrection_games_360(unsigned int y);
-void draw_set_environment(unsigned int (*xcorrection_proc)(unsigned int x), 
+void draw_set_environment(unsigned int (*xcorrection_proc)(unsigned int x),
                                        unsigned int (*ycorrection_proc)(unsigned int y),
                                        int screenx, int screeny );

trunk/core/kbd.c

@@ -73 +73 @@
 #endif
 
-#if defined (CAMERA_a700) || defined(CAMERA_a710) || defined (CAMERA_a720) || defined (CAMERA_a2000) 
+#if defined (CAMERA_a700) || defined(CAMERA_a710) || defined (CAMERA_a720) || defined (CAMERA_a2000)
 #define ZSTEP_TABLE_SIZE 8
 static int nTxtbl[]={0,2,4,6,8,10,12,14};
@@ -113 +113 @@
     kbd_blocked = 1;
     gui_kbd_enter();
-    console_clear(); 
+    console_clear();
     script_console_add_line("***Autostart***"); //lang_str(LANG_CONSOLE_TEXT_STARTED));
     script_start_gui( 1 );
@@ -139 +139 @@
 /*-------------------- Alex scriptless remote additions end ---------------------*/
 
-/* 
+/*
     main kb processing
     this monster needs to be broken up and documented, remote stuff should go in it's own functions
@@ -167 +167 @@
                 || ((key_pressed >= CAM_EMUL_KEYPRESS_DELAY)
                 && (key_pressed < CAM_EMUL_KEYPRESS_DELAY+CAM_EMUL_KEYPRESS_DURATION))) {
-            if (key_pressed <= CAM_EMUL_KEYPRESS_DELAY+CAM_EMUL_KEYPRESS_DURATION) 
+            if (key_pressed <= CAM_EMUL_KEYPRESS_DELAY+CAM_EMUL_KEYPRESS_DURATION)
                 key_pressed++;
-            if (key_pressed == CAM_EMUL_KEYPRESS_DELAY) 
+            if (key_pressed == CAM_EMUL_KEYPRESS_DELAY)
                 kbd_key_press(conf.alt_mode_button);
-            else if (key_pressed == +CAM_EMUL_KEYPRESS_DELAY+CAM_EMUL_KEYPRESS_DURATION) 
+            else if (key_pressed == +CAM_EMUL_KEYPRESS_DELAY+CAM_EMUL_KEYPRESS_DURATION)
                 kbd_key_release(conf.alt_mode_button);
             return 1;
@@ -177 +177 @@
             if (key_pressed != 100 && (key_pressed < CAM_EMUL_KEYPRESS_DELAY)) {
                 kbd_blocked = 1-kbd_blocked;
-                if (kbd_blocked) 
+                if (kbd_blocked)
                     gui_kbd_enter();
                 else
@@ -187 +187 @@
         return 1;
     }
-       
+
     // auto iso shift
-    if (kbd_is_key_pressed(KEY_SHOOT_HALF) && kbd_is_key_pressed(conf.alt_mode_button)) 
+    if (kbd_is_key_pressed(KEY_SHOOT_HALF) && kbd_is_key_pressed(conf.alt_mode_button))
         return 0;
 
@@ -196 +196 @@
             conf.synch_enable=1;
         key_pressed = 1;
-        kbd_key_release_all();          
+        kbd_key_release_all();
         return 1;
     }
@@ -283 +283 @@
                     nWt=10;
                     kbd_key_release_all();
-                    kbd_key_press(KEY_SHOOT_HALF); 
+                    kbd_key_press(KEY_SHOOT_HALF);
                     soft_half_press = 1;
                     set_key_press(1);
@@ -290 +290 @@
                     nSW=2;
                     nWt=10;
-                    kbd_key_release(KEY_SHOOT_HALF); 
+                    kbd_key_release(KEY_SHOOT_HALF);
                     soft_half_press = 0;
                     set_key_press(1);
@@ -418 +418 @@
                     nCa=0;
                     return 1;
-                }                                       
+                }
                 if(nSW==109) {
 //                  nSW=110;
@@ -459 +459 @@
                     nWt=2;
                     kbd_key_release_all();
-                    kbd_key_press(KEY_SHOOT_HALF); 
+                    kbd_key_press(KEY_SHOOT_HALF);
 //                  key_pressed = 1;
 //                  kbd_blocked = 1;
@@ -484 +484 @@
                         }
                     }
-                    if(nReczoom==0 && ((nTxzname==KEY_ZOOM_IN && nCrzpos>=nTxtbl[nTxtblcr]) 
+                    if(nReczoom==0 && ((nTxzname==KEY_ZOOM_IN && nCrzpos>=nTxtbl[nTxtblcr])
                             || (nTxzname==KEY_ZOOM_OUT && nCrzpos<=nTxtbl[nTxtblcr]))) {
                         if(get_usb_power(1)) {
@@ -513 +513 @@
                     }
                     kbd_key_release_all();
-                    kbd_key_press(nTxzname); 
+                    kbd_key_press(nTxzname);
                     set_key_press(1);
                     nCER++;
@@ -586 +586 @@
                 if(nTxzoom>0 && nSW==120 && conf.remote_zoom_enable) {
                     nCrzpos=lens_get_zoom_point();
-                    if((nTxzname==KEY_ZOOM_IN && nCrzpos<=nTxtbl[nTxtblcr]) 
+                    if((nTxzname==KEY_ZOOM_IN && nCrzpos<=nTxtbl[nTxtblcr])
                             || (nTxzname==KEY_ZOOM_OUT && nCrzpos>=nTxtbl[nTxtblcr])) {
                         kbd_key_release_all();
@@ -600 +600 @@
                     kbd_key_release_all();
                     if(nTxzname==KEY_ZOOM_IN)
-                        kbd_key_press(KEY_ZOOM_OUT); 
+                        kbd_key_press(KEY_ZOOM_OUT);
                     else
-                        kbd_key_press(KEY_ZOOM_IN); 
+                        kbd_key_press(KEY_ZOOM_IN);
                     set_key_press(1);
                     return 1;
@@ -611 +611 @@
                     nWt=2;
                     shutter_int=0;
-                    kbd_key_press(KEY_SHOOT_FULL); 
+                    kbd_key_press(KEY_SHOOT_FULL);
                     set_key_press(1);
 //                  kbd_blocked = 1;
@@ -625 +625 @@
                     nSW=116;
                     nWt=2;
-                    kbd_key_release(KEY_SHOOT_FULL); 
+                    kbd_key_release(KEY_SHOOT_FULL);
                     set_key_press(1);
                     soft_half_press = 0;
@@ -692 +692 @@
                     nWt=2;
                     kbd_key_release_all();
-                    kbd_key_press(KEY_SHOOT_HALF); 
+                    kbd_key_press(KEY_SHOOT_HALF);
 //                  debug_led(1);
                     soft_half_press = 1;
@@ -778 +778 @@
                         }
                     }
-                    if(nReczoom==0 && ((nTxzname==KEY_ZOOM_IN && nCrzpos>=nTxtbl[nTxtblcr]) 
+                    if(nReczoom==0 && ((nTxzname==KEY_ZOOM_IN && nCrzpos>=nTxtbl[nTxtblcr])
                                 || (nTxzname==KEY_ZOOM_OUT && nCrzpos<=nTxtbl[nTxtblcr]))) {
                         if(nCount==0) {
@@ -807 +807 @@
                     }
                     kbd_key_release_all();
-                    kbd_key_press(nTxzname); 
+                    kbd_key_press(nTxzname);
                     set_key_press(1);
                     nCER++;
@@ -830 +830 @@
                     kbd_key_release_all();
                     if(nTxzname==KEY_ZOOM_IN)
-                        kbd_key_press(KEY_ZOOM_OUT); 
+                        kbd_key_press(KEY_ZOOM_OUT);
                     else
-                        kbd_key_press(KEY_ZOOM_IN); 
+                        kbd_key_press(KEY_ZOOM_IN);
                     set_key_press(1);
                     return 1;
@@ -857 +857 @@
                         nSW=125;
                         nWt=10;
-                        kbd_key_release(KEY_SHOOT_HALF); 
+                        kbd_key_release(KEY_SHOOT_HALF);
                         soft_half_press = 0;
                         set_key_press(1);
@@ -874 +874 @@
                         shutter_int=0;
 //                      debug_led(0);
-                        kbd_key_press(KEY_SHOOT_FULL); 
+                        kbd_key_press(KEY_SHOOT_FULL);
                         set_key_press(1);
 //                      kbd_blocked = 1;
@@ -932 +932 @@
         }
 #endif // ifdef CAM_USE_ZOOM_FOR_MF
-        if ((conf.fast_ev || conf.fast_movie_control || conf.fast_movie_quality_control) 
+        if ((conf.fast_ev || conf.fast_movie_control || conf.fast_movie_quality_control)
                 && kbd_use_up_down_left_right_as_fast_switch()) {
             return 1;
         }
-        other_kbd_process(); // processed other keys in not <alt> mode 
+        other_kbd_process(); // processed other keys in not <alt> mode
     }
 
@@ -952 +952 @@
 long kbd_use_up_down_left_right_as_fast_switch() {
     static long key_pressed = 0; // ??? static masking a global
-    int m=mode_get(); 
+    int m=mode_get();
     int mode_video = MODE_IS_VIDEO(m) || (movie_status > 1);
     int ev_video=0;
@@ -958 +958 @@
 
 #if CAM_EV_IN_VIDEO
-    ev_video=get_ev_video_avail(); 
+    ev_video=get_ev_video_avail();
 #endif
 
@@ -973 +973 @@
             EnterToCompensationEVF();
             key_pressed = KEY_UP;
-                
+
             return 1;
         }
 
-    } 
+    }
 
     if (kbd_is_key_pressed(KEY_DOWN) && ((m&MODE_SHOOTING_MASK) != MODE_M) && !mode_video) {
@@ -988 +988 @@
             return 1;
         }
-    } 
+    }
 
 #else
@@ -1004 +1004 @@
             EnterToCompensationEVF();
         }
-     
+
 
 #endif
@@ -1018 +1018 @@
                 movie_reset = 1;
 #endif
-            }    
+            }
             else if (conf.video_mode==1) {
                 conf.video_quality+=1;
@@ -1024 +1024 @@
                     conf.video_quality=VIDEO_MAX_QUALITY;
                 movie_reset = 1;
-            }              
+            }
             key_pressed = KEY_UP;
             return 1;
         }
-    } 
-    
+    }
+
     if (kbd_is_key_pressed(KEY_DOWN) && mode_video && movie_status == 4) {
         if (conf.fast_movie_quality_control && key_pressed == 0) {
-            if (conf.video_mode==0) {                
+            if (conf.video_mode==0) {
 #if !CAM_VIDEO_QUALITY_ONLY
                 conf.video_bitrate-=1;
@@ -1047 +1047 @@
                     conf.video_quality=1;
                 movie_reset = 1;
-            }          
+            }
             key_pressed = KEY_DOWN;
             return 1;
         }
-    } 
-    
+    }
+
     if (kbd_is_key_pressed(KEY_LEFT) && mode_video && (movie_status == 4) && !ev_video) {
         if (conf.fast_movie_control && key_pressed == 0) {
@@ -1059 +1059 @@
             return 1;
         }
-    } 
+    }
         // reyalp - HACK for cams that can do video in any mode
         // note that this means this will probably run whenever you press right
     if (kbd_is_key_pressed(KEY_RIGHT) &&
-#ifndef CAM_HAS_VIDEO_BUTTON 
+#ifndef CAM_HAS_VIDEO_BUTTON
             mode_video &&
 #endif
@@ -1074 +1074 @@
             return 1;
         }
-    } 
+    }
 
     return 0;

trunk/lib/ubasic/ubasic.c

@@ -124 +124 @@
 
 int ubasic_error;
-const char *ubasic_errstrings[UBASIC_E_ENDMARK] = 
+const char *ubasic_errstrings[UBASIC_E_ENDMARK] =
 {
     "No err",
@@ -143 +143 @@
     "while: Stack ful",
     "bad wend",
-    "Unk err" 
+    "Unk err"
 };
 
@@ -250 +250 @@
  case TOKENIZER_GET_TICK_COUNT:
     accept(TOKENIZER_GET_TICK_COUNT);
-    r = shooting_get_tick_count();     
+    r = shooting_get_tick_count();
    break;
  case TOKENIZER_GET_MODE:
@@ -262 +262 @@
  case TOKENIZER_GET_RAW_NR:
     accept(TOKENIZER_GET_RAW_NR);
-    r = camera_get_nr();     
+    r = camera_get_nr();
     break;
  case TOKENIZER_IS_KEY:
@@ -276 +276 @@
 #ifdef UBASIC_TEST
         r = 0;
-#else   
+#else
     r = conf.script_startup;
 #endif
@@ -282 +282 @@
 case TOKENIZER_GET_USB_POWER:
     accept(TOKENIZER_GET_USB_POWER);
-    r = get_usb_power(0);     
+    r = get_usb_power(0);
     break;
 case TOKENIZER_GET_EXP_COUNT:
@@ -381 +381 @@
     accept(TOKENIZER_GET_USER_TV96);
     r = shooting_get_user_tv96();
-    break;   
+    break;
   case TOKENIZER_GET_USER_TV_ID:
     accept(TOKENIZER_GET_USER_TV_ID);
@@ -389 +389 @@
     accept(TOKENIZER_GET_AV96);
     r = shooting_get_av96();
-    break;  
+    break;
   case TOKENIZER_GET_USER_AV96:
     accept(TOKENIZER_GET_USER_AV96);
     r = shooting_get_user_av96();
-    break;    
+    break;
   case TOKENIZER_GET_USER_AV_ID:
     accept(TOKENIZER_GET_USER_AV_ID);
@@ -413 +413 @@
     accept(TOKENIZER_GET_FAR_LIMIT);
     r = shooting_get_far_limit_of_acceptable_sharpness();
-    break;  
+    break;
    case TOKENIZER_GET_DOF:
     accept(TOKENIZER_GET_DOF);
@@ -421 +421 @@
     accept(TOKENIZER_GET_HYPERFOCAL_DIST);
     r = shooting_get_hyperfocal_distance();
-    break;  
+    break;
   case TOKENIZER_GET_ISO_MARKET:
     accept(TOKENIZER_GET_ISO_MARKET);
@@ -433 +433 @@
     accept(TOKENIZER_GET_BV96);
     r = (int)shooting_get_bv96();
-    break;  
+    break;
   case TOKENIZER_GET_SV96:
     accept(TOKENIZER_GET_SV96);
     r = (int)shooting_get_sv96();
-    break;    
+    break;
   case TOKENIZER_GET_ISO_MODE:
     accept(TOKENIZER_GET_ISO_MODE);
@@ -485 +485 @@
     {
         case 0:
-                r = get_optical_temp(); 
+                r = get_optical_temp();
                 break;
         case 1:
-                r = get_ccd_temp(); 
+                r = get_ccd_temp();
                 break;
         case 2:
@@ -515 +515 @@
 #ifdef UBASIC_TEST
         r = 1;
-#else   
+#else
     r = conf.save_raw;
-#endif    
+#endif
     break;
  // get CHDK capture mode value, or 0 if in playback or unknown (broken modemap)
@@ -524 +524 @@
     accept(TOKENIZER_GET_CAPTURE_MODE);
     r = mode_get();
-    if ( (r&MODE_MASK) == MODE_REC) 
+    if ( (r&MODE_MASK) == MODE_REC)
         r &= MODE_SHOOTING_MASK;
     else
@@ -563 +563 @@
         op == TOKENIZER_NE ||
         op == TOKENIZER_EQ ||
-        op == TOKENIZER_XOR || 
+        op == TOKENIZER_XOR ||
         op == TOKENIZER_OR ||
         op == TOKENIZER_MOD) {
@@ -615 +615 @@
   int t1, t2;
   int op;
-  
+
   t1 = term();
   op = tokenizer_token();
@@ -652 +652 @@
   int r1, r2;
   int op;
-  
+
   r1 = expr();
   op = tokenizer_token();
@@ -724 +724 @@
   }
   if (tokenizer_token() == TOKENIZER_ENDOFINPUT) {
-    if (state_kbd_script_run == 1) {  
+    if (state_kbd_script_run == 1) {
       DEBUG_PRINTF("Label %s not found", label);
       ubasic_error = UBASIC_E_UNK_LABEL;
@@ -806 +806 @@
 {
   int r, else_cntr,endif_cntr,f_nt,f_sl;
-  
+
   accept(TOKENIZER_IF);
   DEBUG_PRINTF("if_statement: get_relation\n");
@@ -834 +834 @@
     }else {
       DEBUG_PRINTF("if_statement: result false\n");
-      
+
       else_cntr=endif_cntr=0; // number of else/endif possible in current nesting
       f_nt=f_sl=0; // f_nt nested then ?, f_fs flag single line
 
-      while(((tokenizer_token() != TOKENIZER_ELSE &&  tokenizer_token() != TOKENIZER_ENDIF) 
+      while(((tokenizer_token() != TOKENIZER_ELSE &&  tokenizer_token() != TOKENIZER_ENDIF)
            || else_cntr || endif_cntr) && tokenizer_token() != TOKENIZER_ENDOFINPUT){
         f_nt=0;
@@ -860 +860 @@
           else_cntr--;
           DEBUG_PRINTF("ELSE: line %d, token %d, else %d, end %d\n", tokenizer_line_number(),tokenizer_token(),else_cntr,endif_cntr);
-          if (else_cntr<0) { 
+          if (else_cntr<0) {
             DEBUG_PRINTF("ubasic.c: if_statement(): else without if-statement\n");
             ended = 1;
@@ -895 +895 @@
         return;
       }
-    }      
+    }
     endif_statement();
   }else {
@@ -908 +908 @@
         tokenizer_token() != TOKENIZER_ENDOFINPUT);
       if(tokenizer_token() == TOKENIZER_ELSE) {
-        accept(TOKENIZER_ELSE); 
+        accept(TOKENIZER_ELSE);
         statement();
       } else {
@@ -921 +921 @@
 {
   int r=0, endif_cntr, f_nt;
-  
+
   accept(TOKENIZER_ELSE);
   if(if_stack_ptr > 0) {
@@ -933 +933 @@
   }
   DEBUG_PRINTF("else_statement: relation %d\n", r);
-  
+
   if (tokenizer_token() == TOKENIZER_CR) {
     accept(TOKENIZER_CR);
@@ -942 +942 @@
       DEBUG_PRINTF("else_statement: result false\n");
       endif_cntr=0;
-      while(((tokenizer_token() != TOKENIZER_ENDIF ) 
+      while(((tokenizer_token() != TOKENIZER_ENDIF )
            || endif_cntr) && tokenizer_token() != TOKENIZER_ENDOFINPUT){
         f_nt=0;
@@ -955 +955 @@
           } else { // single line
             endif_cntr--;
-            while(tokenizer_token() != TOKENIZER_ENDIF && tokenizer_token() != TOKENIZER_CR 
+            while(tokenizer_token() != TOKENIZER_ENDIF && tokenizer_token() != TOKENIZER_CR
                  && tokenizer_token() != TOKENIZER_ENDOFINPUT){
               tokenizer_next();
@@ -1019 +1019 @@
   short case_run, case_goto = 0, case_gosub = 0;
   int cur_ln, gosub_ln = 0;
-  
+
   accept(TOKENIZER_CASE);
   if(select_stack_ptr > 0) {
     select_value = select_stack[select_stack_ptr - 1].select_value;
     case_run = select_stack[select_stack_ptr - 1].case_run;
-  
+
     if (!case_run) {
       case_value_1 = expr();
       case_value_eq = (select_value == case_value_1);
-      if (case_value_eq) { DEBUG_PRINTF("case_statement: case_value_eq %d, case_value %d\n", case_value_eq, case_value_1); }  
+      if (case_value_eq) { DEBUG_PRINTF("case_statement: case_value_eq %d, case_value %d\n", case_value_eq, case_value_1); }
 
       if(tokenizer_token() == TOKENIZER_TO) {
@@ -1052 +1052 @@
         DEBUG_PRINTF("case_statement: case_value_eq %d, case_value_comma %d\n", case_value_eq, case_value_1);
       }
-      
+
       accept(TOKENIZER_SEMICOLON);
       if (case_value_eq) {
@@ -1062 +1062 @@
         statement();
 //GOSUB  - save new linenumber, reset to curr linenumber
-      if (case_gosub) { 
+      if (case_gosub) {
         gosub_ln = tokenizer_line_number();
         jump_line(cur_ln+1);
@@ -1080 +1080 @@
 //REM
     if (case_goto) { dec_select_stack(); } else {
-      if ((tokenizer_token() != TOKENIZER_CASE) && (tokenizer_token() != TOKENIZER_CASE_ELSE) && 
+      if ((tokenizer_token() != TOKENIZER_CASE) && (tokenizer_token() != TOKENIZER_CASE_ELSE) &&
          (tokenizer_token() != TOKENIZER_END_SELECT)) {
          DEBUG_PRINTF("ubasic.c: select_statement(): don't found case, case_else or end_select\n");
          ended = 1;
          ubasic_error = UBASIC_E_PARSE;
-      } else { 
+      } else {
 //GOSUB test for end_select and set to gosub-linenumber
         if (tokenizer_token() == TOKENIZER_END_SELECT) { end_select_statement(); }
@@ -1093 +1093 @@
           DEBUG_PRINTF("end_select_statement: GOSUB: returnLN=%d\n", gosub_stack[gosub_stack_ptr-1]);
         }
-      }  
-//GOSUB        
+      }
+//GOSUB
     }
   } else {
@@ -1108 +1108 @@
   short case_goto = 0, case_gosub = 0;
   int cur_ln, gosub_ln = 0;
-  
+
   accept(TOKENIZER_CASE_ELSE);
   if(select_stack_ptr > 0) {
     if (!select_stack[select_stack_ptr - 1].case_run) {
-      case_goto = (tokenizer_token() == TOKENIZER_GOTO); 
-      case_gosub = (tokenizer_token() == TOKENIZER_GOSUB); 
+      case_goto = (tokenizer_token() == TOKENIZER_GOTO);
+      case_gosub = (tokenizer_token() == TOKENIZER_GOSUB);
 //GOSUB - save curr linenumber
       cur_ln = tokenizer_line_number();
@@ -1119 +1119 @@
       statement();
 //GOSUB  - save new linenumber, reset to curr linenumber
-      if (case_gosub) { 
+      if (case_gosub) {
         gosub_ln = tokenizer_line_number();
         jump_line(cur_ln+1);
@@ -1133 +1133 @@
     while ((tokenizer_token() == TOKENIZER_REM) && (!case_goto)) {statement();}
 //REM
-    if (case_goto) { dec_select_stack(); } else { 
+    if (case_goto) { dec_select_stack(); } else {
 //GOSUB test for end_select and set to gosub-linenumber
       if (tokenizer_token() != TOKENIZER_END_SELECT) {
@@ -1139 +1139 @@
         ended = 1;
         ubasic_error = UBASIC_E_PARSE;
-      } else { 
-          end_select_statement(); 
+      } else {
+          end_select_statement();
         if (case_gosub) {
           gosub_stack[gosub_stack_ptr-1] = tokenizer_line_number();
@@ -1146 +1146 @@
           DEBUG_PRINTF("end_select_statement: GOSUB: returnLN=%d\n", gosub_stack[gosub_stack_ptr-1]);
         }
-      }  
-//GOSUB      
+      }
+//GOSUB
     }
   } else {
@@ -1159 +1159 @@
 select_statement(void)
 {
- 
+
   int select_value;
-  
+
   accept(TOKENIZER_SELECT);
-  select_value = expr();  
+  select_value = expr();
   accept(TOKENIZER_CR);
 //REM
     while (tokenizer_token() == TOKENIZER_REM) {statement();}
 //REM
-  
+
   if(select_stack_ptr < MAX_SELECT_STACK_DEPTH) {
     select_stack[select_stack_ptr].select_value = select_value;
@@ -1191 +1191 @@
 let_statement(void)
 {
- 
+
   int var;
 
@@ -1265 +1265 @@
 {
   int var, value;
-  
+
   accept(TOKENIZER_NEXT);
   var = tokenizer_variable_num();
@@ -1273 +1273 @@
     value = ubasic_get_variable(var) + for_stack[for_stack_ptr - 1].step;
     ubasic_set_variable(var, value);
-    
+
     if(((for_stack[for_stack_ptr - 1].step > 0) && (value <= for_stack[for_stack_ptr - 1].to)) ||
        ((for_stack[for_stack_ptr - 1].step < 0) && (value >= for_stack[for_stack_ptr - 1].to)))
-        jump_line(for_stack[for_stack_ptr - 1].line_after_for); 
+        jump_line(for_stack[for_stack_ptr - 1].line_after_for);
     else {
       for_stack_ptr--;
@@ -1293 +1293 @@
 {
   int for_variable, to, step;
-  
+
   accept(TOKENIZER_FOR);
   for_variable = tokenizer_variable_num();
@@ -1300 +1300 @@
   ubasic_set_variable(for_variable, expr());
   accept(TOKENIZER_TO);
-  to = expr();                     
+  to = expr();
   step = 1;
   if (tokenizer_token() != TOKENIZER_CR) {
           accept(TOKENIZER_STEP);
-          step = expr();         
+          step = expr();
   }
   accept(TOKENIZER_CR);
@@ -1316 +1316 @@
                  for_stack[for_stack_ptr].for_variable,
                  for_stack[for_stack_ptr].to);
-                 
+
     for_stack_ptr++;
   } else {
@@ -1344 +1344 @@
 {
   int r;
-  
+
   accept(TOKENIZER_UNTIL);
   r = relation();
@@ -1365 +1365 @@
 {
   int r, while_cntr;
-  
+
   accept(TOKENIZER_WHILE);
   if(while_stack_ptr < MAX_WHILE_STACK_DEPTH) {
@@ -1383 +1383 @@
     if(!r) {
         while_cntr=0;
-      while((tokenizer_token() != TOKENIZER_WEND  || while_cntr ) && 
-              tokenizer_token() != TOKENIZER_ENDOFINPUT){   
+      while((tokenizer_token() != TOKENIZER_WEND  || while_cntr ) &&
+              tokenizer_token() != TOKENIZER_ENDOFINPUT){
               if (tokenizer_token() == TOKENIZER_WHILE) while_cntr+=1;
-              if (tokenizer_token() == TOKENIZER_WEND) while_cntr-=1;           
+              if (tokenizer_token() == TOKENIZER_WEND) while_cntr-=1;
               tokenizer_next();
-            }  
+            }
       while_stack_ptr--;
-    
+
       accept(TOKENIZER_WEND);
-      accept(TOKENIZER_CR);     
+      accept(TOKENIZER_CR);
     } else {
-          accept_cr();        
+          accept_cr();
     }
   } else {
@@ -1677 +1677 @@
     accept(TOKENIZER_VARIABLE);
     ubasic_set_variable(var, (unsigned short)stat_get_vbatt());
-        
+
     accept_cr();
 }
@@ -1689 +1689 @@
     accept(TOKENIZER_VARIABLE);
     ubasic_set_variable(var1, shooting_get_prop(var));
-        
+
     accept_cr();
 }
@@ -1962 +1962 @@
 #else
     if (mode_video) shooting_set_focus(to, SET_NOW);
-    else shooting_set_focus(to, SET_LATER);    
-#endif    
+    else shooting_set_focus(to, SET_LATER);
+#endif
     accept_cr();
 }
@@ -2087 +2087 @@
     to = expr();
     // if the value as negative, assume it is a mistakenly sign extended PROPCASE_SHOOTING_MODE value
-    if( to < 0) 
+    if( to < 0)
         to &= 0xFFFF;
     shooting_set_mode_canon(to);
@@ -2196 +2196 @@
     var = tokenizer_variable_num();
     accept(TOKENIZER_VARIABLE);
-        
+
     ubasic_set_variable(var, md_get_cell_diff(col,row));
     accept_cr();
@@ -2253 +2253 @@
 
     if (tokenizer_token() != TOKENIZER_CR && tokenizer_token() != TOKENIZER_ELSE) {
-                        // eat COMA     
+                        // eat COMA
 //                      tokenizer_next();
                 }
 
 
-                
+
     if (tokenizer_token() != TOKENIZER_CR && tokenizer_token() != TOKENIZER_ELSE) {
                                 tokenizer_next();
@@ -2292 +2292 @@
         msecs_before_trigger = expr();
     }
-                        
+
 
     accept_cr();
@@ -2306 +2306 @@
 
         md_init_motion_detector(
-                        columns, rows, pixel_measure_mode, detection_timeout, 
+                        columns, rows, pixel_measure_mode, detection_timeout,
                         measure_interval, threshold, draw_grid,
                         clipping_region_mode,
@@ -2379 +2379 @@
   case TOKENIZER_GET_TV96:
     get_tv96_statement();
-    break; 
+    break;
   case TOKENIZER_GET_USER_TV96:
     get_user_tv96_statement();
-    break;   
+    break;
   case TOKENIZER_GET_USER_TV_ID:
     get_user_tv_id_statement();
@@ -2388 +2388 @@
   case TOKENIZER_GET_AV96:
     get_av96_statement();
-    break;  
+    break;
   case TOKENIZER_GET_USER_AV96:
     get_user_av96_statement();
-    break;    
+    break;
   case TOKENIZER_GET_USER_AV_ID:
     get_user_av_id_statement();
@@ -2406 +2406 @@
   case TOKENIZER_GET_FAR_LIMIT:
     get_far_limit_statement();
-    break;  
+    break;
   case TOKENIZER_GET_DOF:
     get_dof_statement();
@@ -2412 +2412 @@
   case TOKENIZER_GET_HYPERFOCAL_DIST:
     get_hyperfocal_distance_statement();
-    break;  
+    break;
   case TOKENIZER_GET_ISO_MARKET:
     get_iso_market_statement();
@@ -2421 +2421 @@
   case TOKENIZER_GET_BV96:
     get_bv96_statement();
-    break;  
+    break;
   case TOKENIZER_GET_SV96:
     get_sv96_statement();
-    break;    
+    break;
   case TOKENIZER_GET_ISO_MODE:
     get_iso_mode_statement();
@@ -2449 +2449 @@
   case TOKENIZER_SET_TV96_DIRECT:
     set_tv96_direct_statement();
-    break;    
+    break;
   case TOKENIZER_SET_TV96:
     set_tv96_statement();
-    break;  
+    break;
   case TOKENIZER_PLAY_SOUND:
     play_sound_statement();
-    break;  
+    break;
   case TOKENIZER_SET_SHUTTER_SPEED:
     set_shutter_speed_statement();
-    break;    
+    break;
   case TOKENIZER_SET_USER_TV96:
     set_user_tv96_statement();
-    break;    
+    break;
   case TOKENIZER_SET_USER_TV_BY_ID:
     set_user_tv_by_id_statement();
@@ -2470 +2470 @@
   case TOKENIZER_SET_AV96_DIRECT:
     set_av96_direct_statement();
-    break;    
+    break;
   case TOKENIZER_SET_AV96:
     set_av96_statement();
-    break;  
-    
+    break;
+
   case TOKENIZER_SET_USER_AV96:
     set_user_av96_statement();
-    break;    
+    break;
   case TOKENIZER_SET_USER_AV_BY_ID:
     set_user_av_by_id_statement();
@@ -2484 +2484 @@
     set_user_av_by_id_rel_statement();
     break;
-   
+
   case TOKENIZER_SET_ND_FILTER:
     set_nd_filter_statement();
-    break;  
-  
+    break;
+
   case TOKENIZER_SET_ZOOM:
     set_zoom_statement();
@@ -2508 +2508 @@
   case TOKENIZER_SET_ISO_DL_F_B:
     set_iso_real_delta_from_base_statement();
-    break;*/  
+    break;*/
   case TOKENIZER_SET_ISO_REAL:
     set_iso_real_statement();
@@ -2514 +2514 @@
   case TOKENIZER_SET_SV96:
     set_sv96_statement();
-    break;  
-  
+    break;
+
   //ARM End
-  
-    
+
+
 
   case TOKENIZER_SET_ISO_MODE:
@@ -2534 +2534 @@
         set_ev_statement();
    break;
-   
+
     case TOKENIZER_SET_MOVIE_STATUS:
         set_movie_status_statement();
@@ -2694 +2694 @@
       return;
   }
-#endif 
+#endif
   /* reyalp - eat up to 100 labels or rems at a time so they don't cost 10ms each */
   int count = 100;

trunk/platform/generic/kbd.c

@@ -56 +56 @@
 long get_mmio(void)
 {
-long x; 
+long x;
 
 #if defined(CAMERA_a530) || defined(CAMERA_a540)
     x = (long)*mmio2;
 #endif
-        
-#if defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_ixus800_sd700) 
+
+#if defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_ixus800_sd700)
         x = (long)*mmio1;
 #endif
@@ -69 +69 @@
         x = (long)*mmio0;
 #endif
-        
-return x;       
-}
-
-#if defined(CAMERA_a530) || defined(CAMERA_a540) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a700)|| defined(CAMERA_a710) || defined (CAMERA_ixus800_sd700)  
+
+return x;
+}
+
+#if defined(CAMERA_a530) || defined(CAMERA_a540) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a700)|| defined(CAMERA_a710) || defined (CAMERA_ixus800_sd700)
 void wait_until_remote_button_is_released(void)
 {
@@ -118 +118 @@
                         nSW = 0;
                         do
-                                {     
+                                {
                                 x=get_mmio();
                                 cur_usb_power = x&USB_MASK;
@@ -137 +137 @@
                                 {
                                                 tick3 = (int)get_tick_count()-tick2;
-                                                if(nSW==10) 
+                                                if(nSW==10)
                                          {
                                                          if(tick3>50) shutter_int=1;
                                                          nSW=20;
                                                         }
-                                                if(nSW==0 && tick3>0) 
+                                                if(nSW==0 && tick3>0)
                                           {
-                                                         if(tick3<50) 
+                                                         if(tick3<50)
                                              {
                                                             nSW=10;
@@ -165 +165 @@
 
                   }             //continuous-shooting mode
- 
+
                  else{          // normal mode
                         shoot_counter=0;
@@ -176 +176 @@
 
 //   while((x&USB_MASK) &&  ((int)get_tick_count()-tick < DELAY_TIMEOUT));
- 
+
 // ------ modif by Masuji SUTO (start) --------------
         while(((!(x&USB_MASK) && (nMode==0)) || ((x&USB_MASK) && (nMode==1))) &&  ((int)get_tick_count()-tick < DELAY_TIMEOUT));
@@ -317 +317 @@
     remote_key = (kbd_new_state[USB_REG] & USB_MASK)==USB_MASK;
 
-                        if (remote_key) 
+                        if (remote_key)
                                 remote_count += 1;
                         else if (remote_count) {

trunk/platform/generic/shooting.c

@@ -34 +34 @@
 static short sv96_base_tmp=0;
 //static short override_iso=0;
-static const double sqrt2=1.4142135623731;//square root from 2 
+static const double sqrt2=1.4142135623731;//square root from 2
 static const double log_2=0.6931471805599;//natural logarithm of 2
-static const double k=12.5;//K is the reflected-light meter calibration constant 
+static const double k=12.5;//K is the reflected-light meter calibration constant
 static const short koef[] = {0, 1,10,100,1000};
 static const float shutter_koef[] = {0, 0.00001, 0.0001,0.001,0.01,0.1,1,10,100,1000};
@@ -103 +103 @@
 int shooting_get_user_tv_id()
 {
-#if CAM_HAS_USER_TV_MODES 
+#if CAM_HAS_USER_TV_MODES
     short tvv;
     long i;
@@ -111 +111 @@
             return shutter_speeds_table[i].id;
     }
-#endif        
+#endif
     return 0;
 }
@@ -151 +151 @@
  }
 }
-#endif 
+#endif
 }
 void shooting_set_prop(int id, int v)
@@ -194 +194 @@
     shooting_set_user_tv_by_id(cv+v);
 }
-#endif    
+#endif
 }
 
@@ -207 +207 @@
                          return aperture_sizes_table[i].id;
     }
-#endif    
+#endif
     return 0;
 }
@@ -241 +241 @@
     short sv;
     _GetPropertyCase(PROPCASE_SV, &sv, sizeof(sv));
-    if (sv == 0) { 
+    if (sv == 0) {
      return 0;
     }
@@ -264 +264 @@
 {
    short dsv,sv;
-   if (shooting_get_canon_iso_mode()<50) {      
+   if (shooting_get_canon_iso_mode()<50) {
        _GetPropertyCase(PROPCASE_DELTA_SV, &dsv, sizeof(dsv));
        _GetPropertyCase(PROPCASE_SV, &sv, sizeof(sv));
@@ -274 +274 @@
 short shooting_get_sv96_from_iso(short iso)
 {
-  if  (iso>0) 
+  if  (iso>0)
     return (short)(log(pow(2.0,(-7.0/4.0))*(double)(iso))*96.0/(log_2));
-  return 0;  
+  return 0;
 }
 
@@ -282 +282 @@
 {
    if  (iso>0) return (short)(log((double)(iso)*32.0/100.0)*96.0/(log_2));
-   return 0;   
-}  
+   return 0;
+}
 
 short shooting_get_iso_market_from_svm96(short svm96)
@@ -289 +289 @@
         if (svm96>0 )
                 return (short)((double)pow(2, (((double)svm96)/96.0))*100.0/32.0);
-        return 0;       
+        return 0;
 }
 
@@ -302 +302 @@
       else iso_market_base=100;
      }
-  return iso_market_base;       
+  return iso_market_base;
 }
 
@@ -323 +323 @@
     //double koef;
     short iso_mode=shooting_get_canon_iso_mode();
-    if ((iso_mode < 50) || (conf.iso_override_koef && conf.iso_override_value) || (conf.iso_bracket_koef && conf.iso_bracket_value)) 
+    if ((iso_mode < 50) || (conf.iso_override_koef && conf.iso_override_value) || (conf.iso_bracket_koef && conf.iso_bracket_value))
      {
       short iso_b=shooting_get_iso_base();
@@ -332 +332 @@
 
 void shooting_set_sv96(short sv96, short is_now){
-  short dsv96=0, iso_mode=shooting_get_canon_iso_mode();        
+  short dsv96=0, iso_mode=shooting_get_canon_iso_mode();
 if ((mode_get()&MODE_MASK) != MODE_PLAY){
   if (is_now)  {
     if (iso_mode<50) dsv96 =sv96-shooting_get_base_sv96();
     else if (sv96_base) dsv96=sv96-sv96_base;
-        else if (sv96_base_tmp) dsv96=sv96-sv96_base_tmp;  
+        else if (sv96_base_tmp) dsv96=sv96-sv96_base_tmp;
         else
-         { 
-         sv96_base_tmp= (short)((shooting_get_svm96_base()*shooting_get_sv96())/shooting_get_svm96());   
+         {
+         sv96_base_tmp= (short)((shooting_get_svm96_base()*shooting_get_sv96())/shooting_get_svm96());
          dsv96=sv96-sv96_base_tmp;
-         }       
+         }
     while ((shooting_is_flash_ready()!=1) || (focus_busy));
     short svm96_base =shooting_get_svm96_base();
@@ -358 +358 @@
  return;
  int iso=(int)((short)shooting_get_iso_base()+diso);
- 
+
  if (iso>0) {
     shooting_set_sv96((short)(shooting_get_sv96_from_iso(iso)));
@@ -422 +422 @@
 {
   int av=shooting_get_real_aperture();
-  int fl=get_focal_length(lens_get_zoom_point());       
+  int fl=get_focal_length(lens_get_zoom_point());
   if ((av>0) && (fl>0)) return (fl*fl)/(10*circle_of_confusion*av);
   else return (-1);
@@ -430 +430 @@
 {
  int h=shooting_get_hyperfocal_distance_();
- if ((h>0) && (conf.dof_dist_from_lens)) 
+ if ((h>0) && (conf.dof_dist_from_lens))
    return (h-shooting_get_lens_to_focal_plane_width());
  else return h;
@@ -452 +452 @@
    else {
         int h, v, m;
-                int fl=get_focal_length(lens_get_zoom_point()); 
-        int near=shooting_get_canon_subject_distance(); 
+                int fl=get_focal_length(lens_get_zoom_point());
+        int near=shooting_get_canon_subject_distance();
         int v1=(fl*fl);
         int av_min=shooting_get_min_real_aperture();
@@ -462 +462 @@
                   v=(h-near);
                   m=h*near;
-                  if ((v>0) && (m>0)) return m/v;  
+                  if ((v>0) && (m>0)) return m/v;
              }
         }
@@ -472 +472 @@
 {
  int h=shooting_get_subject_distance_();
- if ((h>0) && (conf.dof_dist_from_lens)) 
+ if ((h>0) && (conf.dof_dist_from_lens))
    return (h-shooting_get_lens_to_focal_plane_width());
  else return h;
@@ -479 +479 @@
 int shooting_get_near_limit_of_acceptable_sharpness_()
 {
-        int s=shooting_get_canon_subject_distance();    
+        int s=shooting_get_canon_subject_distance();
         if (conf.dof_subj_dist_as_near_limit) return s;
     else {
-      int h = shooting_get_hyperfocal_distance_();      
+      int h = shooting_get_hyperfocal_distance_();
       int m = h*s;
       int v = h+s;
@@ -493 +493 @@
 {
  int h=shooting_get_near_limit_of_acceptable_sharpness_();
- if ((h>0) && (conf.dof_dist_from_lens)) 
+ if ((h>0) && (conf.dof_dist_from_lens))
    return (h-shooting_get_lens_to_focal_plane_width());
  else return h;
@@ -500 +500 @@
 int shooting_get_near_limit_f(int s, int a, int fl)
 {
-      int h = shooting_get_hyperfocal_distance_f(a, fl);        
+      int h = shooting_get_hyperfocal_distance_f(a, fl);
       int m = h*s;
       int v = h+s;
@@ -509 +509 @@
 int shooting_get_far_limit_of_acceptable_sharpness_()
 {
-        int s=shooting_get_subject_distance_(), h=shooting_get_hyperfocal_distance_();  
+        int s=shooting_get_subject_distance_(), h=shooting_get_hyperfocal_distance_();
     int v = h-s;
     int m = h*s;
@@ -519 +519 @@
 {
  int h=shooting_get_far_limit_of_acceptable_sharpness_();
- if ((h>0) && (conf.dof_dist_from_lens)) 
+ if ((h>0) && (conf.dof_dist_from_lens))
    return (h-shooting_get_lens_to_focal_plane_width());
  else return h;
@@ -533 +533 @@
 short shooting_get_tv96_from_shutter_speed(float t)
 {
-  if (t>0) return (short) (96.0*log(1.0/t)/log_2);  
+  if (t>0) return (short) (96.0*log(1.0/t)/log_2);
   else return (-10000);
 }
@@ -539 +539 @@
 float shooting_get_shutter_speed_from_tv96(short tv)
 {
-  return  pow(2,(float)((-1)*tv)/96.0 );  
+  return  pow(2,(float)((-1)*tv)/96.0 );
 }
 
@@ -555 +555 @@
     _GetPropertyCase(PROPCASE_USER_TV, &tv, sizeof(tv));
     return tv;
-#else       
+#else
     return 0;
-#endif    
+#endif
 }
 
@@ -575 +575 @@
   }
 }
-#endif  
+#endif
 }
 
@@ -599 +599 @@
            _SetPropertyCase(PROPCASE_TV, &v, sizeof(v));
         }
-        else photo_param_put_off.tv96=v; 
+        else photo_param_put_off.tv96=v;
 }
 }
@@ -606 +606 @@
 void shooting_set_shutter_speed(float t, short is_now)
 {
-        if (t>0) shooting_set_tv96_direct((short) 96.0*log(1/t)/log_2, is_now);  
+        if (t>0) shooting_set_tv96_direct((short) 96.0*log(1/t)/log_2, is_now);
 }
 
@@ -612 +612 @@
 {
 if ((mode_get()&MODE_MASK) != MODE_PLAY){
-        if (t>0) shooting_set_tv96_direct((short) (96.0*log(100000.0/(double)t)/log_2), is_now);  
+        if (t>0) shooting_set_tv96_direct((short) (96.0*log(100000.0/(double)t)/log_2), is_now);
 }
 }
@@ -656 +656 @@
     _GetPropertyCase(PROPCASE_USER_AV, &av, sizeof(av));
     return av;
-#else     
+#else
     return 0;
 #endif
@@ -664 +664 @@
 void shooting_set_av96(short v, short is_now)
 {
-#if CAM_HAS_IRIS_DIAPHRAGM      
+#if CAM_HAS_IRIS_DIAPHRAGM
 if ((mode_get()&MODE_MASK) != MODE_PLAY){
  long i;
@@ -676 +676 @@
   }
 }
-#endif  
+#endif
 }
 
@@ -689 +689 @@
         else photo_param_put_off.nd_filter=v;
 }
-#endif  
+#endif
 }
 
@@ -695 +695 @@
 
 void shooting_set_av96_direct(short v, short is_now)
-{  
+{
 #if CAM_HAS_IRIS_DIAPHRAGM
 if ((mode_get()&MODE_MASK) != MODE_PLAY){
@@ -723 +723 @@
  }
 }
-#endif             
+#endif
 }
 
@@ -760 +760 @@
 #if !CAM_CAN_SD_OVER_NOT_IN_MF && CAM_CAN_SD_OVERRIDE
  int m=mode_get()&MODE_SHOOTING_MASK;
- int mode_video=((m==MODE_VIDEO_STD) || 
-                            (m==MODE_VIDEO_SPEED) ||  
+ int mode_video=((m==MODE_VIDEO_STD) ||
+                            (m==MODE_VIDEO_SPEED) ||
                             (m==MODE_VIDEO_COMPACT) ||
-                            (m==MODE_VIDEO_MY_COLORS) || 
+                            (m==MODE_VIDEO_MY_COLORS) ||
                             (m==MODE_VIDEO_TIME_LAPSE) ||
                             (m==MODE_VIDEO_COLOR_ACCENT));
@@ -769 +769 @@
 #elif !CAM_CAN_SD_OVERRIDE
  int m=mode_get()&MODE_SHOOTING_MASK;
- int mode_video=((m==MODE_VIDEO_STD) || 
-                            (m==MODE_VIDEO_SPEED) ||  
+ int mode_video=((m==MODE_VIDEO_STD) ||
+                            (m==MODE_VIDEO_SPEED) ||
                             (m==MODE_VIDEO_COMPACT) ||
-                            (m==MODE_VIDEO_MY_COLORS) || 
+                            (m==MODE_VIDEO_MY_COLORS) ||
                 (m==MODE_VIDEO_TIME_LAPSE) ||
                             (m==MODE_VIDEO_COLOR_ACCENT));
   return mode_video;
-#elif defined (CAMERA_ixus800_sd700)                                               
+#elif defined (CAMERA_ixus800_sd700)
  int m=mode_get()&MODE_SHOOTING_MASK;
 // TODO whats the reason for this ?!?
   return (shooting_get_zoom()<8) && (m!=MODE_AUTO) && (m!=MODE_SCN_UNDERWATER);
-#else 
-  return 1;  
-#endif                    
+#else
+  return 1;
+#endif
 }
 
@@ -791 +791 @@
 #elif !CAM_CAN_SD_OVERRIDE
   return 0;
-#else 
+#else
   return shooting_get_focus_mode();
-#endif                    
+#endif
 }
 
@@ -830 +830 @@
   }
 }
-#endif        
+#endif
 }
 
@@ -840 +840 @@
     shooting_set_user_av_by_id(cv+v);
 }
-#endif    
+#endif
 }
 
@@ -879 +879 @@
 int shooting_is_flash()
 {
- int t = 0;     
+ int t = 0;
  _GetPropertyCase(PROPCASE_IS_FLASH_READY, &t,sizeof(&t));
  return t;
@@ -974 +974 @@
         if ((is_now) && shooting_can_focus()) {
           if (conf.dof_dist_from_lens) s+=shooting_get_lens_to_focal_plane_width();
-          if ((!conf.dof_subj_dist_as_near_limit) && (s>0)) lens_set_focus_pos((s<MAX_DIST)?s:MAX_DIST); 
+          if ((!conf.dof_subj_dist_as_near_limit) && (s>0)) lens_set_focus_pos((s<MAX_DIST)?s:MAX_DIST);
           else {
         int near=shooting_get_near_limit_f(s,shooting_get_min_real_aperture(),get_focal_length(lens_get_zoom_point()));
-        if (near>0) lens_set_focus_pos((near<MAX_DIST)?near:MAX_DIST); 
+        if (near>0) lens_set_focus_pos((near<MAX_DIST)?near:MAX_DIST);
           }
         }
@@ -1001 +1001 @@
         static const short shutter[]={0, 8, 15, 30, 60, 125, 250, 500, 1000};
         float current_shutter = shooting_get_shutter_speed_from_tv96(shooting_get_tv96());
-        
+
         short current_iso=shooting_get_iso_real();
-                
+
         short min_shutter = shutter[conf.autoiso_shutter];
         if (min_shutter == 0)
@@ -1014 +1014 @@
         short target_iso = current_iso * min_shutter * current_shutter;
         short min_iso = conf.autoiso_min_iso*10;
-        
+
         if (target_iso > max_iso)
                 { target_iso = max_iso; }
         else if (target_iso < min_iso)
                 { target_iso = min_iso; }
-        
+
         float target_shutter = current_shutter *  current_iso / target_iso;
-        
+
         shooting_set_shutter_speed(target_shutter, SET_NOW);
-        
+
     shooting_set_iso_real(target_iso, SET_NOW);
-        
+
 }
 
@@ -1038 +1038 @@
 float shooting_get_shutter_speed_override_value()
 {
-  return (float)conf.tv_override_value*shutter_koef[conf.tv_override_koef];  
+  return (float)conf.tv_override_value*shutter_koef[conf.tv_override_koef];
 }
 
@@ -1054 +1054 @@
 const char * shooting_get_bracket_type()
 {
-  return expo_type[conf.bracket_type];  
+  return expo_type[conf.bracket_type];
 }
 
@@ -1060 +1060 @@
 short shooting_get_iso_override_value()
 {
-  return conf.iso_override_value*koef[conf.iso_override_koef];  
+  return conf.iso_override_value*koef[conf.iso_override_koef];
 }
 
 short shooting_get_iso_bracket_value()
 {
-  return conf.iso_bracket_value*koef[conf.iso_bracket_koef];  
+  return conf.iso_bracket_value*koef[conf.iso_bracket_koef];
 }
 
@@ -1078 +1078 @@
 const char * shooting_get_av_bracket_value()
 {
-  return expo_shift[conf.av_bracket_value];  
+  return expo_shift[conf.av_bracket_value];
 }
 
@@ -1105 +1105 @@
     bracketing.shoot_counter=1;
     // if Tv override is enabled... (this was adapted from function shooting_expo_param_override() )
-    if ( ((conf.tv_enum_type) || (conf.tv_override_value)) && (conf.tv_override_koef) && !(conf.override_disable==1) ) { 
+    if ( ((conf.tv_enum_type) || (conf.tv_override_value)) && (conf.tv_override_koef) && !(conf.override_disable==1) ) {
       // ...use Tv override value as seed for bracketing:
-      if (conf.tv_enum_type) 
+      if (conf.tv_enum_type)
         bracketing.tv96 = 32*(conf.tv_override_value-tv_override_zero_shift);
-      else 
+      else
         bracketing.tv96 = shooting_get_tv96_from_shutter_speed(shooting_get_shutter_speed_override_value());
     }
     // Tv override is disabled, use camera's opinion of Tv for bracketing seed value.
     else {
-      if (!(m==MODE_M || m==MODE_TV || m==MODE_LONG_SHUTTER)) bracketing.tv96=shooting_get_tv96(); 
+      if (!(m==MODE_M || m==MODE_TV || m==MODE_LONG_SHUTTER)) bracketing.tv96=shooting_get_tv96();
       else bracketing.tv96=shooting_get_user_tv96();
     }
@@ -1120 +1120 @@
   }
   // other shoots
-   bracketing.shoot_counter++;   
+   bracketing.shoot_counter++;
    is_odd=(bracketing.shoot_counter&1);
    if ((!is_odd) || (conf.bracket_type>0)) bracketing.dtv96+=bracketing.tv96_step;
@@ -1135 +1135 @@
     //short av_override_value=shooting_get_av96_override_value;
     //if (av_override_value) bracketing.av96=av_override_value;
-    if (!(m==MODE_M || m==MODE_AV)) bracketing.av96=shooting_get_av96(); 
+    if (!(m==MODE_M || m==MODE_AV)) bracketing.av96=shooting_get_av96();
         else bracketing.av96=shooting_get_user_av96();
     bracketing.av96_step=32*conf.av_bracket_value;
   }
   // other shoots
-   bracketing.shoot_counter++;   
+   bracketing.shoot_counter++;
    is_odd=(bracketing.shoot_counter&1);
-   if (((!is_odd) || (conf.bracket_type>0)) || (((is_odd) && (conf.bracket_type==0)) && ((bracketing.av96-bracketing.dav96)<AV96_MIN))) 
+   if (((!is_odd) || (conf.bracket_type>0)) || (((is_odd) && (conf.bracket_type==0)) && ((bracketing.av96-bracketing.dav96)<AV96_MIN)))
        bracketing.dav96+=bracketing.av96_step;
    if ((((!is_odd) && (conf.bracket_type==0)) || (conf.bracket_type==1)) && ((bracketing.av96-bracketing.dav96)>=AV96_MIN))
@@ -1150 +1150 @@
      }
    else if (((is_odd) && (conf.bracket_type==0)) || (conf.bracket_type==2)  || (((!is_odd) && (conf.bracket_type==0)) && ((bracketing.av96-bracketing.dav96)<AV96_MIN)))
-     { 
+     {
      value=bracketing.av96+bracketing.dav96;
      shooting_set_av96_direct(value, SET_NOW);
@@ -1165 +1165 @@
     }
   // other shoots
-   bracketing.shoot_counter++;   
+   bracketing.shoot_counter++;
    is_odd=(bracketing.shoot_counter&1);
-   
-   if (((!is_odd) || (conf.bracket_type>0)) || (((is_odd) && (conf.bracket_type==0)) && (bracketing.iso<=bracketing.diso))) 
+
+   if (((!is_odd) || (conf.bracket_type>0)) || (((is_odd) && (conf.bracket_type==0)) && (bracketing.iso<=bracketing.diso)))
     {
            bracketing.diso+=bracketing.iso_step;
@@ -1192 +1192 @@
  }
   // other shoots
-   bracketing.shoot_counter++;   
+   bracketing.shoot_counter++;
    is_odd=(bracketing.shoot_counter&1);
    if (((!is_odd) || (conf.bracket_type>0)) || (((is_odd) && (conf.bracket_type==0)) && (bracketing.subj_dist<=bracketing.dsubj_dist)))
@@ -1212 +1212 @@
 
 void shooting_bracketing(void){
-  
+
   short drive_mode=shooting_get_drive_mode();
   if (shooting_get_drive_mode()!=0)  {
      int m=mode_get()&MODE_SHOOTING_MASK;
      if (m!=MODE_STITCH) {
-       if (state_shooting_progress != SHOOTING_PROGRESS_PROCESSING) { 
+       if (state_shooting_progress != SHOOTING_PROGRESS_PROCESSING) {
            bracketing.shoot_counter=0;
            bracketing.av96=0;
@@ -1231 +1231 @@
            bracketing.type=0;
        }
-           if (conf.tv_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))  shooting_tv_bracketing(); 
-              else if (conf.av_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) shooting_av_bracketing(); 
+           if (conf.tv_bracket_value && !(conf.override_disable==1 && conf.override_disable_all))  shooting_tv_bracketing();
+              else if (conf.av_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) shooting_av_bracketing();
               else if ((conf.iso_bracket_value && !(conf.override_disable==1 && conf.override_disable_all)) && (conf.iso_bracket_koef)) {
                           shooting_iso_bracketing();
@@ -1284 +1284 @@
  //int m=mode_get()&MODE_SHOOTING_MASK;
  if ((state_kbd_script_run) && (photo_param_put_off.tv96)) {
-  shooting_set_tv96_direct(photo_param_put_off.tv96, SET_NOW);  
+  shooting_set_tv96_direct(photo_param_put_off.tv96, SET_NOW);
   photo_param_put_off.tv96=0;
  }
    else if (((conf.tv_enum_type) || (conf.tv_override_value)) && (conf.tv_override_koef) && !(conf.override_disable==1))
-   { 
-   if (conf.tv_enum_type) 
+   {
+   if (conf.tv_enum_type)
      shooting_set_tv96_direct(32*(conf.tv_override_value-(tv_override_zero_shift)),SET_NOW);
-   else   
-    shooting_set_tv96_direct(shooting_get_tv96_from_shutter_speed(shooting_get_shutter_speed_override_value()), SET_NOW); 
+   else
+    shooting_set_tv96_direct(shooting_get_tv96_from_shutter_speed(shooting_get_shutter_speed_override_value()), SET_NOW);
    }
  if ((state_kbd_script_run) && (photo_param_put_off.sv96)) {
   shooting_set_sv96(photo_param_put_off.sv96, SET_NOW);
-  photo_param_put_off.sv96=0; 
+  photo_param_put_off.sv96=0;
   }
 else if ((conf.iso_override_value) && (conf.iso_override_koef) && !(conf.override_disable==1))
@@ -1310 +1310 @@
  if ((state_kbd_script_run) && (photo_param_put_off.subj_dist)) {
   shooting_set_focus(photo_param_put_off.subj_dist, SET_NOW);
-  photo_param_put_off.subj_dist=0;  
+  photo_param_put_off.subj_dist=0;
   }
   else if ((conf.subj_dist_override_value) && (conf.subj_dist_override_koef) && !(conf.override_disable==1))
@@ -1317 +1317 @@
  if ((state_kbd_script_run) && (photo_param_put_off.nd_filter)) {
    shooting_set_nd_filter_state(photo_param_put_off.nd_filter, SET_NOW);
-   photo_param_put_off.nd_filter=0;  
-  }
- else if (conf.nd_filter_state && !(conf.override_disable==1)) 
+   photo_param_put_off.nd_filter=0;
+  }
+ else if (conf.nd_filter_state && !(conf.override_disable==1))
    shooting_set_nd_filter_state(conf.nd_filter_state, SET_NOW);
-#endif  
+#endif
 
 #if CAM_REAR_CURTAIN
@@ -1330 +1330 @@
   shooting_set_flash_video_override(conf.flash_manual_override,conf.flash_video_override_power);
 #if CAM_QUALITY_OVERRIDE
- // this doesn't really need to be set in the override hook. 
+ // this doesn't really need to be set in the override hook.
  // should only need to be set once if the users doesn't change back, but doing it here ensures it is set
  shooting_set_image_quality(conf.fast_image_quality);
@@ -1394 +1394 @@
         int i;
         for (i=0; i < MODESCNT; i++) {
-                if (modemap[i].canonmode == canonmode) 
+                if (modemap[i].canonmode == canonmode)
                         return modemap[i].hackmode;
         }
@@ -1403 +1403 @@
         int i;
         for (i=0; i < MODESCNT; i++) {
-                if (modemap[i].hackmode == hackmode) 
+                if (modemap[i].hackmode == hackmode)
                         return modemap[i].canonmode;
         }

trunk/platform/generic/wrappers.c

@@ -39 +39 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                /* 208-223 */
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,                /* 224-239 */
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};               /* 240-255 */ 
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};               /* 240-255 */
 #endif
 
@@ -189 +189 @@
                                 0x2004, //self-timer sound
                                 0xC211, //short beep
-                                50000,  // AF confirmation 
+                                50000,  // AF confirmation
                                 0xC507, // error beep imo
                                 0x400D, // LONG ERROR BEEP CONTINIUOUS- warning, cannot be stopped (yet)
@@ -416 +416 @@
 }
 
-// strerror exists on vxworks cams, 
+// strerror exists on vxworks cams,
 // but it does about the same thing as this
 const char *strerror(int en) {
@@ -478 +478 @@
 // for DRYOS cameras do something with this!  - sizeof(x[]) must be >= sizeof(struct tm) :  'static int x[9];'
   static int x[9];
-  return _LocalTime(_tod, &x);   
+  return _LocalTime(_tod, &x);
 #endif
 }
@@ -659 +659 @@
 //#else
 _SetAutoShutdownTime(1); // 1 sec
-for (i=0;i<200;i++) _UnlockMainPower(); // set power unlock counter to 200 or more, because every keyboard function call try to lock power again ( if "Disable LCD off" menu is "alt" or "script"). 
+for (i=0;i<200;i++) _UnlockMainPower(); // set power unlock counter to 200 or more, because every keyboard function call try to lock power again ( if "Disable LCD off" menu is "alt" or "script").
 //#endif
 }
@@ -776 +776 @@
 // return value: 1 - success, 0 - fail
 // called only in VxWorks
- 
+
  int offset=0x10; // points to partition #2
  int valid;
-  
- if ((mbr_sector[0x1FE]!=0x55) || (mbr_sector[0x1FF]!=0xAA)) return 0; // signature check 
+
+ if ((mbr_sector[0x1FE]!=0x55) || (mbr_sector[0x1FF]!=0xAA)) return 0; // signature check
 
  mbr_buf=_AllocateUncacheableMemory(SECTOR_SIZE);
@@ -787 +787 @@
 
  while(offset>=0) {
- 
-  *part_start_sector=(*(unsigned short*)(mbr_sector+offset+0x1C8)<<16) | *(unsigned short*)(mbr_sector+offset+0x1C6); 
-  *part_length=(*(unsigned short*)(mbr_sector+offset+0x1CC)<<16) | *(unsigned short*)(mbr_sector+offset+0x1CA); 
+
+  *part_start_sector=(*(unsigned short*)(mbr_sector+offset+0x1C8)<<16) | *(unsigned short*)(mbr_sector+offset+0x1C6);
+  *part_length=(*(unsigned short*)(mbr_sector+offset+0x1CC)<<16) | *(unsigned short*)(mbr_sector+offset+0x1CA);
 
   valid= (*part_start_sector) && (*part_length) &&
-         (*part_start_sector<=drive_total_sectors) && 
+         (*part_start_sector<=drive_total_sectors) &&
          (*part_start_sector+*part_length<=drive_total_sectors) &&
          ((mbr_sector[offset+0x1BE]==0) || (mbr_sector[offset+0x1BE]==0x80)); // status: 0x80 (active) or 0 (non-active)
@@ -825 +825 @@
  {
          for (i=0; i<=1;i++){
-          part_start_sector=(*(unsigned short*)(mbr_buf+i*16+0x1C8)<<16) | *(unsigned short*)(mbr_buf+i*16+0x1C6); 
-          part_length=(*(unsigned short*)(mbr_buf+i*16+0x1CC)<<16) | *(unsigned short*)(mbr_buf+i*16+0x1CA); 
+          part_start_sector=(*(unsigned short*)(mbr_buf+i*16+0x1C8)<<16) | *(unsigned short*)(mbr_buf+i*16+0x1C6);
+          part_length=(*(unsigned short*)(mbr_buf+i*16+0x1CC)<<16) | *(unsigned short*)(mbr_buf+i*16+0x1CA);
           part_status=mbr_buf[i*16+0x1BE];
           part_type=mbr_buf[0x1C2+i*16];
@@ -856 +856 @@
 
          _memset(mbr_buf,0,SECTOR_SIZE);
-         
+
          start=1; length=2*1024*1024/SECTOR_SIZE; //2 Mb
          type=1; // FAT primary
@@ -863 +863 @@
          mbr_buf[0x1BE + 12]=length; mbr_buf[0x1BE + 13]=length>>8; mbr_buf[0x1BE + 14]=length>>16; mbr_buf[0x1BE + 15]=length>>24;
 
-         start=start+length; length=drive_sectors-start-1; 
+         start=start+length; length=drive_sectors-start-1;
          type=0x0B;  //FAT32 primary;
          mbr_buf[0x1CE + 4]=type;
@@ -928 +928 @@
 extern char* second_ext_for_dng; // camera variable!
 
-p_some_f default_some_f;         
-char *   default_second_ext;     
+p_some_f default_some_f;
+char *   default_second_ext;
 
 char *_strstr (const char *s1, const char *s2)
@@ -959 +959 @@
 void change_ext_to_dng(void){
  some_f_for_dng=my_some_f;
- second_ext_for_dng=DNG_EXT_TO; 
+ second_ext_for_dng=DNG_EXT_TO;
 }
 
@@ -981 +981 @@
 #if !CAM_DRYOS
     long drvnum;
-    
+
     drvnum = _iosDrvInstall(dh_err,dh_err,dh_err,dh_err,dh_err,dh_err,dh_err);
     if (drvnum >= 0)
@@ -1068 +1068 @@
 
 // for cameras with two (or more?) RAW buffers this can be used to speed up DNG creation by
-// calling reverse_bytes_order only once. Override in platform/sub/lib.c 
+// calling reverse_bytes_order only once. Override in platform/sub/lib.c
 char __attribute__((weak)) *hook_alt_raw_image_addr() {
         return hook_raw_image_addr();
@@ -1116 +1116 @@
 #endif
 
-// TODO mode switch function should detect if USB is connected or not, 
+// TODO mode switch function should detect if USB is connected or not,
 // and do regular or special switch as needed
 #ifdef CAM_DRYOS