Changeset 643

Timestamp:

12/19/08 10:59:31 (4 years ago)

Author:

EWAVR

Message:

+ "dng via usb" for a610, a630, a640, s5is, ixus860

Location:

trunk

Files:

• include/camera.h (modified) (5 diffs)
• platform/a610/sub/100e/stubs_min.S (modified) (1 diff)
• platform/a610/sub/100f/stubs_min.S (modified) (1 diff)
• platform/a630/sub/100c/stubs_min.S (modified) (1 diff)
• platform/a640/sub/100b/stubs_min.S (modified) (1 diff)
• platform/ixus860_sd870/sub/100c/stubs_min.S (modified) (1 diff)
• platform/s5is/sub/101a/stubs_min.S (modified) (1 diff)
• platform/s5is/sub/101b/stubs_min.S (modified) (1 diff)

trunk/include/camera.h

@@ -466 +466 @@
     #define PARAM_CAMERA_NAME 3 // parameter number for GetParameterData
 
+    #define DNG_EXT_FROM ".DPS"
+    #define DNG_EXT_TO   ".DNG"
+
+
 //----------------------------------------------------------
 #elif defined (CAMERA_a620)
@@ -534 +538 @@
     // camera name
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+    #define DNG_EXT_FROM ".DPS"
+    #define DNG_EXT_TO   ".DNG"
 
 //----------------------------------------------------------
@@ -568 +574 @@
     // camera name
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+    #define DNG_EXT_FROM ".DPS"
+    #define DNG_EXT_TO   ".DNG"
 
 //----------------------------------------------------------
@@ -1255 +1263 @@
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
 
+    #define DNG_EXT_FROM ".CR2"
+    #define DNG_EXT_TO   ".DNG"
+
 //----------------------------------------------------------
 #elif defined (CAMERA_ixus950_sd850)
@@ -1432 +1443 @@
     #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
 //  #define CAM_BRACKETING              1 //propcase for dryos not found yet
+    #define DNG_EXT_FROM ".DPS"
+    #define DNG_EXT_TO   ".DNG"
 
 //==========================================================

trunk/platform/a610/sub/100e/stubs_min.S

@@ -14 +14 @@
 DEF(parameter_for_af_scan, 0x73D20)
 DEF(zoom_status, 0x8004)
+DEF(some_f_for_dng, 0x9AC4)
+DEF(second_ext_for_dng, 0x9AE8)

trunk/platform/a610/sub/100f/stubs_min.S

@@ -13 +13 @@
 DEF(parameter_for_af_scan, 0x73D20)
 DEF(zoom_status, 0x8004)
+DEF(some_f_for_dng, 0x9AC4)
+DEF(second_ext_for_dng, 0x9AE8)

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

@@ -12 +12 @@
 DEF(some_flag_for_af_scan, 0x621C)
 DEF(zoom_status, 0x75AC)
+DEF(some_f_for_dng, 0x8A6C)
+DEF(second_ext_for_dng, 0x8A90)

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

@@ -12 +12 @@
 DEF(some_flag_for_af_scan, 0x6278)
 DEF(zoom_status, 0x761C)
+DEF(some_f_for_dng, 0x8B0C)
+DEF(second_ext_for_dng, 0x8B30)

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

@@ -18 +18 @@
 DEF(zoom_status, 0xE560)
 DEF(movie_status, 0x551C)  // 0x54E0 + 0x3C
+DEF(some_f_for_dng, 0x90AC)
+DEF(second_ext_for_dng, 0x90ÑÑ)

trunk/platform/s5is/sub/101a/stubs_min.S

@@ -24 +24 @@
 
 DEF(zoom_status, 0x68F8)
+DEF(some_f_for_dng, 0x9B94)
+DEF(second_ext_for_dng, 0x9BB8)

trunk/platform/s5is/sub/101b/stubs_min.S

@@ -90 +90 @@
 DEF(movie_status,0x5868 + 0x38)
 DEF(zoom_status, 0x68F8)
+DEF(some_f_for_dng, 0x9B94)
+DEF(second_ext_for_dng, 0x9BB8)