Changeset 947

Timestamp:

09/26/10 00:10:04 (3 years ago)

Author:

reyalp

Message:

save a small amount of memory on d10, fix some misleading comments in sd990

Location:

trunk

Files:

• loader/d10/entry.S (modified) (1 diff)
• platform/d10/sub/100a/boot.c (modified) (10 diffs)
• platform/ixus980_sd990/sub/100e/boot.c (modified) (1 diff)
• platform/ixus980_sd990/sub/101b/boot.c (modified) (1 diff)

trunk/loader/d10/entry.S

@@ -1 +1 @@
     .section .entry
 
-// Turn OFF SD Card power
-// to support autostart
-        LDR     R3, =0xC0220018 // d10 sub_FF856670 = sd990 sub_FF85A02C
-        MOV     R2, #0x44
-        STR     R2, [R3]
-
-// looks like idle cycle is required for proper shutdown
-// not known if needed for D10
-        MOV     R3, #0x8000
-1:
-        SUB     R3, R3, #1
-        CMP     R3, #0
-        BNE     1b
+// SD card off stuff doesn't appear to be needed
 
 // ordinary startup...

trunk/platform/d10/sub/100a/boot.c

@@ -196 +196 @@
 "                LDR     R0, =0x19B\n"
 "                LDR     R1, =sub_FF814D38_my\n"
+"                LDR     PC, =0xFF811018\n" // jump back to original FW
+/*
 "                STR     R0, [SP,#0x20]\n"
 "                MOV     R0, #0x96\n"
@@ -217 +219 @@
 "                MOV     R2, #0\n"
 "                BL      sub_FF812D68\n"
-"                ADD     SP, SP, #0x74\n"
-"                LDR     PC, [SP],#4\n"
+// will never return
+//"                ADD     SP, SP, #0x74\n"
+//"                LDR     PC, [SP],#4\n"
+*/
         );
 }
@@ -312 +316 @@
 "                BL      sub_FF829308\n"
 "                BL      taskcreatePhySw_my\n"  // we do this here rather than hook so we don't waste the original stack
+"                LDR     PC, =0xFF81C230\n" // jump back to original firmware
+/*
 //"                BL      sub_FF821A88\n" // taskcreate_PhySw
 "                BL      sub_FF824ADC\n"
@@ -325 +331 @@
 "                LDMFD   SP!, {R4,LR}\n"
 "                B       sub_FF8154B4\n" // LOCATION: MLHClock.c:0
+*/
         );
 }
@@ -384 +391 @@
 "                MOV     R0, #3\n"
 "                BL      sub_FF855974_my\n" // -> (Mounter.c)
+"                LDR     PC,=0xFF8725A8\n" //jump back to firmware
+/*
 //"                BL      nullsub_64\n"
 "                LDR     R4, =0x2E20\n"
@@ -399 +408 @@
 "                STR     R0, [R4]\n"
 "                LDMFD   SP!, {R4,PC}\n"
-
+*/
  );
 } 
@@ -427 +436 @@
 "                MOV     R0, R5\n"
 "                BL      sub_FF855714_my\n" // ->
+"                LDR     PC,=0xFF8559CC\n" // jump back to original fw
+/*
 "                MOV     R7, R0\n"
 "                MOV     R0, R5\n"
@@ -458 +469 @@
 "                BEQ     sub_FF8115A8\n" // qPrintf
 "                LDMFD   SP!, {R4-R8,PC}\n"
-
+*/
  );
 } 
@@ -475 +486 @@
 "                MOV     R1, R5\n"
 "                BL      sub_FF8554A4_my\n" // -> (Mounter.c)
+"                LDR     PC, =0xFF855740\n" // jump back to origina fw
+/*
 "                CMP     R0, #0\n"
 "                LDMEQFD SP!, {R4-R6,PC}\n"
@@ -489 +502 @@
 "                STRNE   R1, [R4,#0x70]\n"
 "                LDMFD   SP!, {R4-R6,PC}\n"
+*/
  );
 } 

trunk/platform/ixus980_sd990/sub/100e/boot.c

@@ -40 +40 @@
 
 
-    // enable caches and write buffer... this is a carryover from old dryos ports, may not be useful
+    // enable caches and write buffer, disabled earlier in loader 
     asm volatile (
         "MRC     p15, 0, R0,c1,c0\n"

trunk/platform/ixus980_sd990/sub/101b/boot.c

@@ -40 +40 @@
 
 
-    // enable caches and write buffer... this is a carryover from old dryos ports, may not be useful
+    // enable caches and write buffer, disabled earlier in loader 
     asm volatile (
         "MRC     p15, 0, R0,c1,c0\n"