Changeset 647

Timestamp:

12/20/08 12:27:30 (4 years ago)

Author:

EWAVR

Message:

G9:

• fixed bugs in CHDK RAW shooting (​http://chdk.kernreaktor.org/mantis/view.php?id=112)
• camera can power-on in record mode (​http://chdk.kernreaktor.org/mantis/view.php?id=145)

Location:

trunk/platform/g9/sub

Files:

• 100d/boot.c (modified) (7 diffs)
• 100d/capt_seq.c (modified) (1 diff)
• 100d/lib.c (modified) (1 diff)
• 100g/boot.c (modified) (6 diffs)
• 100g/capt_seq.c (modified) (1 diff)
• 100g/lib.c (modified) (1 diff)

trunk/platform/g9/sub/100d/boot.c

@@ -16 +16 @@
 void CreateTask_spytask();
 
-
+/*
 void CreateTask_blinker(); 
 void task_blinker();
@@ -76 +76 @@
 
 #define DELAY 5000000                   // DEBUG
+
+*/
 
 void boot() { //#fs
@@ -103 +105 @@
     for(i=0;i<canon_bss_len/4;i++)
         canon_bss_start[i]=0;
+
+    *(int*)(0x261C+8)= (*(int*)0xC02200C0)&1 ? 1 : 2;  // replacement of sub_FF822E10
 
 /*
@@ -290 +294 @@
                 "B       loc_FF81DC48\n"
 "loc_FF81DC4C:\n"
-                "BL      sub_FF822E10\n"
+             //   "BL      sub_FF822E10\n"  // removed, see boot() function
                 //"BL      nullsub_4\n"
                 "BL      sub_FF82A488\n"
@@ -1686 +1690 @@
           "LDMFD   SP!, {R3-R5,PC}\n"
      );
+   return 0;  // shut up the compiler
 }
 
-
+/*
  
 
@@ -1745 +1750 @@
 //extern long Fseek_Fut(long file, long offset, long whence);
 //extern long _qDump(char* filename, long unused, long write_p2, long write_p3);
+
 void dump_chdk() { //#fs
     int fd;
@@ -1786 +1792 @@
 } //#fe 
 
-
+*/
 
 //*********************************************

trunk/platform/g9/sub/100d/capt_seq.c

@@ -98 +98 @@
                 "MOV     R0, R4\n"
                 //"BL      sub_FF944478\n"
-                "BL      sub_FF944408_my\n"             //???
+                "BL      sub_FF944408_my\n"             // ----------->
+                "BL      capt_seq_hook_raw_here\n"      // ++
                 "TST     R0, #1\n"
                 "STRNE   R9, [R5,#4]\n"

trunk/platform/g9/sub/100d/lib.c

@@ -16 +16 @@
 char *hook_raw_image_addr()
 {
- return (char*)0x108297C0;//OK // (*(int*)0x5684 ? 0x11F6B740 : 0x108057C0);   +++++
- //  return (char*)0x108057C0;
+ return (char*) (*(int*)(0x5854+0x18) ? 0x11F8F740 : 0x108297C0);
 }
 

trunk/platform/g9/sub/100g/boot.c

@@ -16 +16 @@
 void CreateTask_spytask();
 
-
+/*
 void CreateTask_blinker(); 
 void task_blinker();
@@ -76 +76 @@
 
 #define DELAY 5000000                   // DEBUG
+*/
 
 void boot() { //#fs
@@ -104 +105 @@
         canon_bss_start[i]=0;
 
+    *(int*)(0x261C+8)= (*(int*)0xC02200C0)&1 ? 1: 2;  // replacement of sub_FF822E10
 /*
     asm volatile (
@@ -290 +292 @@
                 "B       loc_FF81DC48\n"
 "loc_FF81DC4C:\n"
-                "BL      sub_FF822E10\n"
+                //"BL      sub_FF822E10\n"   // removed, see boot() function
                 //"BL      nullsub_4\n"
                 "BL      sub_FF82A488\n"
@@ -1686 +1688 @@
           "LDMFD   SP!, {R3-R5,PC}\n"
      );
+   return 0;  // shut up the compiler
 }
 
 
- 
+/* 
 
 
@@ -1786 +1789 @@
 } //#fe 
 
-
+*/
 
 //*********************************************

trunk/platform/g9/sub/100g/capt_seq.c

@@ -98 +98 @@
                 "MOV     R0, R4\n"
                 //"BL      sub_FF944478\n"
-                "BL      sub_FF944478_my\n"             //???
+                "BL      sub_FF944478_my\n"             // -------->
+                "BL      capt_seq_hook_raw_here\n"      // +
                 "TST     R0, #1\n"
                 "STRNE   R9, [R5,#4]\n"

trunk/platform/g9/sub/100g/lib.c

@@ -16 +16 @@
 char *hook_raw_image_addr()
 {
- return (char*)0x108297C0;//OK // (*(int*)0x5684 ? 0x11F6B740 : 0x108057C0);   +++++
- //  return (char*)0x108057C0;
+ return (char*) (*(int*)(0x5854+0x18) ? 0x11F8F740 : 0x108297C0);
 }