Changeset 1300 for trunk

Timestamp:

08/20/11 06:59:25 (21 months ago)

Author:

philmoz

Message:

Updated comments for G12 & SX30 to include correct firmware addresses for each version.

Location:

trunk/platform

Files:

• g12/sub/100e/lib.c (modified) (2 diffs)
• g12/sub/100f/lib.c (modified) (2 diffs)
• generic/capt_seq.c (modified) (1 diff)
• sx30/sub/100e/lib.c (modified) (6 diffs)
• sx30/sub/100h/lib.c (modified) (1 diff)
• sx30/sub/100l/lib.c (modified) (7 diffs)
• sx30/sub/100n/lib.c (modified) (6 diffs)
• sx30/sub/100p/lib.c (modified) (8 diffs)

trunk/platform/g12/sub/100e/lib.c

@@ -13 +13 @@
 {
         // Appears to be two raw buffers (this returns active buffer)
-        // Addresses below found in table at FFBBAD50, ref at FF8843F4
+        // Addresses below found in table at FFBBAF00, ref at FF8843F4
         // used in _sub_FF8841BC__SsImgProcBuf.c__0 
         // checks [0x2E88 + 0xc] --> defines which buffer is active
@@ -26 +26 @@
 {
         // Appears to be two raw buffers (this returns inactive buffer)
-        // Addresses below found in table at FFBBAD50, ref at FF8843F4
+        // Addresses below found in table at FFBBAF00, ref at FF8843F4
         // used in _sub_FF8841BC__SsImgProcBuf.c__0 
         // checks [0x2E88 + 0xc] --> defines which buffer is active

trunk/platform/g12/sub/100f/lib.c

@@ -13 +13 @@
 {
         // Appears to be two raw buffers (this returns active buffer)
-        // Addresses below found in table at FFBBAD50, ref at FF8843F4
+        // Addresses below found in table at FFBBAEF0, ref at FF8843F4
         // used in _sub_FF8841BC__SsImgProcBuf.c__0 
         // checks [0x2E88 + 0xc] --> defines which buffer is active
@@ -26 +26 @@
 {
         // Appears to be two raw buffers (this returns inactive buffer)
-        // Addresses below found in table at FFBBAD50, ref at FF8843F4
+        // Addresses below found in table at FFBBAEF0, ref at FF8843F4
         // used in _sub_FF8841BC__SsImgProcBuf.c__0 
         // checks [0x2E88 + 0xc] --> defines which buffer is active

trunk/platform/generic/capt_seq.c

@@ -49 +49 @@
     case NOISE_REDUCTION_AUTO_CANON:
         // leave it alone
-#if defined(NR_AUTO)                    // If value defined store if (e.g. for G12 & SX30 need to reset back to 0 to enable auto)
+#if defined(NR_AUTO)                    // If value defined store it (e.g. for G12 & SX30 need to reset back to 0 to enable auto)
         *nrflag = NR_AUTO;
 #endif

trunk/platform/sx30/sub/100e/lib.c

@@ -2 +2 @@
 
 /*
-sensor size from code at sub_FFB59B8C = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
+sensor size from code at sub_FFB59AD0 = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
 
-@FFB59BCC = 0xea0 = 4464        // raw sensor size
-@FFB59BD4 = 0xae0 = 3276
-@FFB59BDC = 0xe40 = 4320        // cropped size ??
-@FFB59BE4 = 0xab0 = 3240
+@FFB59B10 = 0x1170 = 4464       // raw sensor size
+@FFB59B18 = 0x0ccc = 3276
+@FFB59B20 = 0x10e0 = 4320       // cropped size ??
+@FFB59B28 = 0x0ca8 = 3240
 */
 
@@ -13 +13 @@
 {
         // Appears to be two raw buffers (this returns active buffer)
-        // Addresses below found in table at FFB9922C, ref at FF88883C
+        // Addresses below found in table at FFB99170, ref at FF88883C
         // used in _sub_FF888630__SsImgProcBuf.c__0 
         // checks [0x36a0 + 0xc] --> defines which buffer is active
@@ -20 +20 @@
                 return (char*) 0x443B4960;
         else
-                return (char*) 0x4235F6B0;      // found at (0xFFB59F40) [search CRAW BUF]
+                return (char*) 0x4235F6B0;      // found at (FFB59E84) [search CRAW BUF]
 }
 
@@ -26 +26 @@
 {
         // Appears to be two raw buffers (this returns inactive buffer)
-        // Addresses below found in table at FFB9922C, ref at FF88883C
+        // Addresses below found in table at FFB99170, ref at FF88883C
         // used in _sub_FF888630__SsImgProcBuf.c__0 
         // checks [0x36a0 + 0xc] --> defines which buffer is active
@@ -33 +33 @@
                 return (char*) 0x443B4960;
         else
-                return (char*) 0x4235F6B0;      // found at (0xFFB59F40) [search CRAW BUF]
+                return (char*) 0x4235F6B0;      // found at (FFB59E84) [search CRAW BUF]
 }
 
@@ -50 +50 @@
 void *vid_get_bitmap_fb()
 {
-        return (void*)0x40471000; // sub_FF93062C 
+        return (void*)0x40471000; // sub_FF9305F8 
 }
 

trunk/platform/sx30/sub/100h/lib.c

@@ -4 +4 @@
 sensor size from code at sub_FFB59B8C = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
 
-@FFB59BCC = 0xea0 = 4464        // raw sensor size
-@FFB59BD4 = 0xae0 = 3276
-@FFB59BDC = 0xe40 = 4320        // cropped size ??
-@FFB59BE4 = 0xab0 = 3240
+@FFB59BCC = 0x1170 = 4464       // raw sensor size
+@FFB59BD4 = 0x0ccc = 3276
+@FFB59BDC = 0x10e0 = 4320       // cropped size ??
+@FFB59BE4 = 0x0ca8 = 3240
 */
 

trunk/platform/sx30/sub/100l/lib.c

@@ -2 +2 @@
 
 /*
-sensor size from code at sub_FFB59B8C = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
+sensor size from code at sub_FFB59D34 = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
 
-@FFB59BCC = 0xea0 = 4464        // raw sensor size
-@FFB59BD4 = 0xae0 = 3276
-@FFB59BDC = 0xe40 = 4320        // cropped size ??
-@FFB59BE4 = 0xab0 = 3240
+@FFB59D74 = 0x1170 = 4464       // raw sensor size
+@FFB59D7C = 0x0ccc = 3276
+@FFB59D84 = 0x10e0 = 4320       // cropped size ??
+@FFB59D8C = 0x0ca8 = 3240
 */
 
@@ -13 +13 @@
 {
         // Appears to be two raw buffers (this returns active buffer)
-        // Addresses below found in table at FFB9922C, ref at FF88883C
-        // used in _sub_FF888630__SsImgProcBuf.c__0 
+        // Addresses below found in table at FFB993D4, ref at FF888840
+        // used in _sub_FF888634__SsImgProcBuf.c__0 
         // checks [0x36a0 + 0xc] --> defines which buffer is active
 
@@ -20 +20 @@
                 return (char*) 0x443B4960;
         else
-                return (char*) 0x4235F6B0;      // found at (0xFFB59F40) [search CRAW BUF]
+                return (char*) 0x4235F6B0;      // found at (FFB5A0E8) [search CRAW BUF]
 }
 
@@ -26 +26 @@
 {
         // Appears to be two raw buffers (this returns inactive buffer)
-        // Addresses below found in table at FFB9922C, ref at FF88883C
-        // used in _sub_FF888630__SsImgProcBuf.c__0 
+        // Addresses below found in table at FFB993D4, ref at FF888840
+        // used in _sub_FF888634__SsImgProcBuf.c__0 
         // checks [0x36a0 + 0xc] --> defines which buffer is active
 
@@ -33 +33 @@
                 return (char*) 0x443B4960;
         else
-                return (char*) 0x4235F6B0;      // found at (0xFFB59F40) [search CRAW BUF]
+                return (char*) 0x4235F6B0;      // found at (FFB5A0E8) [search CRAW BUF]
 }
 
@@ -50 +50 @@
 void *vid_get_bitmap_fb()
 {
-        return (void*)0x40471000; // sub_FF93062C 
+        return (void*)0x40471000; // sub_FF930630
 }
 
@@ -65 +65 @@
 void *vid_get_viewport_fb()
 {
-        return (void*)0x40587700; // sub_FF8E8C58
+        return (void*)0x40587700; // sub_FF8E8C5C
 }
 

trunk/platform/sx30/sub/100n/lib.c

@@ -2 +2 @@
 
 /*
-sensor size from code at sub_FFB59B8C = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
+sensor size from code at sub_FFB59DB8 = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
 
-@FFB59BCC = 0xea0 = 4464        // raw sensor size
-@FFB59BD4 = 0xae0 = 3276
-@FFB59BDC = 0xe40 = 4320        // cropped size ??
-@FFB59BE4 = 0xab0 = 3240
+@FFB59DF8 = 0x1170 = 4464       // raw sensor size
+@FFB59E00 = 0x0ccc = 3276
+@FFB59E08 = 0x10e0 = 4320       // cropped size ??
+@FFB59E10 = 0x0ca8 = 3240
 */
 
@@ -13 +13 @@
 {
         // Appears to be two raw buffers (this returns active buffer)
-        // Addresses below found in table at FFB9922C, ref at FF88883C
-        // used in _sub_FF888630__SsImgProcBuf.c__0 
+        // Addresses below found in table at FFB99448, ref at FF888840
+        // used in _sub_FF888634__SsImgProcBuf.c__0 
         // checks [0x36a0 + 0xc] --> defines which buffer is active
 
@@ -26 +26 @@
 {
         // Appears to be two raw buffers (this returns inactive buffer)
-        // Addresses below found in table at FFB9922C, ref at FF88883C
-        // used in _sub_FF888630__SsImgProcBuf.c__0 
+        // Addresses below found in table at FFB99448, ref at FF888840
+        // used in _sub_FF888634__SsImgProcBuf.c__0 
         // checks [0x36a0 + 0xc] --> defines which buffer is active
 
@@ -44 +44 @@
 char *camera_jpeg_count_str()
 {
-        return (char*)0xCF2FC; // loc_FFA3BCD8 (search "9999", passed to sprintf)
+        return (char*)0xCF2FC; // loc_FFA3BD5C (search "9999", passed to sprintf)
 }
 
@@ -50 +50 @@
 void *vid_get_bitmap_fb()
 {
-        return (void*)0x40471000; // sub_FF93062C 
+        return (void*)0x40471000; // sub_FF930630
 }
 
@@ -65 +65 @@
 void *vid_get_viewport_fb()
 {
-        return (void*)0x40587700; // sub_FF8E8C58
+        return (void*)0x40587700; // sub_FF8E8C5C
 }
 

trunk/platform/sx30/sub/100p/lib.c

@@ -2 +2 @@
 
 /*
-sensor size from code at sub_FFB59B8C = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
+sensor size from code at sub_FFB59D98 = (4464*3276)*(12/8) = 0x14EB7E0 = 21936096
 
-@FFB59BCC = 0xea0 = 4464        // raw sensor size
-@FFB59BD4 = 0xae0 = 3276
-@FFB59BDC = 0xe40 = 4320        // cropped size ??
-@FFB59BE4 = 0xab0 = 3240
+@FFB59DD8 = 0x1170 = 4464       // raw sensor size
+@FFB59DE0 = 0x0ccc = 3276
+@FFB59DE8 = 0x10e0 = 4320       // cropped size ??
+@FFB59DF0 = 0x0ca8 = 3240
 */
 
@@ -13 +13 @@
 {
         // Appears to be two raw buffers (this returns active buffer)
-        // Addresses below found in table at FFB9922C, ref at FF88883C
-        // used in _sub_FF888630__SsImgProcBuf.c__0 
+        // Addresses below found in table at FFB99428, ref at FF888840
+        // used in _sub_FF888634__SsImgProcBuf.c__0 
         // checks [0x36a0 + 0xc] --> defines which buffer is active
 
@@ -20 +20 @@
                 return (char*) 0x443B4960;
         else
-                return (char*) 0x4235F6B0;      // found at (0xFFB59F40) [search CRAW BUF]
+                return (char*) 0x4235F6B0;      // found at (FFB5A14C) [search CRAW BUF]
 }
 
@@ -26 +26 @@
 {
         // Appears to be two raw buffers (this returns inactive buffer)
-        // Addresses below found in table at FFB9922C, ref at FF88883C
-        // used in _sub_FF888630__SsImgProcBuf.c__0 
+        // Addresses below found in table at FFB99428, ref at FF888840
+        // used in _sub_FF888634__SsImgProcBuf.c__0 
         // checks [0x36a0 + 0xc] --> defines which buffer is active
 
@@ -33 +33 @@
                 return (char*) 0x443B4960;
         else
-                return (char*) 0x4235F6B0;      // found at (0xFFB59F40) [search CRAW BUF]
+                return (char*) 0x4235F6B0;      // found at (FFB5A14C) [search CRAW BUF]
 }
 
@@ -44 +44 @@
 char *camera_jpeg_count_str()
 {
-        return (char*)0xCF2FC; // loc_FFA3BCD8 (search "9999", passed to sprintf)
+        return (char*)0xCF2FC; // loc_FFA3BD5C (search "9999", passed to sprintf)
 }
 
@@ -50 +50 @@
 void *vid_get_bitmap_fb()
 {
-        return (void*)0x40471000; // sub_FF93062C 
+        return (void*)0x40471000; // sub_FF930630
 }
 
@@ -65 +65 @@
 void *vid_get_viewport_fb()
 {
-        return (void*)0x40587700; // sub_FF8E8C58
+        return (void*)0x40587700; // sub_FF8E8C5C
 }