Changeset 831


Ignore:
Timestamp:
11/08/09 06:56:41 (4 years ago)
Author:
reyalp
Message:
  • update playrec_mode check to treat 4 (canon menu open in shoot mode) as rec mode for the cameras that use it. Also check for 5 on cameras that didn't previously check. See ​http://chdk.setepontos.com/index.php/topic,2468.msg42154.html#msg42154
  • use playrec_mode instead of physw bits on ixus980_sd990
  • remove obsolete raw stuff from a2000
  • remove beta label from SX10 100c, 101b, 102b, 103a
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r829 r831  
    240240        mv $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER)_BETA.zip 
    241241        mv $(topdir)bin/$(VER)-sx1-201a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-201a-$(BUILD_NUMBER)_BETA.zip 
    242         mv $(topdir)bin/$(VER)-sx10-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx10-100c-$(BUILD_NUMBER)_BETA.zip      
    243         mv $(topdir)bin/$(VER)-sx10-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx10-101b-$(BUILD_NUMBER)_BETA.zip 
    244         mv $(topdir)bin/$(VER)-sx10-102b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx10-102b-$(BUILD_NUMBER)_BETA.zip 
    245         mv $(topdir)bin/$(VER)-sx10-103a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx10-103a-$(BUILD_NUMBER)_BETA.zip 
    246242        mv $(topdir)bin/$(VER)-sx200is-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx200is-100c-$(BUILD_NUMBER)_BETA.zip        
    247243        mv $(topdir)bin/$(VER)-sx200is-100d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx200is-100d-$(BUILD_NUMBER)_BETA.zip        
    … …  
    373369        mv $(topdir)bin/sx1-201a-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx1-201a-$(BUILD_NUMBER)-full_BETA.zip 
    374370        mv $(topdir)bin/sx1-201a-$(BUILD_NUMBER).zip $(topdir)bin/sx1-201a-$(BUILD_NUMBER)_BETA.zip 
    375         mv $(topdir)bin/sx10-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx10-100c-$(BUILD_NUMBER)-full_BETA.zip 
    376         mv $(topdir)bin/sx10-100c-$(BUILD_NUMBER).zip $(topdir)bin/sx10-100c-$(BUILD_NUMBER)_BETA.zip 
    377         mv $(topdir)bin/sx10-101b-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx10-101b-$(BUILD_NUMBER)-full_BETA.zip 
    378         mv $(topdir)bin/sx10-101b-$(BUILD_NUMBER).zip $(topdir)bin/sx10-101b-$(BUILD_NUMBER)_BETA.zip 
    379         mv $(topdir)bin/sx10-102b-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx10-102b-$(BUILD_NUMBER)-full_BETA.zip 
    380         mv $(topdir)bin/sx10-102b-$(BUILD_NUMBER).zip $(topdir)bin/sx10-102b-$(BUILD_NUMBER)_BETA.zip 
    381         mv $(topdir)bin/sx10-103a-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx10-103a-$(BUILD_NUMBER)-full_BETA.zip 
    382         mv $(topdir)bin/sx10-103a-$(BUILD_NUMBER).zip $(topdir)bin/sx10-103a-$(BUILD_NUMBER)_BETA.zip 
    383371        mv $(topdir)bin/sx200is-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx200is-100c-$(BUILD_NUMBER)-full_BETA.zip 
    384372        mv $(topdir)bin/sx200is-100c-$(BUILD_NUMBER).zip $(topdir)bin/sx200is-100c-$(BUILD_NUMBER)_BETA.zip 

  • trunk/platform/a2000/main.c

    r799 r831  
    6060        int mode, i, t=0xFF; 
    6161         
    62         mode  = (playrec_mode==2 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     62        mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    6363                mode |= (physw_status[1] & 0x01000000)?0:MODE_SCREEN_OPENED; 
    6464                mode |= (physw_status[1] & 0x00080000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/a2000/sub/100c/lib.c

    r797 r831  
    4545 
    4646 
    47 void *hook_raw_fptr() 
    48 { 
    49         // found at ROM:FFE46CBC 
    50         return 0xEC04F0; 
    51 } 
    52  
    53 void *hook_raw_ret_addr() 
    54 { 
    55         return (void*)0; // What does this do? Doesn't seem to be called 
    56 } 
    57  
    58  
    5947long vid_get_bitmap_screen_width() 
    6048{ 

  • trunk/platform/g7/main.c

    r515 r831  
    7171    int mode, i, t=0xFF; 
    7272 
    73     mode  = (playrec_mode==2)?MODE_REC:MODE_PLAY; 
     73    mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    7474     
    7575    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/g9/main.c

    r576 r831  
    9393    int mode, i, t=0xFF; 
    9494 
    95     mode  = (playrec_mode==2)?MODE_REC:MODE_PLAY;                
     95    mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    9696         
    9797    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/ixus75_sd750/main.c

    r807 r831  
    6868    int mode, i, t=0xFF; 
    6969 
    70     mode  = (playrec_mode==2 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     70    mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    7171//    mode  = (physw_status[2] & 0x4000)?MODE_REC:MODE_PLAY;     
    7272    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/ixus870_sd880/main.c

    r760 r831  
    6363        int mode, i, t=0xFF; 
    6464         
    65         mode  = (playrec_mode==2 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     65        mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    6666         
    6767        _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/ixus980_sd990/main.c

    r740 r831  
    9898int mode_get() { 
    9999    int mode, i, t=0xFF; 
    100     mode  = (physw_status[0] & 0x00200000)?MODE_REC:MODE_PLAY; 
     100 
     101        mode  = (playrec_mode==2 || playrec_mode == 4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     102//    mode  = (physw_status[0] & 0x00200000)?MODE_REC:MODE_PLAY; 
    101103 
    102104    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/s3is/main.c

    r515 r831  
    8383    int mode, i, t=0xFF; 
    8484 
    85     mode  = (playrec_mode==2 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     85    mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    8686    mode |= (physw_status[1] & 0x00000001)?0:MODE_SCREEN_OPENED; 
    8787    mode |= (physw_status[1] & 0x00000002)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/sx1/main.c

    r736 r831  
    6363        int mode, i, t=0xFF; 
    6464         
    65         mode  = (playrec_mode==2 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     65        mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    6666        mode |= (physw_status[1] & 0x01000000)?0:MODE_SCREEN_OPENED; 
    6767        mode |= (physw_status[1] & 0x00080000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/sx10/main.c

    r736 r831  
    6363        int mode, i, t=0xFF; 
    6464         
    65         mode  = (playrec_mode==2 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     65        mode  = (playrec_mode==2 || playrec_mode == 4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    6666        mode |= (physw_status[1] & 0x01000000)?0:MODE_SCREEN_OPENED; 
    6767        mode |= (physw_status[1] & 0x00080000)?0:MODE_SCREEN_ROTATED; 

  • trunk/platform/sx100is/main.c

    r596 r831  
    8686    int mode, i, t=0xFF; 
    8787 
    88     mode  = (playrec_mode==2 || playrec_mode==5)?MODE_REC:MODE_PLAY;  
     88    mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY;  
    8989 
    9090     

  • trunk/platform/sx110is/main.c

    r822 r831  
    6060        int mode, i, t=0xFF; 
    6161         
    62         mode  = (playrec_mode==2 || 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; 
     63        mode |= (physw_status[1] & 0x01000000)?0:MODE_SCREEN_OPENED; 
     64        mode |= (physw_status[1] & 0x00080000)?0:MODE_SCREEN_ROTATED; 
    6565         
    6666        _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 

  • trunk/platform/sx200is/main.c

    r810 r831  
    116116int mode_get() { 
    117117    int mode, i, t=0xFF; 
    118     mode  = (playrec_mode==2 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
     118    mode  = (playrec_mode==2 || playrec_mode==4 || playrec_mode==5)?MODE_REC:MODE_PLAY; 
    119119 
    120120    _GetPropertyCase(PROPCASE_SHOOTING_MODE, &t, 4); 
Note: See TracChangeset for help on using the changeset viewer.