ixus300_sd4000 camera.h updated for (CAM_SENSOR_BITS_PER_PIXEL 12), l…

…ib.c RAW buffer address changed. RAW does still cause shutdown.
pixeldoc2000 · Oct 1, 2010 · d828e0c · d828e0c
1 parent cdd9bba
commit d828e0c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/include/camera.h b/include/camera.h
@@ -2249,7 +2249,8 @@
     #define CAM_DRYOS_2_3_R39           1        // ROM:FFB5E1C0, actually its DRYOS version 2.3, release #0043
 
     #undef  CAM_BITMAP_PALETTE                   // shut up compiler
-    #define CAM_BITMAP_PALETTE          2        // fix CHDK UI colors (video buffer) ?!?
+    //#define CAM_BITMAP_PALETTE          2        // fix CHDK UI colors (video buffer) ?!?
+    #define CAM_BITMAP_PALETTE          5        // looks like no existing palette does fit in record mode
 
     #undef  CAM_UNCACHED_BIT                     // shut up compiler
     #define CAM_UNCACHED_BIT            0x40000000   // ROM:FF88A248 via ExMem.FreeCacheable()
@@ -2283,6 +2284,9 @@
      -77419,  1000000, 639766,  1000000,  44009, 1000000,  \
       17965,  1000000, 78396,   1000000, 231868, 1000000
 
+    #undef  CAM_SENSOR_BITS_PER_PIXEL
+    #define CAM_SENSOR_BITS_PER_PIXEL   12       // ?!?
+
     #define cam_CalibrationIlluminant1  1        // Daylight ?!?
     #define CAM_RAW_ROWPIX              3816     // ROM:FFB28EEC
     #define CAM_RAW_ROWS                2784     // ROM:FFB28EF4

diff --git a/platform/ixus300_sd4000/sub/100d/lib.c b/platform/ixus300_sd4000/sub/100d/lib.c
@@ -11,13 +11,17 @@
 // ROM:FFB28EF4 0xAE0 = 2784 pixel
 // 3816 * 2784 = 10623744
 
+/*
 // ROM:FFB29270, like SX210
 // search String "CRAW BUFF"
 char *hook_raw_image_addr() {
-    return (char*)0x40AFF8A0;         // second RAW buffer address
+    return (char*)0x4132C0A0;           // first RAW buffer address
+    //return (char*)0x40AFF8A0;         // second RAW buffer address
+    //return (char*)0x44CF6800;         // third RAW buffer address
 }
+*/
+
 
-/*
 // ROM:FFB2926C 0x4132C0A0 First RAW address
 // ROM:FFB60E70 Table contains first RAW address mentioned in SD990
 // function ROM:FF87ED4C referens the table with first RAW address (SsImgProcBuf.c)
@@ -26,19 +30,22 @@ char *hook_raw_image_addr() {
 char *hook_raw_image_addr() {
     return (char*) (*(int*)(0x2CCC + 0xC)? 0x46000000 : 0x4132C0A0);
 }
-*/
 
 // ROM:FFB292D0, like SX210
 // search String "CRAW BUFF SIZE"
 long hook_raw_size() {
     return 0xF32880;
 }
 
+void *vid_get_viewport_live_fb() {
+    return (void*)0;
+}
+
+/*
 // ?!?
 // Live picture buffer (shoot not pressed)
 // ROM:FF84FB50 ?!?
 void *vid_get_viewport_live_fb() {
-    return (void*)0;
     //void **fb=(void **)0x21E8;      // ?!?
     //void **fb=(void **)0x21EC;      // ?!?
     void **fb=(void **)0x21F8;      // ROM:FF85078C ?!? more or less guesswork
@@ -51,6 +58,7 @@ void *vid_get_viewport_live_fb() {
     }
     return fb[buff];
 }
+*/
 
 // OSD buffer
 // like SX10