Changeset 232 for branches/fe50t/platform/ixus90_sd790/sub/100d/boot.c

Timestamp:

01/31/10 10:53:26 (3 years ago)

Author:

fe50

Message:

• ixus90_sd790: added 1.00c version (by ehmu, ​http://chdk.setepontos.com/index.php/topic,2187.msg45753.html#msg45753)
• ixus90_sd790: improvements for 1.00d version (by ehmu, ​http://chdk.setepontos.com/index.php/topic,2187.msg46294.html#msg46294): fixed a bug with dark frame subtraction (nrflag was incorrect) improved USB remote support cosmetic changes
• added ixus90_sd790-100e to the makefile (copy of the 100d version, 100e and 100d are identical)

File:

• branches/fe50t/platform/ixus90_sd790/sub/100d/boot.c (modified) (18 diffs)

branches/fe50t/platform/ixus90_sd790/sub/100d/boot.c

@@ -126 +126 @@
         "LDR     R0, =0x19B\n"
         "MOV     R1, #0x64\n"
-        //"STRD    R0, [SP,#0x74-0x54]\n"
-        "STR     R0, [SP,#0x74-0x54]\n"
-        "STR     R1, [SP,#0x74-0x50]\n"
+        "STRD    R0, [SP,#0x74-0x54]\n"
         "MOV     R0, #0x78\n"
-        //"STRD    R0, [SP,#0x74-0x4C]\n"
-        "STR     R0, [SP,#0x74-0x4C]\n"
-        "STR     R1, [SP,#0x74-0x48]\n"
+        "STRD    R0, [SP,#0x74-0x4C]\n"
         "MOV     R0, #0\n"
         "STR     R0, [SP,#0x74-0x44]\n"
@@ -204 +200 @@
         "TST     R0, #1\n"
         "MOVEQ   R0, #0x12C\n"
-        "BLEQ    sub_FF828400\n"
+        "BLEQ    _SleepTask\n"
         "BL      sub_FF821BFC\n"
         "CMP     R0, #0\n"
@@ -228 +224 @@
         "MOV     R1, #0x19\n"
         "LDR     R0, =0xFF81CD44\n"   // ; "Startup"\n"
-        "BL      sub_FF81B818\n"
+        "BL      _CreateTask\n"
         "MOV     R0, #0\n"
         //"LDMFD   SP!, {R3-R5,PC}\n"
@@ -274 +270 @@
         );
 }; //#fe
+
 
 void CreateTask_spytask() { //#fs 
@@ -409 +406 @@
 }; //#fe
 
-
-
 void __attribute__((naked,noinline)) sub_FF84ED40_my() { //#fs  ; Partition t
         asm volatile (
@@ -426 +421 @@
         "B       loc_FF84EE8C\n"
  
-
 "loc_FF84ED70:\n" //                            ; CODE XREF: sub_FF84ED40+28j
         "B       loc_FF84EDA4\n"
  
-
 "loc_FF84ED74:\n" //                            ; CODE XREF: sub_FF84ED40+28j
         "B       loc_FF84ED8C\n"
  
-
 "loc_FF84ED78:\n" //                            ; CODE XREF: sub_FF84ED40+28j
         "B       loc_FF84ED8C\n"
  
-
 "loc_FF84ED7C:\n" //                            ; CODE XREF: sub_FF84ED40+28j
         "B       loc_FF84ED8C\n"
  
-
 "loc_FF84ED80:\n" //                            ; CODE XREF: sub_FF84ED40+28j
         "B       loc_FF84ED8C\n"
  
-
 "loc_FF84ED84:\n" //                            ; CODE XREF: sub_FF84ED40+28j
         "B       loc_FF84EE84\n"
  
-
 "loc_FF84ED88:\n" //                            ; CODE XREF: sub_FF84ED40+28j
         "B       loc_FF84ED8C\n"
-
 "loc_FF84ED8C:\n" //                            ; CODE XREF: sub_FF84ED40+28j
-
-
         "MOV     R2, #0\n"
         "MOV     R1, #0x200\n"
@@ -463 +448 @@
         "MOVS    R4, R0\n"
         "BNE     loc_FF84EDAC\n"
-
 "loc_FF84EDA4:\n" //                            ; CODE XREF: sub_FF84ED40+28j
-
-
         "MOV     R0, #0\n"
         "LDMFD   SP!, {R4-R8,PC}\n"
  
-
 "loc_FF84EDAC:\n" //                            ; CODE XREF: sub_FF84ED40+60j
         "LDR     R12, [R7,#0x4C]\n"
@@ -486 +467 @@
         "B       loc_FF84EDA4\n"
  
-
 "loc_FF84EDD8:\n" //                            ; CODE XREF: sub_FF84ED40+88j
         "MOV     R0, R8\n"
@@ -493 +473 @@
                   "MOV   R1, R4\n"           //  pointer to MBR in R1
                   "BL    mbr_read_dryos\n"   //  total sectors count in R0 before and after call
-
         // Start of DataGhost's FAT32 autodetection code
         // Policy: If there is a partition which has type W95 FAT32, use the first one of those for image storage
@@ -543 +522 @@
         "ORR     R3, R3, R12\n"
         //"LDRB    R12, [R4,#0x1FE]\n"
-
         "LDRB    R12, [LR,#0x1FE]\n"
         "LDRB    LR, [LR,#0x1FF]\n"
-
         "MOV     R4, #0\n"
         "BNE     loc_FF84EE60\n"
@@ -558 +535 @@
         "MOVEQ   R5, R3\n"
         "MOVEQ   R4, #1\n"
-
 "loc_FF84EE60:\n" //                            ; CODE XREF: sub_FF84ED40+F8j
-
         "MOV     R0, #3\n"
         "BL      sub_FF867DD4\n"
@@ -571 +546 @@
         "B       loc_FF84EE98\n"
  
-
 "loc_FF84EE84:\n" //                            ; CODE XREF: sub_FF84ED40+28j
-
-
         "MOV     R5, #0x40\n"
         "B       loc_FF84EE98\n"
  
-
 "loc_FF84EE8C:\n" //                            ; CODE XREF: sub_FF84ED40+28j
-
-
         "MOV     R1, #0x374\n"
         "LDR     R0, =0xFF84ED34\n" // aMounter_c  ; "Mounter.c"\n"
         "BL      _DebugAssert\n"
-
 "loc_FF84EE98:\n" //                            ; CODE XREF: sub_FF84ED40+12Cj
-
         "STR     R6, [R7,#0x44]!\n"
         "MOV     R0, #1\n"
         "STR     R5, [R7,#4]\n"
         "LDMFD   SP!, {R4-R8,PC}\n"
-
         );
 }; //#fe
-
 // Extracted method: sub_FF842A44 + 240
 // Extracted method: sub_FF842C84
@@ -609 +574 @@
                 "MOV     R9, #1\n"
                 "MOV     R10, #0\n"
-
                 "loc_FF842CA4:\n"
                 "LDR     R3, =0x1A1\n"                  // HL
@@ -619 +583 @@
                 "MOV     R0, #40\n" // +
                 "BL      _SleepTask\n" // LOCATION: KerSys.c:0
-
                 //------------------  added code ---------------------
                 "labelA:\n"
@@ -631 +594 @@
                 "labelB:\n"
                 //------------------  original code ------------------
-
                 "LDR     R0, [R7,#0x104]\n"
                 "MOV     R0, R0,ASR#16\n"
@@ -655 +617 @@
                 "ADD     R5, R5, #1\n"
                 "EOR     R4, R4, #1\n"
-
                 "loc_FF842D1C:\n"
                 "LDR     R0, [R6,#0x14]\n"
@@ -668 +629 @@
                 "LDR     R0, =0xB01\n"
                 "BL      sub_FF875370\n"
-
                 "loc_FF842D48:\n"
                 "MOV     R0, R11\n"
                 "BL      sub_FF875370\n"
-
                 "loc_FF842D50:\n"
                 "LDR     R0, [R8,R4,LSL#2]\n"
@@ -678 +637 @@
                 "STR     R0, [R6,#0x1C]\n"
                 "BL      sub_FF8752b8\n"
-
                 "loc_FF842D60:\n"
                 "LDRH    R0, [R6]\n"
                 "STRH    R0, [R6,#2]\n"
-
                 "loc_FF842D68:\n"
                 "STR     R10, [R7,#0x100]\n"