Changeset 959

Timestamp:

10/24/10 04:03:29 (3 years ago)

Author:

reyalp

Message:

ixus900_sd900 port by pixeldoc ​http://chdk.kernreaktor.org/mantis/view.php?id=347

Location:

trunk

Files:

• Makefile (modified) (3 diffs)
• core/kbd.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• loader/ixus900_sd900 (added)
• loader/ixus900_sd900/Makefile (added)
• loader/ixus900_sd900/blobs.S (added)
• loader/ixus900_sd900/entry.S (added)
• loader/ixus900_sd900/main.c (added)
• loader/ixus900_sd900/resetcode (added)
• loader/ixus900_sd900/resetcode/Makefile (added)
• loader/ixus900_sd900/resetcode/entry.S (added)
• loader/ixus900_sd900/resetcode/main.c (added)
• platform/generic/kbd.c (modified) (2 diffs)
• platform/ixus900_sd900 (added)
• platform/ixus900_sd900/Makefile (added)
• platform/ixus900_sd900/kbd.c (added)
• platform/ixus900_sd900/lib.c (added)
• platform/ixus900_sd900/main.c (added)
• platform/ixus900_sd900/notes.txt (added)
• platform/ixus900_sd900/shooting.c (added)
• platform/ixus900_sd900/sub (added)
• platform/ixus900_sd900/sub/100c (added)
• platform/ixus900_sd900/sub/100c/Makefile (added)
• platform/ixus900_sd900/sub/100c/boot.c (added)
• platform/ixus900_sd900/sub/100c/capt_seq.c (added)
• platform/ixus900_sd900/sub/100c/debug.c (added)
• platform/ixus900_sd900/sub/100c/lib.c (added)
• platform/ixus900_sd900/sub/100c/makefile.inc (added)
• platform/ixus900_sd900/sub/100c/mount.c (added)
• platform/ixus900_sd900/sub/100c/movie_rec.c (added)
• platform/ixus900_sd900/sub/100c/stubs_asm.h (added)
• platform/ixus900_sd900/sub/100c/stubs_auto.S (added)
• platform/ixus900_sd900/sub/100c/stubs_entry.S (added)
• platform/ixus900_sd900/sub/100c/stubs_entry_2.S (added)
• platform/ixus900_sd900/sub/100c/stubs_entry_ida.S (added)
• platform/ixus900_sd900/sub/100c/stubs_min.S (added)
• platform/ixus900_sd900/sub/Makefile (added)
• platform/ixus900_sd900/wrappers.c (added)

trunk/Makefile

@@ -241 +241 @@
         #$(MAKE) -s --no-print-directory PLATFORM=ixus95_sd1200  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub
         #$(MAKE) -s --no-print-directory PLATFORM=a430 PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub
+        $(MAKE) -s --no-print-directory PLATFORM=ixus900_sd900  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub
         @echo "**** All firmwares created successfully"
         @echo "**** Copying duplicate Firmwares"
@@ -389 +390 @@
         #$(MAKE) -s --no-print-directory PLATFORM=ixus95_sd1200  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete
         #$(MAKE) -s --no-print-directory PLATFORM=a430 PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete
+        $(MAKE) -s --no-print-directory PLATFORM=ixus900_sd900  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete
         @echo "**** All zipfiles including firmwares and extra stuff created successfully"
         @echo "**** Copying duplicate Firmwares"
@@ -568 +570 @@
         #$(MAKE) -s --no-print-directory PLATFORM=ixus95_sd1200 PLATFORMSUB=100c NO_INC_BUILD=1 clean
         #$(MAKE) -s --no-print-directory PLATFORM=a430 PLATFORMSUB=100b NO_INC_BUILD=1 clean
+        $(MAKE) -s --no-print-directory PLATFORM=ixus900_sd900  PLATFORMSUB=100c NO_INC_BUILD=1 clean
 
         .PHONY: fir upload

trunk/core/kbd.c

@@ -70 +70 @@
 #endif
 
-#if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790)  || defined(CAMERA_ixus100_sd780) || defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200)
+#if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200)
 
 #define ZSTEP_TABLE_SIZE 7

trunk/include/camera.h

@@ -1609 +1609 @@
 //----------------------------------------------------------
 
+#elif defined (CAMERA_ixus900_sd900)
+    #define CAM_PROPSET                 1   // ToDo: test if correct
+
+    #define CAM_RAW_ROWPIX              3672   // value from RAW file (3648px + 24px)
+    #define CAM_RAW_ROWS                2760   // value from RAW file (2736 + 24px)
+
+    //#undef  CAM_USE_ZOOM_FOR_MF
+    #define CAM_DRAW_EXPOSITION         1   // ToDo: test if required
+    #undef  CAM_HAS_ERASE_BUTTON
+    #undef  CAM_HAS_IRIS_DIAPHRAGM
+    #define CAM_HAS_ND_FILTER           1
+    //#undef  CAM_CAN_SD_OVER_NOT_IN_MF
+    //#undef  CAM_CAN_SD_OVERRIDE
+    #undef  CAM_HAS_IS
+    #undef  CAM_HAS_MANUAL_FOCUS
+    #undef  CAM_HAS_USER_TV_MODES
+    #define CAM_SHOW_OSD_IN_SHOOT_MENU  1   // force CHDK OSD to show in record more
+    #define CAM_FEATURE_FEATHER         1
+    //#define CAM_CONSOLE_LOG_ENABLED     1   // ToDo: LOG stuff is disabled/removed
+    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1
+    #define CAM_MULTIPART               1
+    #define DNG_SUPPORT                 1
+
+    // pattern
+    #define cam_CFAPattern 0x02010100   // Red  Green  Green  Blue
+    // color (from G7)
+    #define CAM_COLORMATRIX1                              \
+      575419, 1000000,-185557, 1000000, -77898,  1000000, \
+     -213702, 1000000, 733569, 1000000,   81514, 1000000, \
+      -24604, 1000000, 131906, 1000000,  280378, 1000000
+    /*
+    // SD800
+    #define CAM_COLORMATRIX1                               \
+      661014, 1000000, -189364, 1000000, -115797, 1000000, \
+     -168772, 1000000,  661827, 1000000,   47392, 1000000, \
+      -35846, 1000000,  107148, 1000000,  233705, 1000000
+    */
+    #define cam_CalibrationIlluminant1 1   // ToDo: Daylight (first selectable Illuminant Calibration mode ?)
+
+    // cropping
+    #define CAM_JPEG_WIDTH  3648
+    #define CAM_JPEG_HEIGHT 2736
+    #define CAM_ACTIVE_AREA_X1 14   // ??? from G7, A640
+    #define CAM_ACTIVE_AREA_Y1 8   // ??? from G7, A640
+    //#define CAM_ACTIVE_AREA_X2 3672   // from RAW file
+    //#define CAM_ACTIVE_AREA_Y2 2760   // from RAW file
+    #define CAM_ACTIVE_AREA_X2 3682   // ??? from G7, A640, CAM_JPEG_WIDTH + 40
+    #define CAM_ACTIVE_AREA_Y2 2764   // ??? from G7, A640, CAM_JPEG_HEIGHT + 40
+    // camera name
+    #define PARAM_CAMERA_NAME 4   // camera param id of EXIF camera model
+
+    #define DNG_EXT_TO   ".DPS"
+//----------------------------------------------------------
+
 #elif defined (CAMERA_ixus860_sd870)
     #define CAM_PROPSET                 2

trunk/platform/generic/kbd.c

@@ -34 +34 @@
 #endif
 
-#if defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850)
+#if defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_ixus950_sd850)
 #define USB_MASK 0x8000000
 #define USB_REG 1
@@ -492 +492 @@
 }
 
-
-