Changeset 739 for trunk


Ignore:
Timestamp:
04/18/09 06:11:23 (4 years ago)
Author:
phyrephox
Message:

+a470, port done by MrSpoon? - see ​http://chdk.setepontos.com/index.php/topic,3368.msg31068.html#msg31068 - beta

Location:
trunk
Files:
45 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r736 r739  
    207207        $(MAKE) -s --no-print-directory PLATFORM=ixus970_sd890  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
    208208        $(MAKE) -s --no-print-directory PLATFORM=ixus970_sd890  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
     209        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 
     210        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=102c NO_INC_BUILD=1 firzipsub 
    209211        @echo "**** All firmwares created successfully" 
    210212        @echo "**** Copying duplicate Firmwares" 
    … …  
    296298        $(MAKE) -s --no-print-directory PLATFORM=ixus970_sd890  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
    297299        $(MAKE) -s --no-print-directory PLATFORM=ixus970_sd890  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
     300        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=101b NO_INC_BUILD=1 firzipsubcomplete 
     301        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=102c NO_INC_BUILD=1 firzipsubcomplete 
    298302        @echo "**** All zipfiles including firmwares and extra stuff created successfully" 
    299303        @echo "**** Copying duplicate Firmwares" 
    … …  
    397401        $(MAKE) -s --no-print-directory PLATFORM=ixus970_sd890  PLATFORMSUB=100b NO_INC_BUILD=1 clean 
    398402        $(MAKE) -s --no-print-directory PLATFORM=ixus970_sd890  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
     403        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=101b NO_INC_BUILD=1 clean 
     404        $(MAKE) -s --no-print-directory PLATFORM=a470  PLATFORMSUB=102c NO_INC_BUILD=1 clean 
    399405 
    400406.PHONY: fir upload 

  • trunk/core/kbd.c

    r736 r739  
    8585#endif 
    8686 
    87 #if defined(CAMERA_a460) || defined(CAMERA_a530) || defined (CAMERA_a540) || defined(CAMERA_a550) || defined(CAMERA_a560) || defined(CAMERA_a570) || defined(CAMERA_a590) ||defined(CAMERA_ixus860_sd870) || defined(CAMERA_ixus960_sd950) || defined(CAMERA_ixus80_sd1100) || defined(CAMERA_ixus970_sd890) 
     87#if defined(CAMERA_a460) || defined(CAMERA_a470) || defined(CAMERA_a530) || defined (CAMERA_a540) || defined(CAMERA_a550) || defined(CAMERA_a560) || defined(CAMERA_a570) || defined(CAMERA_a590) ||defined(CAMERA_ixus860_sd870) || defined(CAMERA_ixus960_sd950) || defined(CAMERA_ixus80_sd1100) || defined(CAMERA_ixus970_sd890) 
    8888#define ZSTEP_TABLE_SIZE 8 
    8989static int nTxtbl[]={0,1,2,3,4,5,6,7}; 

  • trunk/include/camera.h

    r736 r739  
    201201 
    202202//---------------------------------------------------------- 
     203#elif defined (CAMERA_a470) 
     204        #define CAM_PROPSET                 2 
     205        #define CAM_DRYOS                   1 
     206 
     207    #define CAM_RAW_ROWPIX              3152   // for 7 MP 
     208    #define CAM_RAW_ROWS                2340   // for 7 MP 
     209 
     210        #define DNG_SUPPORT                 1 
     211        #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     212    #define CAM_EV_IN_VIDEO             1 
     213    // pattern 
     214    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue 
     215    // color 
     216    #define CAM_COLORMATRIX1                               \ 
     217      649324,  1000000,-233893, 1000000, -88521, 1000000,  \ 
     218     -158955,  1000000, 593407, 1000000,  69775, 1000000,  \ 
     219      -44551,  1000000, 136891, 1000000, 254362, 1000000    
     220     
     221    #define cam_CalibrationIlluminant1 1 // Daylight 
     222    // cropping 
     223    #define CAM_JPEG_WIDTH  2592 
     224    #define CAM_JPEG_HEIGHT 1944 
     225    #define CAM_ACTIVE_AREA_X1 6 
     226    #define CAM_ACTIVE_AREA_Y1 6 
     227    #define CAM_ACTIVE_AREA_X2 2618 
     228    #define CAM_ACTIVE_AREA_Y2 1962 
     229    // camera name 
     230    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 
     231    //#define DNG_EXT_FROM ".DPS"        
     232         
     233//---------------------------------------------------------- 
    203234#elif defined (CAMERA_a530) 
    204235    #define CAM_PROPSET                 1 

  • trunk/makefile.inc

    r738 r739  
    204204#PLATFORM=ixusizoom_sd30 
    205205#PLATFORMSUB=100g 
     206 
     207#PLATFORM=a470 
     208#PLATFORMSUB=102c 
     209 
     210#PLATFORM=a470 
     211#PLATFORMSUB=101b 
    206212 
    207213MEMISOSIZE="(&_end-&_start)" 

  • trunk/platform/sx1/sub/200h/makefile.inc

    r737 r739  
    1212PLFLAGS=-DMEMBASEADDR=$(MEMBASEADDR) -DMEMISOSTART=$(MEMISOSTART) -DMEMISOSIZE=$(MEMISOSIZE) 
    1313PLFLAGS+=-DRESTARTSTART=$(RESTARTSTART) 
    14 OPT_FI2=       // doesnt work, yet 
     14OPT_FI2=       # doesnt work, yet 
    1515NEED_ENCODED_DISKBOOT=yes 
    1616KEYSYS=d4 

  • trunk/tools/asmify.sh

    r515 r739  
    66sed 's/^\\(loc_[0-9A-F]*\\)$/\\1:/' | \ 
    77sed 's/^\\([[:space:]]*\\)DCD/\\1.long/' | \ 
    8 sed 's/^\\([[:space:]]*\\)\\(.*\\)$/\\1\ \"\\2\\\n\"/' 
     8sed 's/^\\([[:space:]]*\\)\\(.*\\)$/\\1\ \"\\2\\\n\"/' | \ 
     9sed -e 's/^loc_[0-9A-F]*/&:/' -e 's/[ ]*/&"/' -e 's/$/\\n"&/' 
Note: See TracChangeset for help on using the changeset viewer.