Changeset 1444 for trunk/tools/finsig_dryos.c

Timestamp:

12/02/11 05:32:17 (18 months ago)

Author:

philmoz

Message:

Updates for finsig_dryos.c:

• The 'ctypes' array used in generic/wrappers.c exists in the firmware for dryos cameras. finsig_dryos.c now adds an entry for this to stubs_entry.S so the array is no longer needed in the CHDK code.
• Values from stubs_min.S that are correctly found by finsig_dryos.c can be removed from stubs_min.S. The entries will then be included in stubs_entry.S (as is done for stubs_entry_2.S). stubs_min.S cleaned up for G12, SX30, SX40 and IXUS310.

File:

• trunk/tools/finsig_dryos.c (modified) (5 diffs)

trunk/tools/finsig_dryos.c

@@ -2764 +2764 @@
 {
         osig *o = find_sig(stubs_min,name);
-        bprintf("//DEF(%-40s,0x%08x) // Found @0x%08x",name,fadr,atadr);
         if (o)
         {
+        bprintf("//DEF(%-40s,0x%08x) // Found @0x%08x",name,fadr,atadr);
                 if (fadr != o->val)
                 {
@@ -2776 +2776 @@
                 }
         }
+    else
+    {
+        bprintf("DEF(%-40s,0x%08x) // Found @0x%08x",name,fadr,atadr);
+    }
         bprintf("\n");
 }
@@ -2787 +2791 @@
         add_blankline();
 
-        bprintf("// Values below go in 'stubs_min.S':\n");
+        bprintf("// Values below can be overridden in 'stubs_min.S':\n");
 
         // Find 'physw_status'
@@ -3080 +3084 @@
                 }
         }
+}
+
+//------------------------------------------------------------------------------------------------------------
+
+// Search for things that go in 'stubs_min.S'
+void find_other_vals(firmware *fw)
+{
+        out_hdr = 1;
+        add_blankline();
+
+        bprintf("// Misc stuff\n");
+
+    unsigned char ctypes[] = 
+    { 
+        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x60, 0x60, 0x60, 0x60, 0x60, 0x20, 0x20,
+        0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20,
+        0x48, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+        0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x84, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
+        0x10, 0x81, 0x81, 0x81, 0x81, 0x81, 0x81, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0x10, 0x10, 0x10, 0x10, 0x10,
+        0x10, 0x82, 0x82, 0x82, 0x82, 0x82, 0x82, 2, 2, 2, 2, 2, 2, 2, 2, 2,
+        2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0x10, 0x10, 0x10, 0x10, 0x20
+    };
+
+    unsigned char *p = (unsigned char*)fw->buf;
+    int i, found = 0;
+    for (i=0; i<fw->size*4-sizeof(ctypes); i++, p++)
+    {
+        if (memcmp(p,ctypes,sizeof(ctypes)) == 0)
+        {
+            bprintf("DEF(ctypes, 0x%08x)\n", fw->base + i);
+            found = 1;
+            break;
+        }
+    }
+    if (!found)
+    {
+        bprintf("//DEF(ctypes, *** Not Found ***)\n");
+    }
 }
 
@@ -3393 +3436 @@
         find_key_vals(&fw);
         find_platform_vals(&fw);
+    find_other_vals(&fw);
 
     fprintf(stderr,"Time to generate stubs %.2f seconds\n",(double)(t2-t1)/(double)CLOCKS_PER_SEC);