Changeset 626

Timestamp:

12/10/08 17:33:06 (4 years ago)

Author:

EWAVR

Message:

+ A710, SX100 - files with 'dng' extension can be visible via USB (in some programs)

Location:

trunk

Files:

• core/conf.c (modified) (3 diffs)
• core/gui.c (modified) (3 diffs)
• include/camera.h (modified) (2 diffs)
• include/conf.h (modified) (1 diff)
• include/platform.h (modified) (1 diff)
• platform/a710/sub/100a/stubs_min.S (modified) (1 diff)
• platform/generic/wrappers.c (modified) (1 diff)
• platform/sx100is/sub/100b/stubs_min.S (modified) (1 diff)
• platform/sx100is/sub/100c/stubs_min.S (modified) (1 diff)

trunk/core/conf.c

@@ -75 +75 @@
 static void conf_change_grid_file();
 static void conf_change_video_bitrate();
+static void conf_change_dng_ext();
 
 void ubasic_camera_set_raw(int mode)
@@ -396 +397 @@
     CONF_INFO(233, conf.flash_video_override_power,     CONF_DEF_VALUE, i:0, NULL),
     CONF_INFO(234, conf.raw_dng_ext,     CONF_DEF_VALUE, i:0, NULL),
+    CONF_INFO(235, conf.dng_usb_ext,     CONF_DEF_VALUE, i:0, conf_change_dng_ext),
     };
 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0]))
@@ -455 +457 @@
  else unload_bad_pixels_list_b();
 #endif
+}
+
+void conf_change_dng_ext(void){
+#if defined (DNG_EXT_FROM) && defined(DNG_EXT_TO)
+ save_ext_for_dng();
+ if (conf.dng_usb_ext) change_ext_to_dng(); else change_ext_to_default();
+#endif 
 }
 

trunk/core/gui.c

@@ -264 +264 @@
 static void cb_change_dng(); 
 #endif
+#if defined (DNG_EXT_FROM) && defined(DNG_EXT_TO)
+static void cb_change_dng_usb_ext(); 
+#endif
 
 // for memory info, duplicated from lowlevel
@@ -419 +422 @@
 #endif
     {0x86,LANG_MENU_REMOTE_PARAM,            MENUITEM_SUBMENU,   (int*)&remote_submenu },
+#if defined (DNG_EXT_FROM) && defined(DNG_EXT_TO)
+    {0x5c,(int)"DNG visible via USB",        MENUITEM_BOOL | MENUITEM_ARG_CALLBACK, &conf.dng_usb_ext , (int)cb_change_dng_usb_ext},
+#endif
     {0x51,LANG_MENU_BACK,                    MENUITEM_UP },
     {0},
@@ -964 +970 @@
 }
 #endif
+
+#if defined (DNG_EXT_FROM) && defined(DNG_EXT_TO)
+void cb_change_dng_usb_ext(){
+ if (conf.dng_usb_ext) change_ext_to_dng(); else change_ext_to_default();
+}
+#endif
+
 
 //-------------------------------------------------------------------

trunk/include/camera.h

@@ -658 +658 @@
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
 
+    #define DNG_EXT_FROM ".DPS"
+    #define DNG_EXT_TO   ".DNG"
+
 //----------------------------------------------------------
 #elif defined (CAMERA_a720)
@@ -1475 +1478 @@
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
 
+    #define DNG_EXT_FROM ".CR2"
+    #define DNG_EXT_TO   ".DNG"
+
+
 //----------------------------------------------------------
 

trunk/include/conf.h

@@ -34 +34 @@
     int raw_timer;
     int raw_dng_ext;
+    int dng_usb_ext;
 
     int show_osd;

trunk/include/platform.h

@@ -474 +474 @@
 int get_ev_video(void);
 void set_ev_video(int); 
-
+//dng related
 void reverse_bytes_order(char* start, int count); 
+void save_ext_for_dng(void);
+void change_ext_to_dng(void);
+void change_ext_to_default(void);
+
 
 #define started() debug_led(1)

trunk/platform/a710/sub/100a/stubs_min.S

@@ -12 +12 @@
 DEF(some_flag_for_af_scan, 0x6230)
 DEF(zoom_status, 0x74F0)
+DEF(some_f_for_dng, 0x89E8)
+DEF(second_ext_for_dng, 0x8A0C)

trunk/platform/generic/wrappers.c

@@ -823 +823 @@
 }
 
+#if defined (DNG_EXT_FROM) && defined(DNG_EXT_TO)
+
+typedef int(*p_some_f)(char*, int);
+
+extern p_some_f some_f_for_dng;  // camera variable!
+extern char* second_ext_for_dng; // camera variable!
+
+p_some_f default_some_f;         
+char *   default_second_ext;     
+
+char *_strstr (const char *s1, const char *s2)
+{
+  const char *p = s1;
+  const int len = _strlen (s2);
+
+  for (; (p = _strchr (p, *s2)) != 0; p++)
+    {
+      if (_strncmp (p, s2, len) == 0)
+        return (char *)p;
+    }
+  return (0);
+}
+
+
+int my_some_f(char *s, int x){
+  char *f;
+  f=_strstr(s, DNG_EXT_FROM);
+  if (f) _memcpy(f, DNG_EXT_TO, sizeof(DNG_EXT_TO)-1);
+  return default_some_f(s, x);
+}
+
+void save_ext_for_dng(void){
+ default_some_f=some_f_for_dng;
+ default_second_ext=second_ext_for_dng;
+}
+
+void change_ext_to_dng(void){
+ some_f_for_dng=my_some_f;
+ second_ext_for_dng=DNG_EXT_TO; 
+}
+
+void change_ext_to_default(void){
+ some_f_for_dng=default_some_f;
+ second_ext_for_dng=default_second_ext;
+}
+
+#endif

trunk/platform/sx100is/sub/100b/stubs_min.S

@@ -14 +14 @@
 DEF(zoom_status, 0xDE14)
 DEF(some_flag_for_af_scan, 0xDD08)
+DEF(some_f_for_dng, 0x8E8C)
+DEF(second_ext_for_dng, 0x8EAC)

trunk/platform/sx100is/sub/100c/stubs_min.S

@@ -14 +14 @@
 DEF(zoom_status, 0xDE14)
 DEF(some_flag_for_af_scan, 0xDD08)
+DEF(some_f_for_dng, 0x8E8C)
+DEF(second_ext_for_dng, 0x8EAC)