Changeset 1625

Timestamp:

01/30/12 05:03:17 (16 months ago)

Author:

reyalp

Message:

a470 updates from srsa_4c in ​http://chdk.setepontos.com/index.php?topic=650.msg80692#msg80692

• extra long exposures implemented (all 3 fw revisions, tested on 1.02c)
• fixed the dark frame subtraction setting, bug mentioned here: ​http://chdk.setepontos.com/index.php?topic=3368.msg39071#msg39071 for all 3 revisions
• flash params table and params count fixed (I've verified the addresses manually, so all 3 rev. should be ok)
• defined CAM_STARTUP_CRASH_FILE_OPEN_FIX (previously camera crashed when "refresh" was issued in chdkptp GUI)
• also defined CAM_DETECT_SCREEN_ERASE
• strange check removed from kbd.c
• multiple corrections for 1.02c according to stubs_entry.S (can't be sure it would be ok for the other 2)
• debug code removed from capt_seq.c

Location:

branches/release-1_0/platform/a470

Files:

• kbd.c (modified) (1 diff)
• lib.c (modified) (1 diff)
• notes.txt (modified) (1 diff)
• platform_camera.h (modified) (1 diff)
• sub/100e/boot.c (modified) (2 diffs)
• sub/100e/capt_seq.c (modified) (3 diffs)
• sub/100e/stubs_auto.S (modified) (4 diffs)
• sub/100e/stubs_entry.S (modified) (1 diff)
• sub/100e/stubs_min.S (modified) (1 diff)
• sub/101b/boot.c (modified) (2 diffs)
• sub/101b/capt_seq.c (modified) (3 diffs)
• sub/101b/stubs_auto.S (modified) (4 diffs)
• sub/101b/stubs_entry.S (modified) (1 diff)
• sub/101b/stubs_min.S (modified) (1 diff)
• sub/102c/boot.c (modified) (2 diffs)
• sub/102c/capt_seq.c (modified) (3 diffs)
• sub/102c/stubs_auto.S (modified) (4 diffs)
• sub/102c/stubs_entry.S (modified) (1 diff)
• sub/102c/stubs_min.S (modified) (1 diff)

branches/release-1_0/platform/a470/kbd.c

@@ -340 +340 @@
     for (i=0;keymap[i].hackkey;i++){
         if ((kbd_new_state[keymap[i].grp] & keymap[i].canonkey) == 0){
-            if (i!=7) return keymap[i].hackkey;
+            return keymap[i].hackkey;
         }
     }

branches/release-1_0/platform/a470/lib.c

@@ -32 +32 @@
 
 int get_flash_params_count(void){
- return 114;
+ return 115;
 }

branches/release-1_0/platform/a470/notes.txt

@@ -6 +6 @@
 
 beta port, see http://chdk.setepontos.com/index.php/topic,3368.msg31068.html#msg31068
+supports extra long exposure (>64 sec)
 
 TODO:
-
-    * Add (super)long exposure time
     * Camera colour profile etc (copypastad atm)

branches/release-1_0/platform/a470/platform_camera.h

@@ -59 +59 @@
         // camera name
         #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData
+        #define CAM_STARTUP_CRASH_FILE_OPEN_FIX 1
+        #define CAM_EXT_TV_RANGE 1
+        #define CAM_DETECT_SCREEN_ERASE 1
         //#define DNG_EXT_FROM ".DPS"   
 //----------------------------------------------------------

branches/release-1_0/platform/a470/sub/100e/boot.c

@@ -14 +14 @@
 
 void boot();
+
+void taskCreateHook(int *p) { //function taken from the ixus80 port, adapted of course
+ p-=16;
+ if (p[0]==0xffc900b8)  p[0]=(int)exp_drv_task; //100e ok
+} 
 
 void boot() { //#fs
@@ -38 +43 @@
     for(i=0;i<canon_bss_len/4;i++)
         canon_bss_start[i]=0;
+
+    *(int*)0x1930=(int)taskCreateHook; //from ixus80 port
+    *(int*)0x1934=(int)taskCreateHook; //from ixus80 port (was taskCreateHook2...)
 
 /*    asm volatile (

branches/release-1_0/platform/a470/sub/100e/capt_seq.c

@@ -3 +3 @@
 #include "core.h"
 
-static long *nrflag = (long*)0x9F90;
+static long *nrflag = (long*)0x8888; //in sub_ffd0cae8, like in 101b
 
 #include "../../../generic/capt_seq.c"
@@ -67 +67 @@
                                 "LDR     R0, [SP]\n" //+
                 "LDR     R1, [R0]\n"
-                                
-                "LDR     R2, =0x1850\n"         // DEBUG: Save jumptable-target ...
-                "STR     R1, [R2]\n"            // ...to some unused space. Read and displayed in GUI in core/gui.c
                                 
                 "CMP     R1, #0x19\n"
@@ -279 +276 @@
     );
 } //#fe
+
+
+void __attribute__((naked,noinline)) exp_drv_task()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R8,LR}\n"
+"       SUB     SP, SP, #0x20\n"
+"       LDR     R8, =0xBB8\n"
+"       LDR     R7, =0x64D4\n"
+"       LDR     R5, =0x3D3DC\n"
+"       MOV     R0, #0\n"
+"       ADD     R6, SP, #0x10\n"
+"       STR     R0, [SP,#0xC]\n"
+"loc_FFC900D8:\n"
+"       LDR     R0, [R7,#0x20]\n"
+"       MOV     R2, #0\n"
+"       ADD     R1, SP, #0x1C\n"
+"       BL      sub_FFC1763C\n"
+"       LDR     R0, [SP,#0xC]\n"
+"       CMP     R0, #1\n"
+"       BNE     loc_FFC90120\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R0, [R0]\n"
+"       CMP     R0, #0x13\n"
+"       CMPNE   R0, #0x14\n"
+"       CMPNE   R0, #0x15\n"
+"       BEQ     loc_FFC9023C\n"
+"       CMP     R0, #0x27\n"
+"       BEQ     loc_FFC90214\n"
+"       ADD     R1, SP, #0xC\n"
+"       MOV     R0, #0\n"
+"       BL      sub_FFC90068\n"
+"loc_FFC90120:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x2C\n"
+"       BNE     loc_FFC90150\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC9131C\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #1\n"
+"       BL      sub_FFC173B8\n"
+"       BL      sub_FFC0BB70\n"
+"       ADD     SP, SP, #0x20\n"
+"       LDMFD   SP!, {R4-R8,PC}\n"
+"loc_FFC90150:\n"
+"       CMP     R1, #0x2B\n"
+"       BNE     loc_FFC9016C\n"
+"       LDR     R2, [R0,#0x88]!\n"
+"       LDR     R1, [R0,#4]\n"
+"       MOV     R0, R1\n"
+"       BLX     R2\n"
+"       B       loc_FFC906A0\n"
+"loc_FFC9016C:\n"
+"       CMP     R1, #0x25\n"
+"       BNE     loc_FFC901BC\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFC173EC\n"
+"       LDR     R0, =0xFFC8CB5C\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFD02FE0\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R8\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0xD1B\n"
+"       BNE     loc_FFC90200\n"
+"loc_FFC901A8:\n"
+"       LDR     R1, [SP,#0x1C]\n"
+"       LDR     R0, [R1,#0x8C]\n"
+"       LDR     R1, [R1,#0x88]\n"
+"       BLX     R1\n"
+"       B       loc_FFC906A0\n"
+"loc_FFC901BC:\n"
+"       CMP     R1, #0x26\n"
+"       BNE     loc_FFC9020C\n"
+"       ADD     R1, SP, #0xC\n"
+"       BL      sub_FFC90068\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFC173EC\n"
+"       LDR     R0, =0xFFC8CB6C\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFD03268\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R8\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       BEQ     loc_FFC901A8\n"
+"       LDR     R1, =0xD25\n"
+"loc_FFC90200:\n"
+"       LDR     R0, =0xFFC8D25C\n"
+"       BL      sub_FFC0BDB8\n"
+"       B       loc_FFC901A8\n"
+"loc_FFC9020C:\n"
+"       CMP     R1, #0x27\n"
+"       BNE     loc_FFC90224\n"
+"loc_FFC90214:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       ADD     R1, SP, #0xC\n"
+"       BL      sub_FFC90068\n"
+"       B       loc_FFC901A8\n"
+"loc_FFC90224:\n"
+"       CMP     R1, #0x2A\n"
+"       BNE     loc_FFC9023C\n"
+"       BL      sub_FFC6FF10\n"
+"       BL      sub_FFC70CDC\n"
+"       BL      sub_FFC70760\n"
+"       B       loc_FFC901A8\n"
+"loc_FFC9023C:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R4, #1\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x11\n"
+"       CMPNE   R1, #0x12\n"
+"       BNE     loc_FFC902AC\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R1, R0, R1,LSL#2\n"
+"       SUB     R1, R1, #8\n"
+"       LDMIA   R1, {R2-R4}\n"
+"       STMIA   R6, {R2-R4}\n"
+"       BL      sub_FFC8EBE8\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC916F4\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x90]\n"
+"       LDR     R2, [R0,#0x94]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       B       loc_FFC905E0\n"
+"loc_FFC902AC:\n"
+"       CMP     R1, #0x13\n"
+"       CMPNE   R1, #0x14\n"
+"       CMPNE   R1, #0x15\n"
+"       BNE     loc_FFC90360\n"
+"       ADD     R3, SP, #0xC\n"
+"       MOV     R2, SP\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFC8EE30\n"
+"       CMP     R0, #1\n"
+"       MOV     R4, R0\n"
+"       CMPNE   R4, #5\n"
+"       BNE     loc_FFC902FC\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       LDR     R1, [R0,#0x7C]!\n"
+"       LDR     R12, [R0,#0xC]!\n"
+"       LDR     R3, [R0,#4]\n"
+"       MOV     R0, SP\n"
+"       BLX     R12\n"
+"       B       loc_FFC90334\n"
+"loc_FFC902FC:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       CMP     R4, #2\n"
+"       LDR     R3, [R0,#0x8C]\n"
+"       CMPNE   R4, #6\n"
+"       BNE     loc_FFC90348\n"
+"       LDR     R12, [R0,#0x88]\n"
+"       MOV     R0, SP\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #1\n"
+"       BLX     R12\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, SP\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFC8FDB4\n"
+"loc_FFC90334:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R2, [SP,#0xC]\n"
+"       MOV     R1, R4\n"
+"       BL      sub_FFC90008\n"
+"       B       loc_FFC905E0\n"
+"loc_FFC90348:\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R12, [R0,#0x88]\n"
+"       ADD     R0, R0, #4\n"
+"       MOV     R2, R4\n"
+"       BLX     R12\n"
+"       B       loc_FFC905E0\n"
+"loc_FFC90360:\n"
+"       CMP     R1, #0x21\n"
+"       CMPNE   R1, #0x22\n"
+"       BNE     loc_FFC903AC\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R1, R0, R1,LSL#2\n"
+"       SUB     R1, R1, #8\n"
+"       LDMIA   R1, {R2-R4}\n"
+"       STMIA   R6, {R2-R4}\n"
+"       BL      sub_FFC8E174\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC8E464\n"
+"       B       loc_FFC905E0\n"
+"loc_FFC903AC:\n"
+"       ADD     R1, R0, #4\n"
+"       LDMIA   R1, {R2,R3,R12}\n"
+"       STMIA   R6, {R2,R3,R12}\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x24\n"
+"       ADDLS   PC, PC, R1,LSL#2\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC903C8:\n"
+"       B       loc_FFC9045C\n"
+"loc_FFC903CC:\n"
+"       B       loc_FFC9045C\n"
+"loc_FFC903D0:\n"
+"       B       loc_FFC90464\n"
+"loc_FFC903D4:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903D8:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903DC:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903E0:\n"
+"       B       loc_FFC9045C\n"
+"loc_FFC903E4:\n"
+"       B       loc_FFC90464\n"
+"loc_FFC903E8:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903EC:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903F0:\n"
+"       B       loc_FFC904C8\n"
+"loc_FFC903F4:\n"
+"       B       loc_FFC904C8\n"
+"loc_FFC903F8:\n"
+"       B       loc_FFC905B4\n"
+"loc_FFC903FC:\n"
+"       B       loc_FFC905BC\n"
+"loc_FFC90400:\n"
+"       B       loc_FFC905BC\n"
+"loc_FFC90404:\n"
+"       B       loc_FFC905BC\n"
+"loc_FFC90408:\n"
+"       B       loc_FFC905BC\n"
+"loc_FFC9040C:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90410:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90414:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90418:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9041C:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90420:\n"
+"       B       loc_FFC90474\n"
+"loc_FFC90424:\n"
+"       B       loc_FFC9047C\n"
+"loc_FFC90428:\n"
+"       B       loc_FFC9047C\n"
+"loc_FFC9042C:\n"
+"       B       loc_FFC904D4\n"
+"loc_FFC90430:\n"
+"       B       loc_FFC904D4\n"
+"loc_FFC90434:\n"
+"       B       loc_FFC904DC\n"
+"loc_FFC90438:\n"
+"       B       loc_FFC9050C\n"
+"loc_FFC9043C:\n"
+"       B       loc_FFC9053C\n"
+"loc_FFC90440:\n"
+"       B       loc_FFC9056C\n"
+"loc_FFC90444:\n"
+"       B       loc_FFC9059C\n"
+"loc_FFC90448:\n"
+"       B       loc_FFC9059C\n"
+"loc_FFC9044C:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90450:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90454:\n"
+"       B       loc_FFC905A4\n"
+"loc_FFC90458:\n"
+"       B       loc_FFC905AC\n"
+"loc_FFC9045C:\n"
+"       BL      sub_FFC8D044\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90464:\n"
+"       BL      sub_FFC8D2D4\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9046C:\n"
+"       BL      sub_FFC8D4D8\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90474:\n"
+"       BL      sub_FFC8D740\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9047C:\n"
+"       BL      sub_FFC8D934\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC904C8:\n"
+"       BL      sub_FFC8DB9C_my\n" // ->
+"       MOV     R4, #0\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC904D4:\n"
+"       BL      sub_FFC8DCD8\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC904DC:\n"
+"       LDRH    R1, [R0,#4]\n"
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R0,#0xC]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC91390\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9050C:\n"
+"       LDRH    R1, [R0,#4]\n"
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R5,#8]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC91510\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9053C:\n"
+"       LDRH    R1, [R5]\n"
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R0,#6]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R5,#8]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC915BC\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9056C:\n"
+"       LDRH    R1, [R5]\n"
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R0,#0xC]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC9165C\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9059C:\n"
+"       BL      sub_FFC8DF4C\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC905A4:\n"
+"       BL      sub_FFC8E568\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC905AC:\n"
+"       BL      sub_FFC8E7A0\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC905B4:\n"
+"       BL      sub_FFC8E918\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC905BC:\n"
+"       BL      sub_FFC8EAB0\n"
+"loc_FFC905C0:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       CMP     R4, #1\n"
+"       BNE     loc_FFC90628\n"
+"loc_FFC905E0:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, #0xC\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R0, R0, R1,LSL#2\n"
+"       SUB     R4, R0, #8\n"
+"       LDR     R0, =0x3D3DC\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFE4E008\n"
+"       LDR     R0, =0x3D3E8\n"
+"       MOV     R2, #0xC\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFE4E008\n"
+"       LDR     R0, =0x3D3F4\n"
+"       MOV     R2, #0xC\n"
+"       MOV     R1, R4\n"
+"       BL      sub_FFE4E008\n"
+"       B       loc_FFC906A0\n"
+"loc_FFC90628:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R0, [R0]\n"
+"       CMP     R0, #0xB\n"
+"       BNE     loc_FFC90670\n"
+"       MOV     R3, #0\n"
+"       STR     R3, [SP]\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #0\n"
+"       BL      sub_FFC8CE4C\n"
+"       MOV     R3, #0\n"
+"       STR     R3, [SP]\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #0\n"
+"       B       loc_FFC9069C\n"
+"loc_FFC90670:\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #1\n"
+"       STR     R3, [SP]\n"
+"       BL      sub_FFC8CE4C\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #1\n"
+"       STR     R3, [SP]\n"
+"loc_FFC9069C:\n"
+"       BL      sub_FFC8CF8C\n"
+"loc_FFC906A0:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC9131C\n"
+"       B       loc_FFC900D8\n"
+        );
+}
+
+
+void __attribute__((naked,noinline)) sub_FFC8DB9C_my()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R8,LR}\n"
+"       LDR     R7, =0x64D4\n"
+"       MOV     R4, R0\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x3E\n"
+"       BL      sub_FFC173EC\n"
+"       LDRSH   R0, [R4,#4]\n"
+"       MOV     R2, #0\n"
+"       MOV     R1, #0\n"
+"       BL      sub_FFC8CBE0\n"
+"       MOV     R6, R0\n"
+"       LDRSH   R0, [R4,#6]\n"
+"       BL      sub_FFC8CCEC\n"
+"       LDRSH   R0, [R4,#8]\n"
+"       BL      sub_FFC8CD44\n"
+"       LDRSH   R0, [R4,#0xA]\n"
+"       BL      sub_FFC8CD9C\n"
+"       LDRSH   R0, [R4,#0xC]\n"
+"       BL      sub_FFC8CDF4\n"
+"       MOV     R5, R0\n"
+"       LDR     R0, [R4]\n"
+"       LDR     R8, =0x3D3F4\n"
+"       CMP     R0, #0xB\n"
+"       MOVEQ   R6, #0\n"
+"       MOVEQ   R5, #0\n"
+"       BEQ     loc_FFC8DC2C\n"
+"       CMP     R6, #1\n"
+"       BNE     loc_FFC8DC2C\n"
+"       LDRSH   R0, [R4,#4]\n"
+"       LDR     R1, =0xFFC8CB4C\n"
+"       MOV     R2, #2\n"
+"       BL      sub_FFD03134\n"
+"       STRH    R0, [R4,#4]\n"
+"       MOV     R0, #0\n"
+"       STR     R0, [R7,#0x28]\n"
+"       B       loc_FFC8DC34\n"
+"loc_FFC8DC2C:\n"
+"       LDRH    R0, [R8]\n"
+"       STRH    R0, [R4,#4]\n"
+"loc_FFC8DC34:\n"
+"       CMP     R5, #1\n"
+"       LDRNEH  R0, [R8,#8]\n"
+"       BNE     loc_FFC8DC50\n"
+"       LDRSH   R0, [R4,#0xC]\n"
+"       MOV     R2, #0x20\n"
+"       LDR     R1, =0xFFC8CBD0\n"
+"       BL      sub_FFC9134C\n"
+"loc_FFC8DC50:\n"
+"       STRH    R0, [R4,#0xC]\n"
+"       LDRSH   R0, [R4,#6]\n"
+"       BL      sub_FFC6FC5C_my\n" // ->
+"       LDR     PC, =0xFFC8DC5C\n" // + continue in ROM
+/* removed to spare some bytes -
+"       LDRSH   R0, [R4,#8]\n"
+"       MOV     R1, #1\n"
+"       BL      sub_FFC70458\n"
+"       MOV     R1, #0\n"
+"       ADD     R0, R4, #8\n"
+"       BL      sub_FFC704E0\n"
+"       LDRSH   R0, [R4,#0xE]\n"
+"       BL      sub_FFC83B1C\n"
+"       LDR     R4, =0xBB8\n"
+"       CMP     R6, #1\n"
+"       BNE     loc_FFC8DCA8\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #2\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0x532\n"
+"       LDRNE   R0, =0xffc8d25c\n" // "ExpDrv.c"
+"       BLNE    sub_FFC0BDB8\n"
+"loc_FFC8DCA8:\n"
+"       CMP     R5, #1\n"
+"       LDMNEFD SP!, {R4-R8,PC}\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #0x20\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0x537\n"
+"       LDRNE   R0, =0xffc8d25c\n" // "ExpDrv.c"
+"       LDMNEFD SP!, {R4-R8,LR}\n"
+"       BNE     sub_FFC0BDB8\n"
+"       LDMFD   SP!, {R4-R8,PC}\n"
+*/
+        );
+}
+
+
+void __attribute__((naked,noinline)) sub_FFC6FC5C_my()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R6,LR}\n"
+"       LDR     R5, =0x5FAC\n"
+"       MOV     R4, R0\n"
+"       LDR     R0, [R5,#4]\n"
+"       CMP     R0, #1\n"
+"       LDRNE   R1, =0x16D\n"
+"       LDRNE   R0, =0xffc6f9f4\n" // "Shutter.c"
+"       BLNE    sub_FFC0BDB8\n"
+"       CMN     R4, #0xC00\n"
+"       LDREQSH R4, [R5,#2]\n"
+"       CMN     R4, #0xC00\n"
+"       LDREQ   R1, =0x173\n"
+"       LDREQ   R0, =0xffc6f9f4\n" // "Shutter.c"
+"       STRH    R4, [R5,#2]\n"
+"       BLEQ    sub_FFC0BDB8\n"
+"       MOV     R0, R4\n"
+//"       BL      sub_FFD68398\n" //-
+"       BL      apex2us\n" //+
+"       MOV     R4, R0\n"
+//"       BL      nullsub\n" //-
+//"       MOV     R0, R4\n" //-
+"       BL      sub_FFCA25DC\n"
+"       TST     R0, #1\n"
+"       LDMNEFD SP!, {R4-R6,LR}\n"
+"       MOVNE   R1, #0x178\n"
+"       LDRNE   R0, =0xffc6f9f4\n" // "Shutter.c"
+"       BNE     sub_FFC0BDB8\n"
+"       LDMFD   SP!, {R4-R6,PC}\n"
+        );
+}

branches/release-1_0/platform/a470/sub/100e/stubs_auto.S

@@ -49 +49 @@
 STUB(FFC16FB8)
 STUB(FFC17054)
+STUB(FFC172F0)
 STUB(FFC173B8)
 STUB(FFC173EC)
@@ -282 +283 @@
 STUB(FFC65D14)
 STUB(FFC66248)
+STUB(FFC6FC5C)
+STUB(FFC6FF10)
+STUB(FFC70458)
+STUB(FFC704E0)
+STUB(FFC70760)
+STUB(FFC70CDC)
+STUB(FFC83B1C)
+STUB(FFC8CBE0)
+STUB(FFC8CCEC)
+STUB(FFC8CD44)
+STUB(FFC8CD9C)
+STUB(FFC8CDF4)
+STUB(FFC8CE4C)
+STUB(FFC8CF8C)
+STUB(FFC8D044)
+STUB(FFC8D2D4)
+STUB(FFC8D4D8)
+STUB(FFC8D740)
+STUB(FFC8D934)
+STUB(FFC8DB9C)
+STUB(FFC8DCD8)
+STUB(FFC8DF4C)
+STUB(FFC8E174)
+STUB(FFC8E464)
+STUB(FFC8E568)
+STUB(FFC8E7A0)
+STUB(FFC8E918)
+STUB(FFC8EAB0)
+STUB(FFC8EBE8)
+STUB(FFC8EE30)
+STUB(FFC8FDB4)
+STUB(FFC90008)
+STUB(FFC90068)
+STUB(FFC9131C)
+STUB(FFC9134C)
+STUB(FFC91390)
+STUB(FFC91510)
+STUB(FFC915BC)
+STUB(FFC9165C)
+STUB(FFC916F4)
 STUB(FFC94698)
 STUB(FFCA1258)
+STUB(FFCA25DC)
 STUB(FFCC7D84)
 STUB(FFCC7E48)
@@ -292 +334 @@
 STUB(FFCE9634)
 STUB(FFCF8D9C)
+STUB(FFD02FE0)
+STUB(FFD03134)
+STUB(FFD03268)
 STUB(FFD06BDC)
 STUB(FFD07C28)
@@ -377 +422 @@
 STUB(FFD66E5C)
 STUB(FFD66ECC)
+STUB(FFD68398)
+STUB(FFE4E008)
 STUB(FFE4E264)
 STUB(FFE4FB14)

branches/release-1_0/platform/a470/sub/100e/stubs_entry.S

@@ -30 +30 @@
 //DEF(physw_run                               ,0x00001bf0) // Found @0xffc118a8,          stubs_min = 0x00001bf0 (0x1BF0)
 //DEF(levent_table                            ,0xffe72ec8) // Found @0xffe72ec8,          stubs_min = 0xffe72ec8 (0xFFE72EC8)
-//DEF(FlashParamsTable                        ,0xffe8fc68) // Found @0xffe8fc68, ** != ** stubs_min = 0xffe961cc (0xFFE961CC)
+//DEF(FlashParamsTable                        ,0xffe8fc68) // Found @0xffe8fc68,          stubs_min = 0xffe8fc68 (0xffe8fc68)
 //DEF(movie_status                            ,0x000051d8) // Found @0xffc45174, ** != ** stubs_min = 0x00005200 (0x5200)
 //DEF(canon_menu_active                       ,0x00009014) // Found @0xffd1eec4,          stubs_min = 0x00009014 (0x9014)

branches/release-1_0/platform/a470/sub/100e/stubs_min.S

@@ -3 +3 @@
 DEF(physw_status, 0x1007C) //Found for A470 (GPIOStatus)
 DEF(physw_run, 0x1BF0) //Found for A470 in task_PhySw, same as A590
-DEF(FlashParamsTable,  0xFFE961CC) // via GetReservedClusters_Fut_9
+DEF(FlashParamsTable,  0xffe8fc68) // 100e ok
 DEF(zoom_busy, 0x8050)  //0x803c+14 same as in a590
 DEF(focus_busy, 0x82B0) // 0x82A8+0x08 found in sub_FFD02310

branches/release-1_0/platform/a470/sub/101b/boot.c

@@ -14 +14 @@
 
 void boot();
+
+void taskCreateHook(int *p) { //function taken from the ixus80 port, adapted of course
+ p-=16;
+ if (p[0]==0xffc900b8)  p[0]=(int)exp_drv_task; //101b ok
+} 
 
 //All strings changed, now to change subroutines
@@ -40 +45 @@
     for(i=0;i<canon_bss_len/4;i++)
         canon_bss_start[i]=0;
+
+    *(int*)0x1930=(int)taskCreateHook; //from ixus80 port
+    *(int*)0x1934=(int)taskCreateHook; //from ixus80 port (was taskCreateHook2...)
 
 /*    asm volatile (

branches/release-1_0/platform/a470/sub/101b/capt_seq.c

@@ -3 +3 @@
 #include "core.h"
 
-static long *nrflag = (long*)0x9F90;
+static long *nrflag = (long*)0x8888; //in sub_ffd0cae8
 
 #include "../../../generic/capt_seq.c"
@@ -67 +67 @@
                                 "LDR     R0, [SP]\n" //+
                 "LDR     R1, [R0]\n"
-                                
-                "LDR     R2, =0x1850\n"         // DEBUG: Save jumptable-target ...
-                "STR     R1, [R2]\n"            // ...to some unused space. Read and displayed in GUI in core/gui.c
                                 
                 "CMP     R1, #0x19\n"
@@ -279 +276 @@
     );
 } //#fe
+
+
+void __attribute__((naked,noinline)) exp_drv_task()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R8,LR}\n"
+"       SUB     SP, SP, #0x20\n"
+"       LDR     R8, =0xBB8\n"
+"       LDR     R7, =0x64D4\n"
+"       LDR     R5, =0x3D3DC\n"
+"       MOV     R0, #0\n"
+"       ADD     R6, SP, #0x10\n"
+"       STR     R0, [SP,#0xC]\n"
+"loc_FFC900D8:\n"
+"       LDR     R0, [R7,#0x20]\n"
+"       MOV     R2, #0\n"
+"       ADD     R1, SP, #0x1C\n"
+"       BL      sub_FFC1763C\n"
+"       LDR     R0, [SP,#0xC]\n"
+"       CMP     R0, #1\n"
+"       BNE     loc_FFC90120\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R0, [R0]\n"
+"       CMP     R0, #0x13\n"
+"       CMPNE   R0, #0x14\n"
+"       CMPNE   R0, #0x15\n"
+"       BEQ     loc_FFC9023C\n"
+"       CMP     R0, #0x27\n"
+"       BEQ     loc_FFC90214\n"
+"       ADD     R1, SP, #0xC\n"
+"       MOV     R0, #0\n"
+"       BL      sub_FFC90068\n"
+"loc_FFC90120:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x2C\n"
+"       BNE     loc_FFC90150\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC9131C\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #1\n"
+"       BL      sub_FFC173B8\n"
+"       BL      sub_FFC0BB70\n"
+"       ADD     SP, SP, #0x20\n"
+"       LDMFD   SP!, {R4-R8,PC}\n"
+"loc_FFC90150:\n"
+"       CMP     R1, #0x2B\n"
+"       BNE     loc_FFC9016C\n"
+"       LDR     R2, [R0,#0x88]!\n"
+"       LDR     R1, [R0,#4]\n"
+"       MOV     R0, R1\n"
+"       BLX     R2\n"
+"       B       loc_FFC906A0\n"
+"loc_FFC9016C:\n"
+"       CMP     R1, #0x25\n"
+"       BNE     loc_FFC901BC\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFC173EC\n"
+"       LDR     R0, =0xFFC8CB5C\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFD02FE0\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R8\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0xD1B\n"
+"       BNE     loc_FFC90200\n"
+"loc_FFC901A8:\n"
+"       LDR     R1, [SP,#0x1C]\n"
+"       LDR     R0, [R1,#0x8C]\n"
+"       LDR     R1, [R1,#0x88]\n"
+"       BLX     R1\n"
+"       B       loc_FFC906A0\n"
+"loc_FFC901BC:\n"
+"       CMP     R1, #0x26\n"
+"       BNE     loc_FFC9020C\n"
+"       ADD     R1, SP, #0xC\n"
+"       BL      sub_FFC90068\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFC173EC\n"
+"       LDR     R0, =0xFFC8CB6C\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFD03268\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R8\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       BEQ     loc_FFC901A8\n"
+"       LDR     R1, =0xD25\n"
+"loc_FFC90200:\n"
+"       LDR     R0, =0xFFC8D25C\n"
+"       BL      sub_FFC0BDB8\n"
+"       B       loc_FFC901A8\n"
+"loc_FFC9020C:\n"
+"       CMP     R1, #0x27\n"
+"       BNE     loc_FFC90224\n"
+"loc_FFC90214:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       ADD     R1, SP, #0xC\n"
+"       BL      sub_FFC90068\n"
+"       B       loc_FFC901A8\n"
+"loc_FFC90224:\n"
+"       CMP     R1, #0x2A\n"
+"       BNE     loc_FFC9023C\n"
+"       BL      sub_FFC6FF10\n"
+"       BL      sub_FFC70CDC\n"
+"       BL      sub_FFC70760\n"
+"       B       loc_FFC901A8\n"
+"loc_FFC9023C:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R4, #1\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x11\n"
+"       CMPNE   R1, #0x12\n"
+"       BNE     loc_FFC902AC\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R1, R0, R1,LSL#2\n"
+"       SUB     R1, R1, #8\n"
+"       LDMIA   R1, {R2-R4}\n"
+"       STMIA   R6, {R2-R4}\n"
+"       BL      sub_FFC8EBE8\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC916F4\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x90]\n"
+"       LDR     R2, [R0,#0x94]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       B       loc_FFC905E0\n"
+"loc_FFC902AC:\n"
+"       CMP     R1, #0x13\n"
+"       CMPNE   R1, #0x14\n"
+"       CMPNE   R1, #0x15\n"
+"       BNE     loc_FFC90360\n"
+"       ADD     R3, SP, #0xC\n"
+"       MOV     R2, SP\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFC8EE30\n"
+"       CMP     R0, #1\n"
+"       MOV     R4, R0\n"
+"       CMPNE   R4, #5\n"
+"       BNE     loc_FFC902FC\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       LDR     R1, [R0,#0x7C]!\n"
+"       LDR     R12, [R0,#0xC]!\n"
+"       LDR     R3, [R0,#4]\n"
+"       MOV     R0, SP\n"
+"       BLX     R12\n"
+"       B       loc_FFC90334\n"
+"loc_FFC902FC:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       CMP     R4, #2\n"
+"       LDR     R3, [R0,#0x8C]\n"
+"       CMPNE   R4, #6\n"
+"       BNE     loc_FFC90348\n"
+"       LDR     R12, [R0,#0x88]\n"
+"       MOV     R0, SP\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #1\n"
+"       BLX     R12\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, SP\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFC8FDB4\n"
+"loc_FFC90334:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R2, [SP,#0xC]\n"
+"       MOV     R1, R4\n"
+"       BL      sub_FFC90008\n"
+"       B       loc_FFC905E0\n"
+"loc_FFC90348:\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R12, [R0,#0x88]\n"
+"       ADD     R0, R0, #4\n"
+"       MOV     R2, R4\n"
+"       BLX     R12\n"
+"       B       loc_FFC905E0\n"
+"loc_FFC90360:\n"
+"       CMP     R1, #0x21\n"
+"       CMPNE   R1, #0x22\n"
+"       BNE     loc_FFC903AC\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R1, R0, R1,LSL#2\n"
+"       SUB     R1, R1, #8\n"
+"       LDMIA   R1, {R2-R4}\n"
+"       STMIA   R6, {R2-R4}\n"
+"       BL      sub_FFC8E174\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC8E464\n"
+"       B       loc_FFC905E0\n"
+"loc_FFC903AC:\n"
+"       ADD     R1, R0, #4\n"
+"       LDMIA   R1, {R2,R3,R12}\n"
+"       STMIA   R6, {R2,R3,R12}\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x24\n"
+"       ADDLS   PC, PC, R1,LSL#2\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC903C8:\n"
+"       B       loc_FFC9045C\n"
+"loc_FFC903CC:\n"
+"       B       loc_FFC9045C\n"
+"loc_FFC903D0:\n"
+"       B       loc_FFC90464\n"
+"loc_FFC903D4:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903D8:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903DC:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903E0:\n"
+"       B       loc_FFC9045C\n"
+"loc_FFC903E4:\n"
+"       B       loc_FFC90464\n"
+"loc_FFC903E8:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903EC:\n"
+"       B       loc_FFC9046C\n"
+"loc_FFC903F0:\n"
+"       B       loc_FFC904C8\n"
+"loc_FFC903F4:\n"
+"       B       loc_FFC904C8\n"
+"loc_FFC903F8:\n"
+"       B       loc_FFC905B4\n"
+"loc_FFC903FC:\n"
+"       B       loc_FFC905BC\n"
+"loc_FFC90400:\n"
+"       B       loc_FFC905BC\n"
+"loc_FFC90404:\n"
+"       B       loc_FFC905BC\n"
+"loc_FFC90408:\n"
+"       B       loc_FFC905BC\n"
+"loc_FFC9040C:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90410:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90414:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90418:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9041C:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90420:\n"
+"       B       loc_FFC90474\n"
+"loc_FFC90424:\n"
+"       B       loc_FFC9047C\n"
+"loc_FFC90428:\n"
+"       B       loc_FFC9047C\n"
+"loc_FFC9042C:\n"
+"       B       loc_FFC904D4\n"
+"loc_FFC90430:\n"
+"       B       loc_FFC904D4\n"
+"loc_FFC90434:\n"
+"       B       loc_FFC904DC\n"
+"loc_FFC90438:\n"
+"       B       loc_FFC9050C\n"
+"loc_FFC9043C:\n"
+"       B       loc_FFC9053C\n"
+"loc_FFC90440:\n"
+"       B       loc_FFC9056C\n"
+"loc_FFC90444:\n"
+"       B       loc_FFC9059C\n"
+"loc_FFC90448:\n"
+"       B       loc_FFC9059C\n"
+"loc_FFC9044C:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90450:\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90454:\n"
+"       B       loc_FFC905A4\n"
+"loc_FFC90458:\n"
+"       B       loc_FFC905AC\n"
+"loc_FFC9045C:\n"
+"       BL      sub_FFC8D044\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90464:\n"
+"       BL      sub_FFC8D2D4\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9046C:\n"
+"       BL      sub_FFC8D4D8\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC90474:\n"
+"       BL      sub_FFC8D740\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9047C:\n"
+"       BL      sub_FFC8D934\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC904C8:\n"
+"       BL      sub_FFC8DB9C_my\n" // ->
+"       MOV     R4, #0\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC904D4:\n"
+"       BL      sub_FFC8DCD8\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC904DC:\n"
+"       LDRH    R1, [R0,#4]\n"
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R0,#0xC]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC91390\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9050C:\n"
+"       LDRH    R1, [R0,#4]\n"
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R5,#8]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC91510\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9053C:\n"
+"       LDRH    R1, [R5]\n"
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R0,#6]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R5,#8]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC915BC\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9056C:\n"
+"       LDRH    R1, [R5]\n"
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R0,#0xC]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC9165C\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC9059C:\n"
+"       BL      sub_FFC8DF4C\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC905A4:\n"
+"       BL      sub_FFC8E568\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC905AC:\n"
+"       BL      sub_FFC8E7A0\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC905B4:\n"
+"       BL      sub_FFC8E918\n"
+"       B       loc_FFC905C0\n"
+"loc_FFC905BC:\n"
+"       BL      sub_FFC8EAB0\n"
+"loc_FFC905C0:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       CMP     R4, #1\n"
+"       BNE     loc_FFC90628\n"
+"loc_FFC905E0:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, #0xC\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R0, R0, R1,LSL#2\n"
+"       SUB     R4, R0, #8\n"
+"       LDR     R0, =0x3D3DC\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFE4E004\n"
+"       LDR     R0, =0x3D3E8\n"
+"       MOV     R2, #0xC\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFE4E004\n"
+"       LDR     R0, =0x3D3F4\n"
+"       MOV     R2, #0xC\n"
+"       MOV     R1, R4\n"
+"       BL      sub_FFE4E004\n"
+"       B       loc_FFC906A0\n"
+"loc_FFC90628:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R0, [R0]\n"
+"       CMP     R0, #0xB\n"
+"       BNE     loc_FFC90670\n"
+"       MOV     R3, #0\n"
+"       STR     R3, [SP]\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #0\n"
+"       BL      sub_FFC8CE4C\n"
+"       MOV     R3, #0\n"
+"       STR     R3, [SP]\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #0\n"
+"       B       loc_FFC9069C\n"
+"loc_FFC90670:\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #1\n"
+"       STR     R3, [SP]\n"
+"       BL      sub_FFC8CE4C\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #1\n"
+"       STR     R3, [SP]\n"
+"loc_FFC9069C:\n"
+"       BL      sub_FFC8CF8C\n"
+"loc_FFC906A0:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC9131C\n"
+"       B       loc_FFC900D8\n"
+        );
+}
+
+
+void __attribute__((naked,noinline)) sub_FFC8DB9C_my()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R8,LR}\n"
+"       LDR     R7, =0x64D4\n"
+"       MOV     R4, R0\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x3E\n"
+"       BL      sub_FFC173EC\n"
+"       LDRSH   R0, [R4,#4]\n"
+"       MOV     R2, #0\n"
+"       MOV     R1, #0\n"
+"       BL      sub_FFC8CBE0\n"
+"       MOV     R6, R0\n"
+"       LDRSH   R0, [R4,#6]\n"
+"       BL      sub_FFC8CCEC\n"
+"       LDRSH   R0, [R4,#8]\n"
+"       BL      sub_FFC8CD44\n"
+"       LDRSH   R0, [R4,#0xA]\n"
+"       BL      sub_FFC8CD9C\n"
+"       LDRSH   R0, [R4,#0xC]\n"
+"       BL      sub_FFC8CDF4\n"
+"       MOV     R5, R0\n"
+"       LDR     R0, [R4]\n"
+"       LDR     R8, =0x3D3F4\n"
+"       CMP     R0, #0xB\n"
+"       MOVEQ   R6, #0\n"
+"       MOVEQ   R5, #0\n"
+"       BEQ     loc_FFC8DC2C\n"
+"       CMP     R6, #1\n"
+"       BNE     loc_FFC8DC2C\n"
+"       LDRSH   R0, [R4,#4]\n"
+"       LDR     R1, =0xFFC8CB4C\n"
+"       MOV     R2, #2\n"
+"       BL      sub_FFD03134\n"
+"       STRH    R0, [R4,#4]\n"
+"       MOV     R0, #0\n"
+"       STR     R0, [R7,#0x28]\n"
+"       B       loc_FFC8DC34\n"
+"loc_FFC8DC2C:\n"
+"       LDRH    R0, [R8]\n"
+"       STRH    R0, [R4,#4]\n"
+"loc_FFC8DC34:\n"
+"       CMP     R5, #1\n"
+"       LDRNEH  R0, [R8,#8]\n"
+"       BNE     loc_FFC8DC50\n"
+"       LDRSH   R0, [R4,#0xC]\n"
+"       MOV     R2, #0x20\n"
+"       LDR     R1, =0xFFC8CBD0\n"
+"       BL      sub_FFC9134C\n"
+"loc_FFC8DC50:\n"
+"       STRH    R0, [R4,#0xC]\n"
+"       LDRSH   R0, [R4,#6]\n"
+"       BL      sub_FFC6FC5C_my\n" // ->
+"       LDR     PC, =0xFFC8DC5C\n" // + continue in ROM
+/* removed to spare some bytes -
+"       LDRSH   R0, [R4,#8]\n"
+"       MOV     R1, #1\n"
+"       BL      sub_FFC70458\n"
+"       MOV     R1, #0\n"
+"       ADD     R0, R4, #8\n"
+"       BL      sub_FFC704E0\n"
+"       LDRSH   R0, [R4,#0xE]\n"
+"       BL      sub_FFC83B1C\n"
+"       LDR     R4, =0xBB8\n"
+"       CMP     R6, #1\n"
+"       BNE     loc_FFC8DCA8\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #2\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0x532\n"
+"       LDRNE   R0, =0xffc8d25c\n" // "ExpDrv.c"
+"       BLNE    sub_FFC0BDB8\n"
+"loc_FFC8DCA8:\n"
+"       CMP     R5, #1\n"
+"       LDMNEFD SP!, {R4-R8,PC}\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #0x20\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0x537\n"
+"       LDRNE   R0, =0xffc8d25c\n" // "ExpDrv.c"
+"       LDMNEFD SP!, {R4-R8,LR}\n"
+"       BNE     sub_FFC0BDB8\n"
+"       LDMFD   SP!, {R4-R8,PC}\n"
+*/
+        );
+}
+
+
+void __attribute__((naked,noinline)) sub_FFC6FC5C_my()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R6,LR}\n"
+"       LDR     R5, =0x5FAC\n"
+"       MOV     R4, R0\n"
+"       LDR     R0, [R5,#4]\n"
+"       CMP     R0, #1\n"
+"       LDRNE   R1, =0x16D\n"
+"       LDRNE   R0, =0xFFC6F9F4\n"
+"       BLNE    sub_FFC0BDB8\n"
+"       CMN     R4, #0xC00\n"
+"       LDREQSH R4, [R5,#2]\n"
+"       CMN     R4, #0xC00\n"
+"       LDREQ   R1, =0x173\n"
+"       LDREQ   R0, =0xFFC6F9F4\n"
+"       STRH    R4, [R5,#2]\n"
+"       BLEQ    sub_FFC0BDB8\n"
+"       MOV     R0, R4\n"
+//"       BL      sub_FFD68398\n" //-
+"       BL      apex2us\n" //+
+"       MOV     R4, R0\n"
+//"       BL      nullsub\n"
+//"       MOV     R0, R4\n"
+"       BL      sub_FFCA25DC\n"
+"       TST     R0, #1\n"
+"       LDMNEFD SP!, {R4-R6,LR}\n"
+"       MOVNE   R1, #0x178\n"
+"       LDRNE   R0, =0xFFC6F9F4\n"
+"       BNE     sub_FFC0BDB8\n"
+"       LDMFD   SP!, {R4-R6,PC}\n"
+        );
+}

branches/release-1_0/platform/a470/sub/101b/stubs_auto.S

@@ -49 +49 @@
 STUB(FFC16FB8)
 STUB(FFC17054)
+STUB(FFC172F0)
 STUB(FFC173B8)
 STUB(FFC173EC)
@@ -282 +283 @@
 STUB(FFC65D14)
 STUB(FFC66248)
+STUB(FFC6FC5C)
+STUB(FFC6FF10)
+STUB(FFC70458)
+STUB(FFC704E0)
+STUB(FFC70760)
+STUB(FFC70CDC)
+STUB(FFC83B1C)
+STUB(FFC8CBE0)
+STUB(FFC8CCEC)
+STUB(FFC8CD44)
+STUB(FFC8CD9C)
+STUB(FFC8CDF4)
+STUB(FFC8CE4C)
+STUB(FFC8CF8C)
+STUB(FFC8D044)
+STUB(FFC8D2D4)
+STUB(FFC8D4D8)
+STUB(FFC8D740)
+STUB(FFC8D934)
+STUB(FFC8DB9C)
+STUB(FFC8DCD8)
+STUB(FFC8DF4C)
+STUB(FFC8E174)
+STUB(FFC8E464)
+STUB(FFC8E568)
+STUB(FFC8E7A0)
+STUB(FFC8E918)
+STUB(FFC8EAB0)
+STUB(FFC8EBE8)
+STUB(FFC8EE30)
+STUB(FFC8FDB4)
+STUB(FFC90008)
+STUB(FFC90068)
+STUB(FFC9131C)
+STUB(FFC9134C)
+STUB(FFC91390)
+STUB(FFC91510)
+STUB(FFC915BC)
+STUB(FFC9165C)
+STUB(FFC916F4)
 STUB(FFC94698)
 STUB(FFCA1258)
+STUB(FFCA25DC)
 STUB(FFCC7D84)
 STUB(FFCC7E48)
@@ -292 +334 @@
 STUB(FFCE9634)
 STUB(FFCF8D9C)
+STUB(FFD02FE0)
+STUB(FFD03134)
+STUB(FFD03268)
 STUB(FFD06BDC)
 STUB(FFD07C28)
@@ -377 +422 @@
 STUB(FFD66E5C)
 STUB(FFD66ECC)
+STUB(FFD68398)
+STUB(FFE4E004)
 STUB(FFE4E260)
 STUB(FFE4FB10)

branches/release-1_0/platform/a470/sub/101b/stubs_entry.S

@@ -30 +30 @@
 //DEF(physw_run                               ,0x00001bf0) // Found @0xffc118a8,          stubs_min = 0x00001bf0 (0x1BF0)
 //DEF(levent_table                            ,0xffe72ec4) // Found @0xffe72ec4,          stubs_min = 0xffe72ec4 (0xFFE72EC4)
-//DEF(FlashParamsTable                        ,0xffe8fc64) // Found @0xffe8fc64, ** != ** stubs_min = 0xffe961cc (0xFFE961CC)
+//DEF(FlashParamsTable                        ,0xffe8fc64) // Found @0xffe8fc64,          stubs_min = 0xffe8fc64 (0xffe8fc64)
 //DEF(movie_status                            ,0x000051d8) // Found @0xffc45174, ** != ** stubs_min = 0x00005200 (0x5200)
 //DEF(canon_menu_active                       ,0x00009014) // Found @0xffd1eec4,          stubs_min = 0x00009014 (0x9014)

branches/release-1_0/platform/a470/sub/101b/stubs_min.S

@@ -3 +3 @@
 DEF(physw_status, 0x1007C) //Found for A470 (GPIOStatus)
 DEF(physw_run, 0x1BF0) //Found for A470 in task_PhySw, same as A590
-DEF(FlashParamsTable,  0xFFE961CC) // via GetReservedClusters_Fut_9
+DEF(FlashParamsTable,  0xffe8fc64) // 101b ok
 DEF(zoom_busy, 0x8050)  //0x803c+14 same as in a590
 DEF(focus_busy, 0x82B0) // 0x82A8+0x08 found in sub_FFD02310

branches/release-1_0/platform/a470/sub/102c/boot.c

@@ -14 +14 @@
 
 void boot();
+
+void taskCreateHook(int *p) { //function taken from the ixus80 port, adapted of course
+ p-=16;
+ if (p[0]==0xffc905d4)  p[0]=(int)exp_drv_task;
+} 
 
 //All strings changed, now to change subroutines
@@ -40 +45 @@
     for(i=0;i<canon_bss_len/4;i++)
         canon_bss_start[i]=0;
+
+    *(int*)0x1930=(int)taskCreateHook; //from ixus80 port
+    *(int*)0x1934=(int)taskCreateHook; //from ixus80 port (was taskCreateHook2...)
 
 /*    asm volatile (

branches/release-1_0/platform/a470/sub/102c/capt_seq.c

@@ -3 +3 @@
 #include "core.h"
 
-static long *nrflag = (long*)0x9F90;
+static long *nrflag = (long*)0x88d8; //found in sub_ffd0d528
 
 #include "../../../generic/capt_seq.c"
@@ -69 +69 @@
                 "LDR     R1, [R0]\n"
 
-                "LDR     R2, =0x1850\n"         // DEBUG: Save jumptable-target ...
-                "STR     R1, [R2]\n"            // ...to some unused space. Read and displayed in GUI in core/gui.c
-
                 "CMP     R1, #0x19\n"
                 "ADDLS   PC, PC, R1,LSL#2\n"
@@ -255 +252 @@
     );
 } //#fe
+
+
+void __attribute__((naked,noinline)) exp_drv_task()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R8,LR}\n"
+"       SUB     SP, SP, #0x20\n"
+"       LDR     R8, =0xBB8\n"
+"       LDR     R7, =0x64FC\n"
+"       LDR     R5, =0x3D41C\n"
+"       MOV     R0, #0\n"
+"       ADD     R6, SP, #0x10\n"
+"       STR     R0, [SP,#0xC]\n"
+"loc_FFC905F4:\n"
+"       LDR     R0, [R7,#0x20]\n"
+"       MOV     R2, #0\n"
+"       ADD     R1, SP, #0x1C\n"
+"       BL      sub_FFC1763C\n"
+"       LDR     R0, [SP,#0xC]\n"
+"       CMP     R0, #1\n"
+"       BNE     loc_FFC9063C\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R0, [R0]\n"
+"       CMP     R0, #0x13\n"
+"       CMPNE   R0, #0x14\n"
+"       CMPNE   R0, #0x15\n"
+"       BEQ     loc_FFC90758\n"
+"       CMP     R0, #0x27\n"
+"       BEQ     loc_FFC90730\n"
+"       ADD     R1, SP, #0xC\n"
+"       MOV     R0, #0\n"
+"       BL      sub_FFC90584\n"
+"loc_FFC9063C:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x2C\n"
+"       BNE     loc_FFC9066C\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC91838\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #1\n"
+"       BL      sub_FFC173B8\n"
+"       BL      sub_FFC0BB70\n"
+"       ADD     SP, SP, #0x20\n"
+"       LDMFD   SP!, {R4-R8,PC}\n"
+"loc_FFC9066C:\n"
+"       CMP     R1, #0x2B\n"
+"       BNE     loc_FFC90688\n"
+"       LDR     R2, [R0,#0x88]!\n"
+"       LDR     R1, [R0,#4]\n"
+"       MOV     R0, R1\n"
+"       BLX     R2\n"
+"       B       loc_FFC90BBC\n"
+"loc_FFC90688:\n"
+"       CMP     R1, #0x25\n"
+"       BNE     loc_FFC906D8\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFC173EC\n"
+"       LDR     R0, =0xFFC8D078\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFD03A20\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R8\n"
+"       MOV     R1, #0x80\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0xD1B\n"
+"       BNE     loc_FFC9071C\n"
+"loc_FFC906C4:\n"
+"       LDR     R1, [SP,#0x1C]\n"
+"       LDR     R0, [R1,#0x8C]\n"
+"       LDR     R1, [R1,#0x88]\n"
+"       BLX     R1\n"
+"       B       loc_FFC90BBC\n"
+"loc_FFC906D8:\n"
+"       CMP     R1, #0x26\n"
+"       BNE     loc_FFC90728\n"
+"       ADD     R1, SP, #0xC\n"
+"       BL      sub_FFC90584\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFC173EC\n"
+"       LDR     R0, =0xFFC8D088\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFD03CA8\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R8\n"
+"       MOV     R1, #0x100\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       BEQ     loc_FFC906C4\n"
+"       LDR     R1, =0xD25\n"
+"loc_FFC9071C:\n"
+"       LDR     R0, =0xffc8d778\n" // "ExpDrv.c"
+"       BL      sub_FFC0BDB8\n"
+"       B       loc_FFC906C4\n"
+"loc_FFC90728:\n"
+"       CMP     R1, #0x27\n"
+"       BNE     loc_FFC90740\n"
+"loc_FFC90730:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       ADD     R1, SP, #0xC\n"
+"       BL      sub_FFC90584\n"
+"       B       loc_FFC906C4\n"
+"loc_FFC90740:\n"
+"       CMP     R1, #0x2A\n"
+"       BNE     loc_FFC90758\n"
+"       BL      sub_FFC7042C\n"
+"       BL      sub_FFC711F8\n"
+"       BL      sub_FFC70C7C\n"
+"       B       loc_FFC906C4\n"
+"loc_FFC90758:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R4, #1\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x11\n"
+"       CMPNE   R1, #0x12\n"
+"       BNE     loc_FFC907C8\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R1, R0, R1,LSL#2\n"
+"       SUB     R1, R1, #8\n"
+"       LDMIA   R1, {R2-R4}\n"
+"       STMIA   R6, {R2-R4}\n"
+"       BL      sub_FFC8F104\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC91C10\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x90]\n"
+"       LDR     R2, [R0,#0x94]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       B       loc_FFC90AFC\n"
+"loc_FFC907C8:\n"
+"       CMP     R1, #0x13\n"
+"       CMPNE   R1, #0x14\n"
+"       CMPNE   R1, #0x15\n"
+"       BNE     loc_FFC9087C\n"
+"       ADD     R3, SP, #0xC\n"
+"       MOV     R2, SP\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFC8F34C\n"
+"       CMP     R0, #1\n"
+"       MOV     R4, R0\n"
+"       CMPNE   R4, #5\n"
+"       BNE     loc_FFC90818\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       LDR     R1, [R0,#0x7C]!\n"
+"       LDR     R12, [R0,#0xC]!\n"
+"       LDR     R3, [R0,#4]\n"
+"       MOV     R0, SP\n"
+"       BLX     R12\n"
+"       B       loc_FFC90850\n"
+"loc_FFC90818:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       CMP     R4, #2\n"
+"       LDR     R3, [R0,#0x8C]\n"
+"       CMPNE   R4, #6\n"
+"       BNE     loc_FFC90864\n"
+"       LDR     R12, [R0,#0x88]\n"
+"       MOV     R0, SP\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #1\n"
+"       BLX     R12\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, SP\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFC902D0\n"
+"loc_FFC90850:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R2, [SP,#0xC]\n"
+"       MOV     R1, R4\n"
+"       BL      sub_FFC90524\n"
+"       B       loc_FFC90AFC\n"
+"loc_FFC90864:\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R12, [R0,#0x88]\n"
+"       ADD     R0, R0, #4\n"
+"       MOV     R2, R4\n"
+"       BLX     R12\n"
+"       B       loc_FFC90AFC\n"
+"loc_FFC9087C:\n"
+"       CMP     R1, #0x21\n"
+"       CMPNE   R1, #0x22\n"
+"       BNE     loc_FFC908C8\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R1, R0, R1,LSL#2\n"
+"       SUB     R1, R1, #8\n"
+"       LDMIA   R1, {R2-R4}\n"
+"       STMIA   R6, {R2-R4}\n"
+"       BL      sub_FFC8E690\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC8E980\n"
+"       B       loc_FFC90AFC\n"
+"loc_FFC908C8:\n"
+"       ADD     R1, R0, #4\n"
+"       LDMIA   R1, {R2,R3,R12}\n"
+"       STMIA   R6, {R2,R3,R12}\n"
+"       LDR     R1, [R0]\n"
+"       CMP     R1, #0x24\n"
+"       ADDLS   PC, PC, R1,LSL#2\n"
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC908E4:\n"
+"       B       loc_FFC90978\n"
+"loc_FFC908E8:\n"
+"       B       loc_FFC90978\n"
+"loc_FFC908EC:\n"
+"       B       loc_FFC90980\n"
+"loc_FFC908F0:\n"
+"       B       loc_FFC90988\n"
+"loc_FFC908F4:\n"
+"       B       loc_FFC90988\n"
+"loc_FFC908F8:\n"
+"       B       loc_FFC90988\n"
+"loc_FFC908FC:\n"
+"       B       loc_FFC90978\n"
+"loc_FFC90900:\n"
+"       B       loc_FFC90980\n"
+"loc_FFC90904:\n"
+"       B       loc_FFC90988\n"
+"loc_FFC90908:\n"
+"       B       loc_FFC90988\n"
+"loc_FFC9090C:\n"
+"       B       loc_FFC909E4\n"
+"loc_FFC90910:\n"
+"       B       loc_FFC909E4\n"
+"loc_FFC90914:\n"
+"       B       loc_FFC90AD0\n"
+"loc_FFC90918:\n"
+"       B       loc_FFC90AD8\n"
+"loc_FFC9091C:\n"
+"       B       loc_FFC90AD8\n"
+"loc_FFC90920:\n"
+"       B       loc_FFC90AD8\n"
+"loc_FFC90924:\n"
+"       B       loc_FFC90AD8\n"
+"loc_FFC90928:\n"
+"       B       loc_FFC90ADC\n"
+"loc_FFC9092C:\n"
+"       B       loc_FFC90ADC\n"
+"loc_FFC90930:\n"
+"       B       loc_FFC90ADC\n"
+"loc_FFC90934:\n"
+"       B       loc_FFC90ADC\n"
+"loc_FFC90938:\n"
+"       B       loc_FFC90ADC\n"
+"loc_FFC9093C:\n"
+"       B       loc_FFC90990\n"
+"loc_FFC90940:\n"
+"       B       loc_FFC90998\n"
+"loc_FFC90944:\n"
+"       B       loc_FFC90998\n"
+"loc_FFC90948:\n"
+"       B       loc_FFC909F0\n"
+"loc_FFC9094C:\n"
+"       B       loc_FFC909F0\n"
+"loc_FFC90950:\n"
+"       B       loc_FFC909F8\n"
+"loc_FFC90954:\n"
+"       B       loc_FFC90A28\n"
+"loc_FFC90958:\n"
+"       B       loc_FFC90A58\n"
+"loc_FFC9095C:\n"
+"       B       loc_FFC90A88\n"
+"loc_FFC90960:\n"
+"       B       loc_FFC90AB8\n"
+"loc_FFC90964:\n"
+"       B       loc_FFC90AB8\n"
+"loc_FFC90968:\n"
+"       B       loc_FFC90ADC\n"
+"loc_FFC9096C:\n"
+"       B       loc_FFC90ADC\n"
+"loc_FFC90970:\n"
+"       B       loc_FFC90AC0\n"
+"loc_FFC90974:\n"
+"       B       loc_FFC90AC8\n"
+"loc_FFC90978:\n"
+"       BL      sub_FFC8D560\n" //cases 0,1,6
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90980:\n"
+"       BL      sub_FFC8D7F0\n" //cases 2,7
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90988:\n"
+"       BL      sub_FFC8D9F4\n" //cases 3-5,8,9
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90990:\n"
+"       BL      sub_FFC8DC5C\n" //case 22
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90998:\n"
+"       BL      sub_FFC8DE50\n" //cases 23,24
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC909E4:\n"
+"       BL      sub_FFC8E0B8_my\n" //cases 10,11 ->
+"       MOV     R4, #0\n"
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC909F0:\n"
+"       BL      sub_FFC8E1F4\n" //cases 25,26
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC909F8:\n"
+"       LDRH    R1, [R0,#4]\n" //case 27
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R0,#0xC]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC918AC\n"
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90A28:\n"
+"       LDRH    R1, [R0,#4]\n" //case 28
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R5,#8]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC91A2C\n"
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90A58:\n"
+"       LDRH    R1, [R5]\n" //case 29
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R0,#6]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R5,#8]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC91AD8\n"
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90A88:\n"
+"       LDRH    R1, [R5]\n" //case 30
+"       STRH    R1, [SP,#0x10]\n"
+"       LDRH    R1, [R5,#2]\n"
+"       STRH    R1, [SP,#0x12]\n"
+"       LDRH    R1, [R5,#4]\n"
+"       STRH    R1, [SP,#0x14]\n"
+"       LDRH    R1, [R5,#6]\n"
+"       STRH    R1, [SP,#0x16]\n"
+"       LDRH    R1, [R0,#0xC]\n"
+"       STRH    R1, [SP,#0x18]\n"
+"       BL      sub_FFC91B78\n"
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90AB8:\n"
+"       BL      sub_FFC8E468\n" //cases 31,32
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90AC0:\n"
+"       BL      sub_FFC8EA84\n" //case 35
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90AC8:\n"
+"       BL      sub_FFC8ECBC\n" //case 36
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90AD0:\n"
+"       BL      sub_FFC8EE34\n" //case 12
+"       B       loc_FFC90ADC\n" //default case
+"loc_FFC90AD8:\n"
+"       BL      sub_FFC8EFCC\n" //cases 13-16
+"loc_FFC90ADC:\n"
+"       LDR     R0, [SP,#0x1C]\n" //default case
+"       LDR     R1, [R0,#0x7C]\n"
+"       LDR     R3, [R0,#0x88]\n"
+"       LDR     R2, [R0,#0x8C]\n"
+"       ADD     R0, R0, #4\n"
+"       BLX     R3\n"
+"       CMP     R4, #1\n"
+"       BNE     loc_FFC90B44\n"
+"loc_FFC90AFC:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       MOV     R2, #0xC\n"
+"       LDR     R1, [R0,#0x7C]\n"
+"       ADD     R1, R1, R1,LSL#1\n"
+"       ADD     R0, R0, R1,LSL#2\n"
+"       SUB     R4, R0, #8\n"
+"       LDR     R0, =0x3D41C\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFE4EA44\n"
+"       LDR     R0, =0x3D428\n"
+"       MOV     R2, #0xC\n"
+"       ADD     R1, SP, #0x10\n"
+"       BL      sub_FFE4EA44\n"
+"       LDR     R0, =0x3D434\n"
+"       MOV     R2, #0xC\n"
+"       MOV     R1, R4\n"
+"       BL      sub_FFE4EA44\n"
+"       B       loc_FFC90BBC\n"
+"loc_FFC90B44:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       LDR     R0, [R0]\n"
+"       CMP     R0, #0xB\n"
+"       BNE     loc_FFC90B8C\n"
+"       MOV     R3, #0\n"
+"       STR     R3, [SP]\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #0\n"
+"       BL      sub_FFC8D368\n"
+"       MOV     R3, #0\n"
+"       STR     R3, [SP]\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #0\n"
+"       B       loc_FFC90BB8\n"
+"loc_FFC90B8C:\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #1\n"
+"       STR     R3, [SP]\n"
+"       BL      sub_FFC8D368\n"
+"       MOV     R3, #1\n"
+"       MOV     R2, #1\n"
+"       MOV     R1, #1\n"
+"       MOV     R0, #1\n"
+"       STR     R3, [SP]\n"
+"loc_FFC90BB8:\n"
+"       BL      sub_FFC8D4A8\n"
+"loc_FFC90BBC:\n"
+"       LDR     R0, [SP,#0x1C]\n"
+"       BL      sub_FFC91838\n"
+"       B       loc_FFC905F4\n"
+        );
+}
+
+
+void __attribute__((naked,noinline)) sub_FFC8E0B8_my()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R8,LR}\n"
+"       LDR     R7, =0x64FC\n"
+"       MOV     R4, R0\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R1, #0x3E\n"
+"       BL      sub_FFC173EC\n"
+"       LDRSH   R0, [R4,#4]\n"
+"       MOV     R2, #0\n"
+"       MOV     R1, #0\n"
+"       BL      sub_FFC8D0FC\n"
+"       MOV     R6, R0\n"
+"       LDRSH   R0, [R4,#6]\n"
+"       BL      sub_FFC8D208\n"
+"       LDRSH   R0, [R4,#8]\n"
+"       BL      sub_FFC8D260\n"
+"       LDRSH   R0, [R4,#0xA]\n"
+"       BL      sub_FFC8D2B8\n"
+"       LDRSH   R0, [R4,#0xC]\n"
+"       BL      sub_FFC8D310\n"
+"       MOV     R5, R0\n"
+"       LDR     R0, [R4]\n"
+"       LDR     R8, =0x3D434\n"
+"       CMP     R0, #0xB\n"
+"       MOVEQ   R6, #0\n"
+"       MOVEQ   R5, #0\n"
+"       BEQ     loc_FFC8E148\n"
+"       CMP     R6, #1\n"
+"       BNE     loc_FFC8E148\n"
+"       LDRSH   R0, [R4,#4]\n"
+"       LDR     R1, =0xFFC8D068\n"
+"       MOV     R2, #2\n"
+"       BL      sub_FFD03B74\n"
+"       STRH    R0, [R4,#4]\n"
+"       MOV     R0, #0\n"
+"       STR     R0, [R7,#0x28]\n"
+"       B       loc_FFC8E150\n"
+"loc_FFC8E148:\n"
+"       LDRH    R0, [R8]\n"
+"       STRH    R0, [R4,#4]\n"
+"loc_FFC8E150:\n"
+"       CMP     R5, #1\n"
+"       LDRNEH  R0, [R8,#8]\n"
+"       BNE     loc_FFC8E16C\n"
+"       LDRSH   R0, [R4,#0xC]\n"
+"       MOV     R2, #0x20\n"
+"       LDR     R1, =0xFFC8D0EC\n"
+"       BL      sub_FFC91868\n"
+"loc_FFC8E16C:\n"
+"       STRH    R0, [R4,#0xC]\n"
+"       LDRSH   R0, [R4,#6]\n"
+"       BL      sub_FFC70178_my\n" // ->
+"       LDR     PC, =0xFFC8E178\n" // + continue in ROM
+/* removed to spare some bytes -
+"       LDRSH   R0, [R4,#8]\n"
+"       MOV     R1, #1\n"
+"       BL      sub_FFC70974\n"
+"       MOV     R1, #0\n"
+"       ADD     R0, R4, #8\n"
+"       BL      sub_FFC709FC\n"
+"       LDRSH   R0, [R4,#0xE]\n"
+"       BL      sub_FFC84038\n"
+"       LDR     R4, =0xBB8\n"
+"       CMP     R6, #1\n"
+"       BNE     loc_FFC8E1C4\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #2\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0x532\n"
+"       LDRNE   R0, =0xffc8d778\n" // "ExpDrv.c"
+"       BLNE    sub_FFC0BDB8\n"
+"loc_FFC8E1C4:\n"
+"       CMP     R5, #1\n"
+"       LDMNEFD SP!, {R4-R8,PC}\n"
+"       LDR     R0, [R7,#0x1C]\n"
+"       MOV     R2, R4\n"
+"       MOV     R1, #0x20\n"
+"       BL      sub_FFC172F0\n"
+"       TST     R0, #1\n"
+"       LDRNE   R1, =0x537\n"
+"       LDRNE   R0, =0xffc8d778\n" // "ExpDrv.c"
+"       LDMNEFD SP!, {R4-R8,LR}\n"
+"       BNE     sub_FFC0BDB8\n"
+"       LDMFD   SP!, {R4-R8,PC}\n"
+*/
+        );
+}
+
+
+void __attribute__((naked,noinline)) sub_FFC70178_my()
+{
+        asm volatile (
+"       STMFD   SP!, {R4-R6,LR}\n"
+"       LDR     R5, =0x5FD4\n"
+"       MOV     R4, R0\n"
+"       LDR     R0, [R5,#4]\n"
+"       CMP     R0, #1\n"
+"       LDRNE   R1, =0x16D\n"
+"       LDRNE   R0, =0xffc6ff10\n" // "Shutter.c"
+"       BLNE    sub_FFC0BDB8\n"
+"       CMN     R4, #0xC00\n"
+"       LDREQSH R4, [R5,#2]\n"
+"       CMN     R4, #0xC00\n"
+"       LDREQ   R1, =0x173\n"
+"       LDREQ   R0, =0xffc6ff10\n" // "Shutter.c"
+"       STRH    R4, [R5,#2]\n"
+"       BLEQ    sub_FFC0BDB8\n"
+"       MOV     R0, R4\n"
+//"       BL      sub_FFD68DD8\n" //-
+"       BL      apex2us\n" //+
+"       MOV     R4, R0\n"
+//"       BL      nullsub\n" //-
+//"       MOV     R0, R4\n" //-
+"       BL      sub_FFCA2AF8\n"
+"       TST     R0, #1\n"
+"       LDMNEFD SP!, {R4-R6,LR}\n"
+"       MOVNE   R1, #0x178\n"
+"       LDRNE   R0, =0xffc6ff10\n" // "Shutter.c"
+"       BNE     sub_FFC0BDB8\n"
+"       LDMFD   SP!, {R4-R6,PC}\n"
+        );
+}

branches/release-1_0/platform/a470/sub/102c/stubs_auto.S

@@ -49 +49 @@
 STUB(FFC16FB8)
 STUB(FFC17054)
+STUB(FFC172F0)
 STUB(FFC173B8)
 STUB(FFC173EC)
@@ -282 +283 @@
 STUB(FFC66230)
 STUB(FFC66764)
+STUB(FFC70178)
+STUB(FFC7042C)
+STUB(FFC70974)
+STUB(FFC709FC)
+STUB(FFC70C7C)
+STUB(FFC711F8)
+STUB(FFC84038)
+STUB(FFC8D0FC)
+STUB(FFC8D208)
+STUB(FFC8D260)
+STUB(FFC8D2B8)
+STUB(FFC8D310)
+STUB(FFC8D368)
+STUB(FFC8D4A8)
+STUB(FFC8D560)
+STUB(FFC8D7F0)
+STUB(FFC8D9F4)
+STUB(FFC8DC5C)
+STUB(FFC8DE50)
+STUB(FFC8E0B8)
+STUB(FFC8E1F4)
+STUB(FFC8E468)
+STUB(FFC8E690)
+STUB(FFC8E980)
+STUB(FFC8EA84)
+STUB(FFC8ECBC)
+STUB(FFC8EE34)
+STUB(FFC8EFCC)
+STUB(FFC8F104)
+STUB(FFC8F34C)
+STUB(FFC902D0)
+STUB(FFC90524)
+STUB(FFC90584)
+STUB(FFC91838)
+STUB(FFC91868)
+STUB(FFC918AC)
+STUB(FFC91A2C)
+STUB(FFC91AD8)
+STUB(FFC91B78)
+STUB(FFC91C10)
 STUB(FFC94BB4)
 STUB(FFCA1774)
+STUB(FFCA2AF8)
 STUB(FFCC87C4)
 STUB(FFCC8888)
@@ -292 +334 @@
 STUB(FFCEA074)
 STUB(FFCF97DC)
+STUB(FFD03A20)
+STUB(FFD03B74)
+STUB(FFD03CA8)
 STUB(FFD0761C)
 STUB(FFD08668)
@@ -377 +422 @@
 STUB(FFD6789C)
 STUB(FFD6790C)
+STUB(FFD68DD8)
+STUB(FFE4EA44)
 STUB(FFE4ECA0)
 STUB(FFE50550)

branches/release-1_0/platform/a470/sub/102c/stubs_entry.S

@@ -30 +30 @@
 //DEF(physw_run                               ,0x00001bf0) // Found @0xffc118a8,          stubs_min = 0x00001bf0 (0x1BF0)
 //DEF(levent_table                            ,0xffe73984) // Found @0xffe73984,          stubs_min = 0xffe73984 (0xFFE73984)
-//DEF(FlashParamsTable                        ,0xffe90724) // Found @0xffe90724, ** != ** stubs_min = 0xffe96c8c (0xFFE96C8C)
+//DEF(FlashParamsTable                        ,0xffe90724) // Found @0xffe90724,          stubs_min = 0xffe90724 (0xffe90724)
 //DEF(movie_status                            ,0x00005200) // Found @0xffc45690,          stubs_min = 0x00005200 (0x5200)
 //DEF(canon_menu_active                       ,0x00009064) // Found @0xffd1f904,          stubs_min = 0x00009064 (0x9064)
-//DEF(canon_shoot_menu_active                 ,0x00009831) // Found @0xffd380c4, ** != ** stubs_min = 0x00009768 (0x9768)
+//DEF(canon_shoot_menu_active                 ,0x00009831) // Found @0xffd380c4,          stubs_min = 0x00009831 (0x9831)
 //DEF(playrec_mode                            ,0x00005370) // Found @0xffc4bc7c,          stubs_min = 0x00005370 (0x536C+4)
-//DEF(zoom_status                             ,0x0000d070) // Found @0xffde9384, ** != ** stubs_min = 0x0000d7c4 (0xD7C4)
+//DEF(zoom_status                             ,0x0000d070) // Found @0xffde9384,          stubs_min = 0x0000d070 (0xD070)
 //DEF(some_flag_for_af_scan                   ,0x0000cdec) // Found @0xffdd7de4,          stubs_min = 0x0000cdec (0xCDEC)
-//DEF(zoom_busy                               ,0x000083d4) // Found @0xffd0677c, ** != ** stubs_min = 0x00008050 (0x8050)
+//DEF(zoom_busy                               ,0x000083d4) // Found @0xffd0677c,          stubs_min = 0x000083d4 (0x83d4)
 //DEF(focus_busy                              ,0x000082e0) // Found @0xffd02310,          stubs_min = 0x000082e0 (0x82E0)
-//DEF(recreview_hold                          ,0x00005b64) // Found @0xffc64340, ** != ** stubs_min = 0x00009634 (0x9634)
+//DEF(recreview_hold                          ,0x00005b64) // Found @0xffc64340,          stubs_min = 0x00005b64 (0x5b64)
 
 // Values below go in 'lib.c':

branches/release-1_0/platform/a470/sub/102c/stubs_min.S

@@ -3 +3 @@
 DEF(physw_status, 0x100BC) //Found for A470 (GPIOStatus)
 DEF(physw_run, 0x1BF0) //Found for A470 in task_PhySw, same as A590
-DEF(FlashParamsTable,0xFFE96C8C) // via GetReservedClusters_Fut_9
-DEF(zoom_busy, 0x8050)  //0x803c+14 same as in a590
+DEF(FlashParamsTable,0xffe90724)
+DEF(zoom_busy, 0x83d4)
 DEF(focus_busy, 0x82E0) // 0x82D8+0x08 found in sub_FFD02310
 
 DEF(canon_menu_active,0x9064)           // 0x9060+4
-DEF(canon_shoot_menu_active,0x9768)   // 0x9768+1 ??BAD
+DEF(canon_shoot_menu_active,0x9831)
 
-DEF(recreview_hold, 0x9634) // ?? found in GetAEIntegralServiceMode_6
+DEF(recreview_hold, 0x5b64)
 
 DEF(movie_status, 0x5200)  // 0x51C8 + 0x38
 DEF(some_flag_for_af_scan, 0xCDEC) 
-DEF(zoom_status, 0xD7C4) 
+DEF(zoom_status, 0xD070)
 DEF(led_table, 0x22AC) //Found using LEDDrv.c
 DEF(levent_table,0xFFE73984)