Changeset 838 for trunk

Timestamp:

11/13/09 08:12:21 (4 years ago)

Author:

reyalp

Message:

More work for ​http://chdk.kernreaktor.org/mantis/view.php?id=64

• add playrec_mode for ixus40_sd300 ixus50_sd400 ixus700_sd500
• use s2is style playrec_mode check on ixus50_sd400 ixus700_sd500
• use normal playrec_mode check on a560

Location:

trunk

Files:

• include/lolevel.h (modified) (2 diffs)
• platform/a560/main.c (modified) (1 diff)
• platform/ixus40_sd300/sub/100j/stubs_min.S (modified) (1 diff)
• platform/ixus40_sd300/sub/100k/stubs_min.S (modified) (1 diff)
• platform/ixus50_sd400/main.c (modified) (1 diff)
• platform/ixus50_sd400/sub/101a/stubs_min.S (modified) (1 diff)
• platform/ixus50_sd400/sub/101b/stubs_min.S (modified) (2 diffs)
• platform/ixus700_sd500/main.c (modified) (1 diff)
• platform/ixus700_sd500/sub/101a/stubs_min.S (modified) (1 diff)
• platform/ixus700_sd500/sub/101b/stubs_min.S (modified) (1 diff)

trunk/include/lolevel.h

@@ -158 +158 @@
 
 /*used to detect play or record mode without relying on physical switch positions
- values:
+ values on most cameras:
   0 = startup in play
   1 = unknown, appears to happen in first play<->rec transition
@@ -165 +165 @@
   3 = play after being in record mode at least once
   5 = transitioning between some record modes, such as movie
- address can be found with strings "MenuIn", "MenuOut"
+ values on very old vxworks cameras (ixus50_sd400, ixus700_sd500, s2is)
+  0 = startup in play
+  1 = rec
+  2 = play
+  3 = maybe transition ?
+ address in all cases can be found with strings "MenuIn", "MenuOut"
 */
 extern long playrec_mode; 

trunk/platform/a560/main.c

@@ -60 +60 @@
 int mode_get() {
     int mode, i, t=0xFF;
-    mode = (playrec_mode==1 || playrec_mode==2) ? MODE_REC : MODE_PLAY;
+//    mode = (playrec_mode==1 || playrec_mode==2) ? MODE_REC : MODE_PLAY;
+    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY;
+
     _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4);
     for (i=0; i<MODESCNT; ++i) {

trunk/platform/ixus40_sd300/sub/100j/stubs_min.S

@@ -21 +21 @@
 
 DEF(levent_table,0xFF9514F0)
+DEF(playrec_mode,0x598C) // "MenuIn"

trunk/platform/ixus40_sd300/sub/100k/stubs_min.S

@@ -19 +19 @@
 DEF(recreview_hold, 0x117A8) //WRONG
 
-
 DEF(levent_table,0xFF9514F0)
+DEF(playrec_mode, 0x598C) // "MenuIn"

trunk/platform/ixus50_sd400/main.c

@@ -204 +204 @@
 int mode_get() {
     int mode, i, t=0xFF;
-    //mode  = (physw_status[0]&0x0F)==0x0C ?  MODE_PLAY : MODE_REC;
-        mode  = (physw_status[0]&0x07)==0x01 ?  MODE_PLAY : MODE_REC;
-        //mode  = (physw_status[1] & 0x2)?MODE_REC:MODE_PLAY; 
-    t=0xFF;
+        // play/rec without overrides
+        // mode  = (physw_status[0]&0x07)==0x01 ?  MODE_PLAY : MODE_REC;
+
+    mode = (playrec_mode==1)?MODE_REC:MODE_PLAY;
+
     _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4);
     for (i=0; i<MODESCNT; ++i) {

trunk/platform/ixus50_sd400/sub/101a/stubs_min.S

@@ -14 +14 @@
 DEF(movie_status, 0x6F95C)
 DEF(levent_table,0xFF96C750)
+DEF(playrec_mode,0x56EC) // "MenuIn"

trunk/platform/ixus50_sd400/sub/101b/stubs_min.S

@@ -1 +1 @@
 #include "stubs_asm.h"
 
-//DEF(physw_status, 0xFB20)
 DEF(physw_status, 0xFBB0) // from wrap_kbd_p1_f + 0x10 OK!
 DEF(led_table, 0xFDC8) // In aLedcon Data section OK!
@@ -14 +13 @@
 DEF(movie_status, 0x6F95C)
 DEF(levent_table,0xFF96C7A4)
+DEF(playrec_mode,0x56EC)

trunk/platform/ixus700_sd500/main.c

@@ -208 +208 @@
     int mode, i, t=0xFF;
 // play/rec without override
-    mode  = (physw_status[0]&0x0F)==0x0B ?  MODE_PLAY : MODE_REC;
-
-// not found
-//    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY;
+//    mode  = (physw_status[0]&0x0F)==0x0B ?  MODE_PLAY : MODE_REC;
+
+// note: different from later cams
+    mode = (playrec_mode==1)?MODE_REC:MODE_PLAY;
 
     _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4);

trunk/platform/ixus700_sd500/sub/101a/stubs_min.S

@@ -17 +17 @@
 DEF(second_ext_for_dng, 0x8030)
 DEF(levent_table,0xFF962594)
+DEF(playrec_mode,0x5378) // "MenuIn"

trunk/platform/ixus700_sd500/sub/101b/stubs_min.S

@@ -16 +16 @@
 DEF(second_ext_for_dng, 0x8030)
 DEF(levent_table,0xFF9625E4)
+DEF(playrec_mode,0x5378) // "MenuIn"