Changeset 950

Timestamp:

09/26/10 23:59:23 (3 years ago)

Author:

reyalp

Message:

set diskboot encoding for ixus95, prevent diskboot boot loop in boot.c, add "sd power" loop to loader (probably not needed ?)
comment out some unused dev code in boot.c and other cruft
remove redundant fi2 stuff from makefile.inc
eol-style on stubs_auto.S

Location:

trunk

Files:

• loader/ixus95_sd1200/entry.S (modified) (1 diff)
• loader/ixus95_sd1200/resetcode/main.c (modified) (2 diffs)
• platform/ixus95_sd1200/sub/100c/boot.c (modified) (8 diffs)
• platform/ixus95_sd1200/sub/100c/makefile.inc (modified) (1 diff)
• platform/ixus95_sd1200/sub/100c/stubs_auto.S (modified) (1 prop)

trunk/loader/ixus95_sd1200/entry.S

@@ -1 +1 @@
     .section .entry
+
+// Turn OFF SD Card power
+// to support autostart
+// not known if needed on this cam
+        LDR     R3, =0xC0220018 // sub_FFC40150 near  task_SD1stInit
+        MOV     R2, #0x44
+        STR     R2, [R3]
+
+// idle cycle
+        MOV     R3, #0x8000
+1:
+        SUB     R3, R3, #1
+        CMP     R3, #0
+        BNE     1b
+
 // ordinary startup...
 

trunk/loader/ixus95_sd1200/resetcode/main.c

@@ -78 +78 @@
                 "CMP     R4, #7\n" // ???
                 "STR     R0, [R1,#0xFC]\n"
-                "LDMEQFD SP!, {R4,PC}\n" //???
+//              "LDMEQFD SP!, {R4,PC}\n" // from original restart func, doesn't make sense here
                 "MOV     R0, #0x78\n"
                 "MCR     p15, 0, R0,c1,c0\n"
@@ -96 +96 @@
 //              "LDR     R0, =loc_FF810000\n"
                 "mov     R0, %0\n"
-                "LDMFD   SP!, {R4,LR}\n" //???
+//              "LDMFD   SP!, {R4,LR}\n" // no return possible
                 "BX      R0\n"
                 : : "r"(dst_void) : "memory","r0","r1","r2","r3","r4");

trunk/platform/ixus95_sd1200/sub/100c/boot.c

@@ -10 +10 @@
 extern long wrs_kernel_bss_start;
 extern long wrs_kernel_bss_end;
+/*
 long aHookList[128];
 long aHookNum=0;
+*/
 
 // Forward declarations
 void CreateTask_spytask();
-void CreateTask_blinker();
+//void CreateTask_blinker();
 void boot();
-void DumpMemory(char *path, void *start_address, int length);
+//void DumpMemory(char *path, void *start_address, int length);
 
 void taskCreateHook(int *p) {
+        // reyalp - ???
+        /*
         int i;
         int found=0;
@@ -43 +47 @@
 
         }
+        */
 
     p-=17;
@@ -124 +129 @@
 "    STR     R1, [R2]\n" */ 
 
+// reyalp - WTF ? either you need this OR the for loops, but not both...
 // Without this chunk we get stuck in stdioSetup
 "    LDR     R0, =0xFFECD3E4\n"
@@ -293 +299 @@
         asm volatile (
 "                STMFD   SP!, {R3,LR}\n"
-"                BL      sub_FFC11B18\n" //nullsub
+//"                BL      sub_FFC11B18\n" //nullsub
 "                BL      sub_FFC18AC8\n"
 "                CMP     R0, #0\n"
@@ -309 +315 @@
 "loc_FFC0C298:\n"
 "                BL      sub_FFC11B20\n"
-"                BL      sub_FFC11B1C\n"   //nullsub
+//"                BL      sub_FFC11B1C\n"   //nullsub
 "                BL      sub_FFC16D84\n"
 "                LDR     R1, =0x34E000\n"
@@ -338 +344 @@
 "                 BL      sub_FFC18B08\n" // j_nullsub
 "                 BL      sub_FFC18CEC\n"
-"                 BL      sub_FFC18B9C\n"
+//"                 BL      sub_FFC18B9C\n" // diskboot
         );
 
@@ -507 +513 @@
 }
 
+#if 0
 const unsigned ledlist[]={
     0xC0220134, // green
@@ -588 +595 @@
 }
 
+void CreateTask_blinker() {
+       _CreateTask("Blinker", 0x1, 0x200, task_blinker, 0);
+}
+#endif
 
 void CreateTask_spytask() {
        _CreateTask("SpyTask", 0x19, 0x2000, core_spytask, 0);
-}
-
-void CreateTask_blinker() {
-       _CreateTask("Blinker", 0x1, 0x200, task_blinker, 0);
 }
 

trunk/platform/ixus95_sd1200/sub/100c/makefile.inc

@@ -12 +12 @@
 PLFLAGS+=-DRESTARTSTART=$(RESTARTSTART)
 
-#NEED_ENCODED_DISKBOOT=1
+NEED_ENCODED_DISKBOOT=2
 
 KEYSYS=d4
-ifdef OPT_FI2
-include $(topdir)/platform/fi2.inc
-endif
-
-