Changeset 1091

Timestamp:

03/20/11 01:32:00 (2 years ago)

Author:

reyalP

Message:

from chdkde r599 disable extra long exposure on a720, see ​http://chdk.setepontos.com/index.php?topic=6182.0

Location:

trunk

Files:

• include/camera.h (modified) (1 diff)
• platform/a720/sub/100c/boot.c (modified) (2 diffs)
• platform/a720/sub/100c/capt_seq.c (modified) (7 diffs)

trunk/include/camera.h

@@ -906 +906 @@
     #define CAM_EV_IN_VIDEO             1
     #undef  CAM_VIDEO_CONTROL
-    #define CAM_EXT_TV_RANGE            1
+// disabled for now, see http://chdk.setepontos.com/index.php?topic=6182.0
+//    #define CAM_EXT_TV_RANGE            1
 
     // pattern

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

@@ -24 +24 @@
 // if (p[0]==0xFFC5F754)  p[0]=(int)task_InitFileModules_my; //done
  if (p[0]==0xFFC49B18)  p[0]=(int)MovieRecord_Task_my; //done
- if (p[0]==0xFFC91454)  p[0]=(int)exp_drv_task; //done
-}
-
-void taskCreateHook2(int *p) { 
- p-=16;
- if (p[0]==0xFFC49B18)  p[0]=(int)MovieRecord_Task_my; //done
- if (p[0]==0xFFC91454)  p[0]=(int)exp_drv_task; //done
+// if (p[0]==0xFFC91454)  p[0]=(int)exp_drv_task; //done
 }
 
@@ -67 +61 @@
     :::"r0");
 */
-   *(int*)0x1930=(int)taskCreateHook;
-   *(int*)0x1934=(int)taskCreateHook2;
+    *(int*)0x1930=(int)taskCreateHook;
+    *(int*)0x1934=(int)taskCreateHook;
 
     // jump to init-sequence that follows the data-copy-routine 

trunk/platform/a720/sub/100c/capt_seq.c

@@ -244 +244 @@
 } //#fe
 
+/*
 void __attribute__((naked,noinline)) exp_drv_task(){
  asm volatile(
@@ -283 +284 @@
                 "MOV     R1, #1\n"
                 "BL      sub_FFC18DEC\n"
-                "BL      ExitTask\n"
+                "BL      _ExitTask\n"
                 "ADD     SP, SP, #0x20\n"
                 "LDMFD   SP!, {R4-R8,PC}\n"
@@ -699 +700 @@
                 "BNE     loc_FFC91A70\n"
                 "MOV     R3, #0\n"
-                "STR     R3, [SP,#0x0]\n"
+                "STR     R3, [SP]\n"
                 "MOV     R3, #1\n"
                 "MOV     R2, #1\n"
@@ -706 +707 @@
                 "BL      sub_FFC8E1F0\n"
                 "MOV     R3, #0\n"
-                "STR     R3, [SP,#0x0]\n"
+                "STR     R3, [SP]\n"
                 "MOV     R3, #1\n"
                 "MOV     R2, #1\n"
@@ -717 +718 @@
                 "MOV     R1, #1\n"
                 "MOV     R0, #1\n"
-                "STR     R3, [SP,#0x0]\n"
+                "STR     R3, [SP]\n"
                 "BL      sub_FFC8E1F0\n"
                 "MOV     R3, #1\n"
@@ -723 +724 @@
                 "MOV     R1, #1\n"
                 "MOV     R0, #1\n"
-                "STR     R3, [SP,#0x0]\n"
+                "STR     R3, [SP]\n"
 "loc_FFC91A9C:\n"
                 "BL      sub_FFC8E330\n"
@@ -853 +854 @@
          );
 }
+*/