Changeset 835


Ignore:
Timestamp:
11/11/09 07:07:44 (4 years ago)
Author:
reyalp
Message:

Second part of play/rec mode override support. See ​http://chdk.kernreaktor.org/mantis/view.php?id=64

  • use playrec_mode variable to detect play/rec state on all cameras except a560, ixus40_sd300, ixus50_sd400, ixus700_sd500
  • remove extraneous swivel screen stuff from cameras that don't have swivel screen: a2000, a530, a700, a710, sx110
  • use PROPCASE_SHOOTING_MODE instead of hard coded number on a530, ixus55_sd450, ixus60_sd600, ixus65_sd630, ixus950_sd850, ixus_izoom_sd30, s5is
  • misc comments
Location:
trunk
Files:
36 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/lolevel.h

    r826 r835  
    160160 values: 
    161161  0 = startup in play 
    162   1 = unknown, possibly play<->rec transition 
     162  1 = unknown, appears to happen in first play<->rec transition 
    163163  2 = record mode 
    164164  4 = canon menu in record mode 
    … …  
    187187  See levent.c and levent.h for methods to identify events by name. 
    188188unk:  
    189   Unknown value, usually 0 in canon code. Strings indicate it would be a pointer if set 
     189  Unknown value, usually 0 in canon code. For jogdial messages, this is number of clicks. 
    190190return value: 
    191191  Unknown, possibly void. 

  • trunk/platform/a2000/main.c

    r831 r835  
    6060        int mode, i, t=0xFF; 
    6161         
    62         mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    63                 mode |= (physw_status[1] & 0x01000000)?0:MODE_SCREEN_OPENED; 
    64                 mode |= (physw_status[1] & 0x00080000)?0:MODE_SCREEN_ROTATED; 
     62        mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    6563         
    6664        _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/a450/main.c

    r515 r835  
    6767    int mode, i, t=0xFF; 
    6868                                                                          
    69     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY;            
    70 //    mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED;        
    71 //    mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED;       
     69// play/rec without override 
     70//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY;            
     71 
     72    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    7273     
    7374    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/a460/main.c

    r515 r835  
    6767    int mode, i, t=0xFF; 
    6868                                                                          
    69     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY;            
    70 //    mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED;        
    71 //    mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED;       
     69// play/rec without override 
     70//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY;            
     71 
     72    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     73 
    7274     
    7375    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/a470/main.c

    r807 r835  
    8383    int mode, i, t=0xFF; 
    8484 
    85     mode  = (physw_status[1] & 0x00000e00)?MODE_REC:MODE_PLAY; 
     85// play/rec without override 
     86//    mode  = (physw_status[1] & 0x00000e00)?MODE_REC:MODE_PLAY; 
     87 
     88    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    8689     
    8790    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/a530/main.c

    r515 r835  
    6060int mode_get() { 
    6161    int mode, i, t=0xFF; 
    62 /* 
    63     mode = (playrec_mode==1 || playrec_mode==2) ? MODE_REC : MODE_PLAY; 
    64     _GetPropertyCase(0, &t, 4); 
    65     for (i=0; i<MODESCNT; ++i) { 
    66         if (modemap[i].canonmode == t) { 
    67             return (mode | (modemap[i].hackmode & MODE_SHOOTING_MASK)); 
    68         } 
    69     } 
    70     return (mode); 
    71 */     
    7262 
    73     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
    74     mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    75     mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 
     63// play/rec without override 
     64//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
    7665 
    77     //_GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    78     _GetPropertyCase(0, &t, 4); 
     66    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     67 
     68 
     69    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7970    for (i=0; i<MODESCNT; ++i) { 
    8071        if (modemap[i].canonmode == t) { 

  • trunk/platform/a540/main.c

    r826 r835  
    7474    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    7575 
     76// play/rec without override 
    7677//    mode  = (physw_status[1] & 0x00000400)?MODE_REC:MODE_PLAY; 
    77   //  mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    78   //  mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 
    7978     
    8079    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/a550/main.c

    r515 r835  
    7575        int mode, i, t=0xFF; 
    7676 
    77         _GetPropertyCase(219, &t, 4); 
    78         //mode = (playrec_mode==1 || playrec_mode==2) ? MODE_REC : MODE_PLAY;   // a560                                                                                                                                                                  
    79         mode = (physw_status[1] & 0x00000040) ? MODE_REC : MODE_PLAY; //eb5ccdc0 ( 110111000000 ):eb5cc980 ( 100110000000 ) 
    80         mode |= (t == 270) ? MODE_SCREEN_ROTATED : 0; 
     77        //_GetPropertyCase(219, &t, 4); 
     78// play/rec without override 
     79//      mode = (physw_status[1] & 0x00000040) ? MODE_REC : MODE_PLAY; //eb5ccdc0 ( 110111000000 ):eb5cc980 ( 100110000000 ) 
     80 
     81    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     82 
     83        // wtf ? angle sensor != rotated screen 
     84        //mode |= (t == 270) ? MODE_SCREEN_ROTATED : 0; 
    8185        //mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    8286        //mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/a570/main.c

    r515 r835  
    7070    int mode, i, t=0xFF; 
    7171 
    72     mode  = (physw_status[1] & 0x02000000)?MODE_REC:MODE_PLAY; 
    73 /*    mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    74     mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 
    75 */     
     72// play/rec without override 
     73//    mode  = (physw_status[1] & 0x02000000)?MODE_REC:MODE_PLAY; 
     74 
     75    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     76 
    7677    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7778    for (i=0; i<MODESCNT; ++i) { 

  • trunk/platform/a590/main.c

    r592 r835  
    8989    int mode, i, t=0xFF; 
    9090 
    91         mode  = (physw_status[1] & 0x02000000)?MODE_REC:MODE_PLAY; 
     91// play/rec without override 
     92//      mode  = (physw_status[1] & 0x02000000)?MODE_REC:MODE_PLAY; 
     93 
     94    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    9295     
    9396    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/a610/main.c

    r515 r835  
    6262    int mode, i, t=0xFF; 
    6363 
    64     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     64// play/rec without override 
     65//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     66 
     67    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     68 
    6569    mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    6670    mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/a620/main.c

    r515 r835  
    6262    int mode, i, t=0xFF; 
    6363 
    64     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     64// play/rec without override 
     65//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     66 
     67    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     68 
    6569    mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    6670    mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/a630/main.c

    r515 r835  
    6262    int mode, i, t=0xFF; 
    6363 
    64     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     64// play/rec without override 
     65//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     66 
     67    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     68 
    6569    mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    6670    mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/a640/main.c

    r515 r835  
    6262    int mode, i, t=0xFF; 
    6363 
    64     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     64// play/rec without override 
     65//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     66 
     67    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     68 
    6569    mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    6670    mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/a650/main.c

    r515 r835  
    8585    int mode, i, t=0xFF; 
    8686 
    87     mode  = (physw_status[1] & 0x02000000)?MODE_PLAY:MODE_REC; 
     87// play/rec without override 
     88//    mode  = (physw_status[1] & 0x02000000)?MODE_PLAY:MODE_REC; 
     89 
     90    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     91 
    8892    mode |= (physw_status[0] & 0x04000000)?0:MODE_SCREEN_OPENED; 
    8993    mode |= (physw_status[0] & 0x08000000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/a700/main.c

    r515 r835  
    6767    int mode, i, t=0xFF; 
    6868 
    69     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
    70     mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    71     mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 
    72      
     69// play/rec without override 
     70//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     71 
     72    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     73 
    7374    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7475    for (i=0; i<MODESCNT; ++i) { 

  • trunk/platform/a710/main.c

    r515 r835  
    6767    int mode, i, t=0xFF; 
    6868 
    69     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
    70     mode |= (physw_status[2] & 0x00008000)?0:MODE_SCREEN_OPENED; 
    71     mode |= (physw_status[2] & 0x00004000)?0:MODE_SCREEN_ROTATED; 
    72      
     69// play/rec without override 
     70//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     71 
     72    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     73 
    7374    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7475    for (i=0; i<MODESCNT; ++i) { 

  • trunk/platform/a720/main.c

    r515 r835  
    8585    int mode, i, t=0xFF; 
    8686 
    87     mode  = (physw_status[1] & 0x02000000)?MODE_REC:MODE_PLAY; 
     87// play/rec without override 
     88//    mode  = (physw_status[1] & 0x02000000)?MODE_REC:MODE_PLAY; 
     89 
     90    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    8891     
    8992    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/ixus55_sd450/main.c

    r515 r835  
    5959    int mode, i, t=0xFF; 
    6060 
    61     mode  = (physw_status[1] & 0x2)?MODE_REC:MODE_PLAY;  
    62     _GetPropertyCase(0, &t, 4); 
     61// play/rec without override 
     62//    mode  = (physw_status[1] & 0x2)?MODE_REC:MODE_PLAY;  
     63 
     64    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     65 
     66    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    6367    for (i=0; i<MODESCNT; ++i) { 
    6468        if (modemap[i].canonmode == t) { 

  • trunk/platform/ixus60_sd600/main.c

    r796 r835  
    7575    int mode, i, t=0xFF; 
    7676 
    77     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     77// play/rec without override 
     78//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
    7879     
    79     _GetPropertyCase(0, &t, 4); 
     80    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     81 
     82    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    8083    for (i=0; i<MODESCNT; ++i) { 
    8184        if (modemap[i].canonmode == t) { 

  • trunk/platform/ixus65_sd630/main.c

    r515 r835  
    7474    int mode, i, t=0xFF; 
    7575 
    76     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     76// play/rec without override 
     77//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     78 
     79    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    7780     
    78     _GetPropertyCase(0, &t, 4); 
     81    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7982    for (i=0; i<MODESCNT; ++i) { 
    8083        if (modemap[i].canonmode == t) { 

  • trunk/platform/ixus700_sd500/main.c

    r515 r835  
    207207int mode_get() { 
    208208    int mode, i, t=0xFF; 
     209// play/rec without override 
    209210    mode  = (physw_status[0]&0x0F)==0x0B ?  MODE_PLAY : MODE_REC; 
    210     t=0xFF; 
     211 
     212// not found 
     213//    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     214 
    211215    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    212216    for (i=0; i<MODESCNT; ++i) { 

  • trunk/platform/ixus70_sd1000/main.c

    r515 r835  
    6666    int mode, i, t=0xFF; 
    6767 
    68     mode  = (physw_status[2] & 0x4000)?MODE_REC:MODE_PLAY;     
     68// play/rec without override 
     69//    mode  = (physw_status[2] & 0x4000)?MODE_REC:MODE_PLAY;     
     70 
     71    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     72 
    6973    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7074    for (i=0; i<MODESCNT; ++i) { 

  • trunk/platform/ixus750_sd550/main.c

    r515 r835  
    5858int mode_get() { 
    5959    int mode, i, t=0xFF; 
    60     mode  = (physw_status[1]&0x0F)==0x0B ?  MODE_PLAY : MODE_REC; 
    61     t=0xFF; 
     60 
     61// play/rec without override 
     62//    mode  = (physw_status[1]&0x0F)==0x0B ?  MODE_PLAY : MODE_REC; 
     63 
     64    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     65 
    6266    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    6367    for (i=0; i<MODESCNT; ++i) { 

  • trunk/platform/ixus800_sd700/main.c

    r515 r835  
    5959    int mode, i, t=0xFF; 
    6060 
    61     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY;     
     61// play/rec without override 
     62//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY;     
     63 
     64    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     65 
    6266    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    6367    for (i=0; i<MODESCNT; ++i) { 

  • trunk/platform/ixus80_sd1100/main.c

    r569 r835  
    9898int mode_get() { 
    9999    int mode, i, t=0xFF; 
    100     mode  = (physw_status[1] & 0x10000000)?MODE_PLAY:MODE_REC; 
     100 
     101// play/rec without override 
     102//    mode  = (physw_status[1] & 0x10000000)?MODE_PLAY:MODE_REC; 
     103 
     104    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    101105 
    102106    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/ixus850_sd800/main.c

    r515 r835  
    6666    int mode, i, t=0xFF; 
    6767 
    68     mode  = (physw_status[2] & 0x4000)?MODE_REC:MODE_PLAY;     
     68// play/rec without override 
     69//    mode  = (physw_status[2] & 0x4000)?MODE_REC:MODE_PLAY;     
     70 
     71    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     72 
    6973    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7074    for (i=0; i<MODESCNT; ++i) { 

  • trunk/platform/ixus860_sd870/main.c

    r515 r835  
    8787    int mode, i, t=0xFF; 
    8888 
    89     mode  = (physw_status[1] & 0x08000000)?MODE_PLAY:MODE_REC; 
     89// play/rec without override 
     90//    mode  = (physw_status[1] & 0x08000000)?MODE_PLAY:MODE_REC; 
     91 
     92    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    9093     
    9194    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/ixus950_sd850/main.c

    r515 r835  
    7171    int mode, i, t=0xFF; 
    7272 
    73     mode  = (physw_status[2] & 0x1000)?MODE_REC:MODE_PLAY;     
    74     _GetPropertyCase(49, &t, 4); 
     73// play/rec without override 
     74//    mode  = (physw_status[2] & 0x1000)?MODE_REC:MODE_PLAY;     
     75 
     76    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     77 
     78    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7579    for (i=0; i<MODESCNT; ++i) { 
    7680        if (modemap[i].canonmode == t) { 

  • trunk/platform/ixus960_sd950/main.c

    r515 r835  
    6969} 
    7070int mode_get() { 
    71 int mode, i, t=0xFF; 
    72 mode  = (physw_status[1] & 0x08000000)?MODE_PLAY:MODE_REC; 
    73 mode  = (physw_status[0] & 0x00000040)?MODE_REC:MODE_PLAY; 
    74   
    75 _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    76 for (i=0; i<MODESCNT; ++i) { 
    77 if (modemap[i].canonmode == t) { 
    78 return (mode | (modemap[i].hackmode & MODE_SHOOTING_MASK)); 
     71        int mode, i, t=0xFF; 
     72// why two ? 
     73/* 
     74        mode  = (physw_status[1] & 0x08000000)?MODE_PLAY:MODE_REC; 
     75        mode  = (physw_status[0] & 0x00000040)?MODE_REC:MODE_PLAY; 
     76*/ 
     77    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     78          
     79        _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
     80        for (i=0; i<MODESCNT; ++i) { 
     81                if (modemap[i].canonmode == t) { 
     82                        return (mode | (modemap[i].hackmode & MODE_SHOOTING_MASK)); 
     83                } 
     84        } 
     85        return (mode); 
    7986} 
    80 } 
    81 return (mode); 
    82 } 
     87 
    8388long get_vbatt_min() 
    8489{ 

  • trunk/platform/ixus970_sd890/main.c

    r807 r835  
    9797        int mode, i, t=0xFF; 
    9898 
    99         mode  = (physw_status[1] & 0x00010000) ? MODE_REC : MODE_PLAY; 
     99// play/rec without override ? This camera has play button, so not clear 
     100//      mode  = (physw_status[1] & 0x00010000) ? MODE_REC : MODE_PLAY; 
     101 
     102    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    100103 
    101104        _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/ixus980_sd990/main.c

    r831 r835  
    100100 
    101101        mode  = (playrec_mode==2 || playrec_mode == 4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     102// camera has play button, not sure what this was checking 
    102103//    mode  = (physw_status[0] & 0x00200000)?MODE_REC:MODE_PLAY; 
    103104 

  • trunk/platform/ixusizoom_sd30/main.c

    r621 r835  
    7070    int mode, i, t=0xFF; 
    7171 
    72     mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     72// play/rec without override 
     73//    mode  = (physw_status[2] & 0x00002000)?MODE_REC:MODE_PLAY; 
     74 
     75    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    7376     
    74     _GetPropertyCase(0, &t, 4); 
     77    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    7578    for (i=0; i<MODESCNT; ++i) { 
    7679        if (modemap[i].canonmode == t) { 

  • trunk/platform/s5is/main.c

    r691 r835  
    5959        int mode, i, t=0xFF; 
    6060         
    61         volatile int *physw_mmio = (int *) 0xC0220200; // I don't know where else I can find this... 
    62          
    63         mode  = (physw_mmio[1] & 0x00010000)?MODE_REC:MODE_PLAY; 
     61//      volatile int *physw_mmio = (int *) 0xC0220200; // I don't know where else I can find this... 
     62//      mode  = (physw_mmio[1] & 0x00010000)?MODE_REC:MODE_PLAY; 
     63 
     64    mode = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     65 
    6466        mode |= (physw_status[1] & 0x00000100)?0:MODE_SCREEN_OPENED; 
    6567        mode |= (physw_status[1] & 0x00000200)?0:MODE_SCREEN_ROTATED; 
    6668         
    67         _GetPropertyCase(49, &t, 4); 
     69        _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
    6870        for (i=0; i<MODESCNT; ++i) { 
    6971                if (modemap[i].canonmode == t) { 

  • trunk/platform/sx110is/main.c

    r831 r835  
    6161         
    6262        mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    63         mode |= (physw_status[1] & 0x01000000)?0:MODE_SCREEN_OPENED; 
    64         mode |= (physw_status[1] & 0x00080000)?0:MODE_SCREEN_ROTATED; 
    6563         
    6664        _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/tools/dancingbits.c

    r814 r835  
    1616unsigned char _chr_[VITALY][8] = { 
    1717                                                                        { 4,6,1,0,7,2,5,3 }, // original flavor 
    18                                                                         { 5,3,6,1,2,7,0,4 }, // nacho cheese sx200is, ixus100_sd780, ixu95_sd1200 
     18                                                                        { 5,3,6,1,2,7,0,4 }, // nacho cheese sx200is, ixus100_sd780, ixu95_sd1200, a1100 
    1919                                                                        { 2,5,0,4,6,1,3,7 }  // mesquite bbq ixus200_sd980 
    2020                                                                }; 
Note: See TracChangeset for help on using the changeset viewer.