Changeset 797

Timestamp:

09/09/09 23:07:22 (4 years ago)

Author:

reyalp

Message:

preliminary checkin to support a2000 porting. From ​http://chdk.setepontos.com/index.php/topic,4141.30.html

Location:

trunk

Files:

• core/kbd.c (modified) (1 diff)
• include/camera.h (modified) (1 diff)
• loader/a2000 (added)
• loader/a2000/blobs.S (added)
• loader/a2000/entry.S (added)
• loader/a2000/main.c (added)
• loader/a2000/resetcode (added)
• loader/a2000/resetcode/entry.S (added)
• loader/a2000/resetcode/main.c (added)
• makefile.inc (modified) (1 diff)
• platform/a2000 (added)
• platform/a2000/Makefile (added)
• platform/a2000/kbd.c (added)
• platform/a2000/lib.c (added)
• platform/a2000/main.c (added)
• platform/a2000/shooting.c (added)
• platform/a2000/sub (added)
• platform/a2000/sub/100c (added)
• platform/a2000/sub/100c/Makefile (added)
• platform/a2000/sub/100c/boot.c (added)
• platform/a2000/sub/100c/capt_seq.c (added)
• platform/a2000/sub/100c/lib.c (added)
• platform/a2000/sub/100c/makefile.inc (added)
• platform/a2000/sub/100c/movie_rec.c (added)
• platform/a2000/sub/100c/stubs_asm.h (added)
• platform/a2000/sub/100c/stubs_auto.S (added)
• platform/a2000/sub/100c/stubs_entry.S (added)
• platform/a2000/sub/100c/stubs_entry_2.S (added)
• platform/a2000/sub/100c/stubs_min.S (added)
• platform/a2000/sub/Makefile (added)
• platform/a2000/wrappers.c (added)

trunk/core/kbd.c

@@ -96 +96 @@
 #endif
 
-#if defined (CAMERA_a700) || defined(CAMERA_a710) || defined (CAMERA_a720)
+#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};

trunk/include/camera.h

@@ -774 +774 @@
     #define DNG_EXT_FROM ".CR2"
 
+//----------------------------------------------------------
+#elif defined (CAMERA_a2000)
+
+                ////////////////////////////////
+                // Sure values
+                ////////////////////////////////
+    #define CAM_MAKE                    "Canon"
+    #define CAM_PROPSET                 2
+    #define CAM_DRYOS                   1
+
+    #define CAM_RAW_ROWPIX              3720  
+    #define CAM_RAW_ROWS                2772  
+
+    #define CAM_JPEG_WIDTH  3648
+    #define CAM_JPEG_HEIGHT 2736
+    
+    #define DNG_SUPPORT                 1
+
+    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+
+    ////////////////////////////////
+    // Almost sure, sensor data taken from 
+    // ixus870_sd880 which should have same sensor..
+    ////////////////////////////////
+    #undef CAM_SENSOR_BITS_PER_PIXEL
+    #undef CAM_WHITE_LEVEL
+    #undef CAM_BLACK_LEVEL
+    #define CAM_SENSOR_BITS_PER_PIXEL   12
+    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1)
+    #define CAM_BLACK_LEVEL             127
+    
+    #define cam_CFAPattern              0x02010100 // Red  Green  Green  Blue
+    #define CAM_COLORMATRIX1                               \
+      827547, 1000000, -290458, 1000000, -126086, 1000000, \
+     -12829,  1000000, 530507,  1000000, 50537,   1000000, \
+      5181,   1000000, 48183,   1000000, 245014,  1000000 
+    #define cam_CalibrationIlluminant1  1 // Daylight
+
+                ////////////////////////////////
+                // Unsure
+                ////////////////////////////////
+//    #undef  CAM_UNCACHED_BIT
+//    #define CAM_UNCACHED_BIT    0x40000000
+
+    // cropping (from ixus870_sd880)
+    #define CAM_ACTIVE_AREA_X1          14
+    #define CAM_ACTIVE_AREA_Y1          8
+    #define CAM_ACTIVE_AREA_X2          3682
+    #define CAM_ACTIVE_AREA_Y2          2764
+
 //==========================================================
 // SD-Series (IXUS-Series)

trunk/makefile.inc

@@ -231 +231 @@
 #PLATFORM=ixus980_sd990
 #PLATFORMSUB=101b
+
+#PLATFORM=a2000
+#PLATFORMSUB=100c
 
 MEMISOSIZE="(&_end-&_start)"