Changeset 1533 for branches/reyalp-flt/tools/finsig_dryos.c

Timestamp:

01/08/12 11:58:54 (18 months ago)

Author:

philmoz

Message:

Update reyalp-flt branch with latest changes from main trunk.

Location:

branches/reyalp-flt

Files:

• . (modified) (1 prop)
• tools/finsig_dryos.c (modified) (2 diffs)

branches/reyalp-flt/tools/finsig_dryos.c

@@ -842 +842 @@
         cam_idx = (((fw->base==0xFF000000)?0xFFF40190:0xFFFE0170) - fw->base) / 4; 
         pid_idx = (((fw->base==0xFF000000)?0xFFF40040:0xFFFE0040) - fw->base) / 4; 
+        if ((cam_idx < fw->size) && (strncmp((char*)&fw->buf[cam_idx],"Canon ",6) != 0))
+            cam_idx = (((fw->base==0xFF000000)?0xFFF40170:0xFFFE0170) - fw->base) / 4; 
         break;
         }
@@ -3184 +3186 @@
             {
                 int mul = 1;
-                if (fw->buf[k+1] == 100) mul = 3;
+                if ((fw->buf[k+1] == 100) && (fw->buf[k+2] == 0)) mul = 3;
+                if ((fw->buf[k+1] == 100) && (fw->buf[k+2] != 0)) mul = 2;
                 for (k1 = k + mul; (k1 < fw->size) && (fw->buf[k1] > fw->buf[k1-mul]) && (fw->buf[k1] != max_focus_len); k1 += mul) ;
                 if (fw->buf[k1] == max_focus_len)