Changeset 1646


Ignore:
Timestamp:
02/05/12 22:08:30 (2 years ago)
Author:
reyalp
Message:

Merged revision(s) 1643-1645 from branches/release-1_0:
a1100 - override _GetBatteryTemperature with dummy to prevent crash
a1100 - undef CAM_EXT_TV_RANGE since it obviously isn't implemented, update notes
a1100 - use undef instead of define 0 for clarity

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/platform/a1100/lib.c

    r1233 r1646  
    4444 return 122;  
    4545} 
     46 
     47/* 
     48GetBatteryTemperature usually will get back temperature of battery compartment/batteries. GetBatteryTemperature is implemented in Canon's firmware for SX120IS. 
     49Firmware entry point is identified but function is not usable.  
     50Camera will crash if Canon's GetBatteryTemperature is called by CHDK. 
     51To avoid a crash Canon's GetBatteryTemperature must not called. As long CHDK general code do not distinguish between cameras that support or don't support GetBatteryTemperature,  
     52this function will be implemented as specific CHDK-code. It returns always with -99 
     53This overrides original canon entry point from stubs_entry.S 
     54*/ 
     55int _GetBatteryTemperature() 
     56{ 
     57      return -99; 
     58} 
     59 
  • trunk/platform/a1100/notes.txt

    r1233 r1646  
    99 
    1010version -> [func.set]+[down] 
     11 
     12Battery temperature is not available on this camera, always returns -99 
     13 
     14Optical zoom in video does not work 
     15 
     16Extra long exposures (>64 seconds) not implemented 
  • trunk/platform/a1100/platform_camera.h

    r1641 r1646  
    3838    #undef  DEFAULT_RAW_EXT  
    3939    #define DEFAULT_RAW_EXT                 2  // use .CR2  
    40     #define CAM_EXT_TV_RANGE                0 
    41     #define CAM_AF_SCAN_DURING_VIDEO_RECORD 0 
    42     #define CAM_CAN_MUTE_MICROPHONE         0 
    43     #define CAM_EV_IN_VIDEO                 0 
     40    #undef CAM_EXT_TV_RANGE 
     41    #undef CAM_AF_SCAN_DURING_VIDEO_RECORD 
     42    #undef CAM_CAN_MUTE_MICROPHONE 
     43    #undef CAM_EV_IN_VIDEO 
    4444 
    4545    #undef  CAM_UNCACHED_BIT 
Note: See TracChangeset for help on using the changeset viewer.