Changeset 888


Ignore:
Timestamp:
04/26/10 05:11:52 (3 years ago)
Author:
reyalp
Message:

add s90 from err99 in 3 posts starting at ​http://chdk.setepontos.com/index.php/topic,650.msg49290.html#msg49290

Location:
trunk
Files:
55 added
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile

    r887 r888  
    231231        $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
    232232        $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 
     233        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 
     234        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub 
     235        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsub 
    233236        @echo "**** All firmwares created successfully" 
    234237        @echo "**** Copying duplicate Firmwares" 
    … …  
    248251        cp $(topdir)bin/$(VER)-ixus90_sd790-100d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus90_sd790-100e-$(BUILD_NUMBER).zip 
    249252        cp $(topdir)bin/$(VER)-g11-100j-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-g11-100k-$(BUILD_NUMBER).zip 
     253        cp $(topdir)bin/$(VER)-s90-101c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s90-101b-$(BUILD_NUMBER).zip 
    250254        mv $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER)_BETA.zip 
    251255        mv $(topdir)bin/$(VER)-sx1-201a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-201a-$(BUILD_NUMBER)_BETA.zip 
    … …  
    260264        mv $(topdir)bin/$(VER)-g11-100k-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-g11-100k-$(BUILD_NUMBER)_BETA.zip 
    261265        mv $(topdir)bin/$(VER)-g11-100l-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-g11-100l-$(BUILD_NUMBER)_BETA.zip 
     266        mv $(topdir)bin/$(VER)-s90-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s90-100c-$(BUILD_NUMBER)_BETA.zip 
     267        mv $(topdir)bin/$(VER)-s90-101a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s90-101a-$(BUILD_NUMBER)_BETA.zip 
     268        mv $(topdir)bin/$(VER)-s90-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s90-101b-$(BUILD_NUMBER)_BETA.zip 
     269        mv $(topdir)bin/$(VER)-s90-101c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s90-101c-$(BUILD_NUMBER)_BETA.zip 
    262270        mv $(topdir)bin/$(VER)-ixus100_sd780-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus100_sd780-100c-$(BUILD_NUMBER)_BETA.zip 
    263271        @echo "**** Done Copying duplicate Firmwares" 
    … …  
    362370        $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
    363371        $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 
     372        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 
     373        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 firzipsubcomplete 
     374        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 firzipsubcomplete 
    364375        @echo "**** All zipfiles including firmwares and extra stuff created successfully" 
    365376        @echo "**** Copying duplicate Firmwares" 
    … …  
    394405        cp $(topdir)bin/g11-100j-$(BUILD_NUMBER)-full.zip $(topdir)bin/g11-100k-$(BUILD_NUMBER)-full.zip 
    395406        cp $(topdir)bin/g11-100j-$(BUILD_NUMBER).zip $(topdir)bin/g11-100k-$(BUILD_NUMBER).zip 
     407        cp $(topdir)bin/s90-101c-$(BUILD_NUMBER).zip $(topdir)bin/s90-101b-$(BUILD_NUMBER).zip 
     408        cp $(topdir)bin/s90-101c-$(BUILD_NUMBER)-full.zip $(topdir)bin/s90-101b-$(BUILD_NUMBER)-full.zip 
    396409        mv $(topdir)bin/sx1-200h-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx1-200h-$(BUILD_NUMBER)-full_BETA.zip 
    397410        mv $(topdir)bin/sx1-200h-$(BUILD_NUMBER).zip $(topdir)bin/sx1-200h-$(BUILD_NUMBER)_BETA.zip 
    … …  
    420433        mv $(topdir)bin/ixus100_sd780-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus100_sd780-100c-$(BUILD_NUMBER)-full_BETA.zip 
    421434        mv $(topdir)bin/ixus100_sd780-100c-$(BUILD_NUMBER).zip $(topdir)bin/ixus100_sd780-100c-$(BUILD_NUMBER)_BETA.zip 
     435        mv $(topdir)bin/s90-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/s90-100c-$(BUILD_NUMBER)-full_BETA.zip 
     436        mv $(topdir)bin/s90-100c-$(BUILD_NUMBER).zip $(topdir)bin/s90-100c-$(BUILD_NUMBER)_BETA.zip 
     437        mv $(topdir)bin/s90-101a-$(BUILD_NUMBER)-full.zip $(topdir)bin/s90-101a-$(BUILD_NUMBER)-full_BETA.zip 
     438        mv $(topdir)bin/s90-101a-$(BUILD_NUMBER).zip $(topdir)bin/s90-101a-$(BUILD_NUMBER)_BETA.zip 
     439        mv $(topdir)bin/s90-101b-$(BUILD_NUMBER)-full.zip $(topdir)bin/s90-101b-$(BUILD_NUMBER)-full_BETA.zip 
     440        mv $(topdir)bin/s90-101b-$(BUILD_NUMBER).zip $(topdir)bin/s90-101b-$(BUILD_NUMBER)_BETA.zip 
     441        mv $(topdir)bin/s90-101c-$(BUILD_NUMBER)-full.zip $(topdir)bin/s90-101c-$(BUILD_NUMBER)-full_BETA.zip 
     442        mv $(topdir)bin/s90-101c-$(BUILD_NUMBER).zip $(topdir)bin/s90-101c-$(BUILD_NUMBER)_BETA.zip 
    422443        @echo "**** Done Copying duplicate Firmwares" 
    423444        @echo "**** Summary of memisosizes" 
    … …  
    519540        $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
    520541        $(MAKE) -s --no-print-directory PLATFORM=a480  PLATFORMSUB=100b NO_INC_BUILD=1 clean 
     542        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=100c NO_INC_BUILD=1 clean 
     543        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101a NO_INC_BUILD=1 clean 
     544        $(MAKE) -s --no-print-directory PLATFORM=s90  PLATFORMSUB=101c NO_INC_BUILD=1 clean 
    521545        .PHONY: fir upload 

  • trunk/core/gui.c

    r884 r888  
    25542554     if (x) { 
    25552555      get_property_case(PROPCASE_DIGITAL_ZOOM_POSITION, &x, sizeof(x)); 
    2556       if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM; 
     2556#if defined (CAMERA_s90) 
     2557          if (x==0) zoom_status=ZOOM_OPTICAL_MAX; //ERR99: No zoom back from digital to optical zoom possible if set to medium 
     2558#else 
     2559          if (x==0) zoom_status=ZOOM_OPTICAL_MEDIUM; 
     2560#endif 
     2561 
    25572562     } 
    25582563    } 

  • trunk/core/gui_menu.c

    r871 r888  
    5757     
    5858    num_lines = screen_height/rbf_font_height()-1; 
    59 #if defined (CAMERA_g11) 
     59#if defined (CAMERA_g11) || defined (CAMERA_s90) 
    6060    w = screen_width-10-10; 
    6161#else 
    … …  
    673673                if (lang_str(curr_menu->menu[imenu].text)[0]) { 
    674674                    j = rbf_str_width(lang_str(curr_menu->menu[imenu].text)); 
    675 #if defined (CAMERA_g11) 
     675#if defined (CAMERA_g11) || defined (CAMERA_s90) 
    676676                xx+=((int)w-j-len_space*2)>>1; 
    677677#else 

  • trunk/core/gui_osd.c

    r876 r888  
    5757#define ZEBRA_CANONOSD_BORDER_RESTORE   1 
    5858 
    59 #if defined (CAMERA_sx200is) || defined(CAMERA_g11) || defined (CAMERA_ixus100_sd780) 
     59#if defined (CAMERA_sx200is) || defined(CAMERA_g11) || defined (CAMERA_ixus100_sd780) || defined (CAMERA_s90) 
    6060  //there are no memory for that (the screen buffer is big): 960x270 
    6161  //TODO use a buffer of screen dimensions 
    … …  
    7676static int timer = 0; 
    7777static unsigned char *buf = NULL; 
    78 #if defined (CAMERA_sx200is) || defined(CAMERA_g11) || defined (CAMERA_ixus100_sd780) 
     78#if defined (CAMERA_sx200is) || defined(CAMERA_g11) || defined (CAMERA_ixus100_sd780) || defined (CAMERA_s90) 
    7979static int buffer_size; 
    8080#endif 
    … …  
    241241        if (!buf) { 
    242242            timer = 0; 
    243             #if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) //nandoide sept-2009 
     243            #if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) || defined (CAMERA_s90) //nandoide sept-2009 
    244244               buffer_size=screen_buffer_size-ZEBRA_HMARGIN0*screen_buffer_width; 
    245245               buf = malloc(buffer_size); 
    … …  
    255255            cur_buf_top = malloc(screen_buffer_width * ZFIX_TOP);  
    256256            cur_buf_bot = malloc(screen_buffer_width * ZFIX_BOTTOM);  
    257 #if defined (CAMERA_g11)                 
     257#if defined (CAMERA_g11) || defined (CAMERA_s90)                 
    258258            if (cur_buf_top) memset(cur_buf_top,0,screen_buffer_width * ZFIX_TOP); 
    259259            if (cur_buf_bot) memset(cur_buf_bot,0,screen_buffer_width * ZFIX_BOTTOM); 
    … …  
    372372// reyalp - TODO this SHOULD NOT BE CAMERA SPECIFIC. Should be generalized to work with all cameras 
    373373// having a copy/paste/modified version for individual cameras will be a maintenance nightmare. 
    374 #if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) 
     374#if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) || defined (CAMERA_s90) 
    375375//nandoide sept-2009  
    376376// viewport is 360x240 and screen buffer 960x270, we need to expand the x coordinate 

  • trunk/core/kbd.c

    r884 r888  
    124124#define ZSTEP_TABLE_SIZE 14 
    125125static int nTxtbl[]={0,1,2,3,4,5,6,7,8,9,10,11,12,13}; 
     126#endif 
     127#if defined(CAMERA_s90) 
     128#define ZSTEP_TABLE_SIZE 10 
     129static int nTxtbl[]={0,1,2,3,4,5,6,7,8,9}; 
    126130#endif 
    127131 

  • trunk/core/raw_merge.c

    r720 r888  
    88#include "lang.h" 
    99#include "conf.h" 
    10 #define TEMP_FILE        "raw16.tmp" 
     10#ifdef CAM_DRYOS_2_3_R39 
     11  #define TEMP_FILE        "A/raw16.tmp" 
     12#else 
     13  #define TEMP_FILE        "raw16.tmp" 
     14#endif 
    1115#define TEMP_FILE_NAME   "A/raw16.tmp" 
    1216#define TEMP_FILE_NAME_1 "A/raw16_1.tmp" 

  • trunk/include/camera.h

    r884 r888  
    23362336    #define CAM_PROPSET                 3 
    23372337    #define CAM_DRYOS                   1 
    2338  
     2338    #undef  CAM_USE_ZOOM_FOR_MF 
    23392339    #define CAM_RAW_ROWPIX              3744   // See g11 lib.c 
    23402340    #define CAM_RAW_ROWS                2784   // See g11 lib.c 
    … …  
    23722372        #undef GAMES_SCREEN_WIDTH 
    23732373        #undef GAMES_SCREEN_HEIGHT 
    2374         #define GAMES_SCREEN_WIDTH 720  // ERR99CHECK 
     2374        #define GAMES_SCREEN_WIDTH 360 
    23752375        #define GAMES_SCREEN_HEIGHT 240 
    23762376 
    … …  
    23972397    #undef EDGE_HMARGIN  
    23982398    #define EDGE_HMARGIN 20 
     2399 
     2400        /**** From SX200IS, ok for G11 ?*/ 
     2401    #define DNG_SUPPORT    1 
     2402    // pattern 
     2403    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue 
     2404    // color 
     2405    //need fixing ***************************************************** 
     2406    #define CAM_COLORMATRIX1                               \ 
     2407      14134, 1000000, -5576, 1000000, -1527, 1000000, \ 
     2408     -1991,  1000000, 10719,  1000000, 1273,   1000000, \ 
     2409      -1158,   1000000, 1929,   1000000, 3581,  1000000 
     2410    #define cam_CalibrationIlluminant1 17 // Standard Light A 
     2411 
     2412    // cropping 
     2413    #define CAM_JPEG_WIDTH  3600 
     2414    #define CAM_JPEG_HEIGHT 2700 
     2415    #define CAM_ACTIVE_AREA_X1 52 
     2416    #define CAM_ACTIVE_AREA_Y1 14 
     2417    #define CAM_ACTIVE_AREA_X2 3648 
     2418    #define CAM_ACTIVE_AREA_Y2 2736 
     2419          /**** From SX200IS, ok for G11 END?*/ 
     2420#elif defined (CAMERA_s90) 
     2421    #define CAM_DRYOS_2_3_R39                   1 
     2422    #define CAM_PROPSET                 3 
     2423    #define CAM_DRYOS                   1 
     2424    #undef  CAM_USE_ZOOM_FOR_MF 
     2425    #define CAM_RAW_ROWPIX              3744   // See g11 lib.c 
     2426    #define CAM_RAW_ROWS                2784   // See g11 lib.c 
     2427    #undef  CAM_EMUL_KEYPRESS_DURATION 
     2428    #define CAM_EMUL_KEYPRESS_DURATION  10 
     2429 
     2430        #define CAM_QUALITY_OVERRIDE 1 
     2431    #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 
     2432    #define CAM_HAS_JOGDIAL             1 
     2433    #undef  CAM_CONSOLE_LOG_ENABLED         // Development: internal camera stdout -> A/stdout.txt 
     2434    #define CAM_BRACKETING              1 
     2435    #define CAM_MULTIPART               1 
     2436    #define CAM_EXT_TV_RANGE            1 
     2437    #undef OPT_CURVES 
     2438    #undef CAM_UNCACHED_BIT 
     2439    #define CAM_UNCACHED_BIT            0x40000000  // S90 @FF8875FC(via ExMem.FreeCacheable) 
     2440 
     2441        #define CAM_SHOW_OSD_IN_SHOOT_MENU  1 
     2442 
     2443    // camera name 
     2444    #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 
     2445    #undef  CAM_SENSOR_BITS_PER_PIXEL 
     2446    #undef  CAM_WHITE_LEVEL 
     2447    #undef  CAM_BLACK_LEVEL 
     2448    #define CAM_SENSOR_BITS_PER_PIXEL   12 
     2449    #define CAM_WHITE_LEVEL             ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1) 
     2450    #define CAM_BLACK_LEVEL             127 
     2451 
     2452    #undef CAM_USES_ASPECT_CORRECTION    
     2453    #undef CAM_USES_ASPECT_YCORRECTION   
     2454    #define CAM_USES_ASPECT_CORRECTION  1  //camera uses the modified graphics primitives to map screens an viewports to buffers more sized  
     2455    #define CAM_USES_ASPECT_YCORRECTION  0  //only uses mappings on x coordinate 
     2456    //games mappings 
     2457        #undef GAMES_SCREEN_WIDTH 
     2458        #undef GAMES_SCREEN_HEIGHT 
     2459        #define GAMES_SCREEN_WIDTH 360 
     2460        #define GAMES_SCREEN_HEIGHT 240 
     2461 
     2462    #undef CAM_BITMAP_PALETTE 
     2463    #define CAM_BITMAP_PALETTE    4 
     2464 
     2465    #undef ASPECT_XCORRECTION 
     2466        #define ASPECT_XCORRECTION(x)  ( ( ((x)<<3) + (x) )  >>2 ) 
     2467        #undef ASPECT_GAMES_XCORRECTION  
     2468        #define ASPECT_GAMES_XCORRECTION(x)   ( ((x)<<1) )   
     2469        #undef ASPECT_GAMES_YCORRECTION 
     2470        #define ASPECT_GAMES_YCORRECTION(y)   ( (y) )  //none 
     2471 
     2472    #undef ASPECT_GRID_XCORRECTION 
     2473    #define ASPECT_GRID_XCORRECTION(x)  ( ((x)<<3)/9  )  //grids are designed on a 360x240 basis and screen is 320x240, we need x*320/360=x*8/9 
     2474    #undef ASPECT_GRID_YCORRECTION 
     2475    #define ASPECT_GRID_YCORRECTION(y)  ( (y) )       //y correction for grids  made on a 360x240 As the buffer is 720x240 we have no correction here. 
     2476 
     2477    #undef ASPECT_VIEWPORT_XCORRECTION  
     2478    #define ASPECT_VIEWPORT_XCORRECTION(x) ASPECT_GRID_XCORRECTION(x) //viewport is 360x240 and screen 320x240, we need x*320/360=x*8/9, equal than grids, used by edgeoverlay 
     2479    #undef ASPECT_VIEWPORT_YCORRECTION  
     2480    #define ASPECT_VIEWPORT_YCORRECTION(y) ( (y) )  
     2481    #undef EDGE_HMARGIN  
     2482    #define EDGE_HMARGIN 20 
     2483 
     2484        /**** From SX200IS, ok for S90 ?*/ 
     2485    #define DNG_SUPPORT    1 
     2486    // pattern 
     2487    #define cam_CFAPattern 0x02010100 // Red  Green  Green  Blue 
     2488    // color 
     2489    //need fixing ***************************************************** 
     2490    #define CAM_COLORMATRIX1                               \ 
     2491      14134, 1000000, -5576, 1000000, -1527, 1000000, \ 
     2492     -1991,  1000000, 10719,  1000000, 1273,   1000000, \ 
     2493      -1158,   1000000, 1929,   1000000, 3581,  1000000 
     2494    #define cam_CalibrationIlluminant1 17 // Standard Light A 
     2495 
     2496    // cropping 
     2497    #define CAM_JPEG_WIDTH  3600 
     2498    #define CAM_JPEG_HEIGHT 2700 
     2499    #define CAM_ACTIVE_AREA_X1 52 
     2500    #define CAM_ACTIVE_AREA_Y1 14 
     2501    #define CAM_ACTIVE_AREA_X2 3648 
     2502    #define CAM_ACTIVE_AREA_Y2 2736 
     2503    /**** From SX200IS, ok for S90 END?*/ 
    23992504#else 
    24002505    #error camera type not defined 

  • trunk/include/modelist.h

    r871 r888  
    9696MODE_SCN_LONG_SHUTTER   , // only known on sx1 
    9797MODE_LOWLIGHT           , // g11 
     98MODE_SCN_NOSTALGIC      , // s90 
    9899}; 
    99100#endif 

  • trunk/include/propset3.h

    r879 r888  
    4040#define PROPCASE_FLASH_SYNC_CURTAIN                     64 
    4141#define PROPCASE_METERING_MODE                          155 
    42 #define PROPCASE_WB_ADJ                               270 
     42#define PROPCASE_WB_ADJ                               271 
    4343#define PROPCASE_ASPECT_RATIO          294 
    4444#define PROPCASE_TIMER_MODE          225 

  • trunk/platform/generic/kbd.c

    r871 r888  
    4949#endif 
    5050 
     51#if defined(CAMERA_s90) 
     52#define USB_MASK (0x200000) 
     53#define USB_REG 2 
     54#endif 
    5155 
    5256long get_mmio(void) 

  • trunk/platform/generic/shooting.c

    r884 r888  
    731731// reyalp - this is related to http://chdk.setepontos.com/index.php/topic,3994.405.html 
    732732// TODO 
    733 #if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) || defined (CAMERA_a480) 
     733#if defined (CAMERA_sx200is) || defined (CAMERA_g11) || defined (CAMERA_ixus100_sd780) || defined (CAMERA_a480) || defined (CAMERA_s90) 
    734734   short n; 
    735735   // unlike other cameras, sx200 does set PROPCASE_DRIVE_MODE when in custom timer mode 
Note: See TracChangeset for help on using the changeset viewer.