Changeset 316


Ignore:
Timestamp:
03/05/08 09:09:48 (5 years ago)
Author:
cail
Message:

ixus65 support onto trunk
many bugs, but it works

Location:
trunk
Files:
1 added
9 edited
20 copied

Legend:

Unmodified
Added
Removed

  • trunk/core/gui.c

    r313 r316  
    3939// #define KEY_NONE (KEY_DUMMY+1) 
    4040 
    41 #if   defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus55_sd450) 
     41#if   defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus55_sd450) 
    4242//Alt mode 
    4343 #define SHORTCUT_TOGGLE_RAW          KEY_DISPLAY 

  • trunk/core/gui_osd.c

    r313 r316  
    469469    //long lfpfl=lens_get_focus_pos_fl(); 
    470470 
    471 #if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus950_sd850) || defined(CAMERA_a460) || defined(CAMERA_ixus55_sd450) 
     471#if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus950_sd850) || defined(CAMERA_a460) || defined(CAMERA_ixus55_sd450) 
    472472    av=shooting_get_min_real_aperture(); 
    473473#else 

  • trunk/core/raw.h

    r313 r316  
    2727#define ROWS   2340   // for 7 MP 
    2828 
    29 #elif defined (CAMERA_a700) || defined (CAMERA_s3is) || defined (CAMERA_ixus800_sd700) 
     29#elif defined (CAMERA_a700) || defined (CAMERA_s3is) || defined (CAMERA_ixus65_sd630) || defined (CAMERA_ixus800_sd700) 
    3030#define ROWPIX 2888   // for 6 MP 
    3131#define ROWS   2136   // for 6 MP 

  • trunk/include/platform.h

    r311 r316  
    114114#endif 
    115115 
     116/* Keyboard repeat and initial delays */ 
     117#define KBD_REPEAT_DELAY  140 
     118#define KBD_INITIAL_DELAY 300 
     119 
    116120typedef struct { 
    117121    short id; // hacks id 

  • trunk/makefile.inc

    r313 r316  
    122122 
    123123# -msoft-float is used per default but object files are marked as hard-float 
    124 CFLAGS=-fno-inline -Os -fno-strict-aliasing 
     124CFLAGS=-fno-inline -Os -fno-strict-aliasing -msoft-float 
    125125# flags for gcc v4 
    126126# CFLAGS+=-mtune=arm946e-s 

  • trunk/platform/generic/kbd.c

    r295 r316  
    2626#endif 
    2727 
    28 #if defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) 
     28#if defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) 
    2929#define USB_MASK 0x8000000 
    3030#define USB_REG 1 

  • trunk/platform/generic/shooting.c

    r313 r316  
    182182 
    183183short shooting_get_real_aperture() { 
    184 //#if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus55_sd450) 
     184//#if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_ixus65_sd630) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus55_sd450) 
    185185//    return shooting_get_min_real_aperture(); 
    186186//#else 

  • trunk/platform/generic/wrappers.c

    r307 r316  
    429429 
    430430unsigned int GetFreeCardSpaceKb(void){ 
     431#if defined(CAMERA_ixus65_sd630) 
     432 return 0; 
     433#else 
    431434 return (_GetDrive_FreeClusters(0)*(_GetDrive_ClusterSize(0)>>9))>>1; 
     435#endif 
    432436} 
    433437 
    434438unsigned int GetTotalCardSpaceKb(void){ 
     439#if defined(CAMERA_ixus65_sd630) 
     440 return 0; 
     441#else 
    435442 return (_GetDrive_TotalClusters(0)*(_GetDrive_ClusterSize(0)>>9))>>1; 
     443#endif 
    436444} 
    437445 

  • trunk/platform/ixus65_sd630/kbd.c

    r279 r316  
    99#define SD_READONLY_FLAG (0x20000) 
    1010 
    11  
     11#define FEATURE_FEATHER 1 
    1212 
    1313typedef struct { 

  • trunk/platform/ixus65_sd630/lib.c

    r279 r316  
    11#include "../generic/lib.c" 
     2 
     3int get_flash_params_count(void){ 
     4 return 90; 
     5} 

  • trunk/platform/ixus65_sd630/sub/100a/Makefile

    r301 r316  
    88 
    99TARGET_PRIMARY = PRIMARY.BIN 
    10 OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o 
     10OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o 
    1111 
    1212libplatformsub.a: $(OBJS) 
    … …  
    2020 
    2121 
    22 stubs_auto.S: boot.c capt_seq.c movie_rec.c 
     22stubs_auto.S: boot.c capt_seq.c 
    2323        @echo $< \-\> $@ 
    24 ifeq ($(OSTYPE),Windows) 
    25         cat $^ | \ 
    26             grep 'BL\\?[[:space:]]*sub_[0-9A-Fa-f]' | \ 
    27             sed 's/.*sub_\\([0-9A-Fa-f]*\\).*/\\1/' | \ 
    28             $(SORT) | uniq | \ 
    29             awk 'BEGIN {print "/* THIS FILE IS GENERATED */\n#include \"stubs_asm.h\"\n"} \ 
    30                 {printf("STUB(%s)\n",$$1)}' > stubs_auto.S 
    31 else     
    32         cat $^ | \ 
    33             grep 'BL\?[[:space:]]*sub_[0-9A-Fa-f]' | \ 
    34             sed 's/.*sub_\([0-9A-Fa-f]*\).*/\1/' | \ 
    35             $(SORT) | uniq | \ 
    36             awk 'BEGIN {print "/* THIS FILE IS GENERATED */\n#include \"stubs_asm.h\"\n"} \ 
    37                 {printf("STUB(%s)\n",$$1)}' > stubs_auto.S 
    38 endif 
     24        # UNIX shell magick ) 
     25        echo '#include "stubs_asm.h"' > stubs_auto.S 
     26        cat boot.c capt_seq.c | perl stubs_auto_gen.pl >> stubs_auto.S 
    3927 
    4028stubs_entry.S: $(TARGET_PRIMARY) $(topdir)tools/signatures_$(PLATFORMOS).h 
    … …  
    4634          echo CAUTION! \'stubs_entry.S\' is not uptated due to target firmware binary not found! ; \ 
    4735          touch stubs_entry.S ; \ 
    48         fi ; \ 
     36        fi ; 
    4937        if [ "X`grep 'ERROR' stubs_entry.S`" != "X" ] ; then \ 
    5038          grep "ERROR" stubs_entry.S | sed -r "s/\/\/ ERROR: ([^ ]+) is not found.*/\1/" | $(SORT) | uniq > stubs_nf.names ; \ 
    5139          grep -E "NH?STUB" stubs_entry_2.S | sed -r "s/ *NH?STUB\( *([^ ,]+).*/\1/" | $(SORT) | uniq > stubs_mn.names ; \ 
    5240          comm -23 stubs_nf.names stubs_mn.names > stubs_not_found_names.err ; \ 
    53           rm -f stubs_nf.names stubs_mn.names ; \ 
     41#         rm -f stubs_nf.names stubs_mn.names ; \ 
    5442          if [ -s stubs_not_found_names.err ] ; then \ 
    5543            echo ERROR! There are unresolved addresses in \'stubs_entry.S\' \($(PLATFORM)-$(PLATFORMSUB)\) for the following names: ; \ 
    5644            cat stubs_not_found_names.err ; \ 
    5745            echo Please, add them into \'stubs_entry_2.S\' manually! ; \ 
    58             mv stubs_entry.S stubs_entry.S.err ; \ 
    59             exit 1 ; \ 
     46#           mv stubs_entry.S stubs_entry.S.err ; \ 
     47#           exit 1 ; \ 
    6048          fi ; \ 
    6149          rm -f stubs_not_found_names.err ; \ 

  • trunk/platform/ixus65_sd630/sub/100a/lib.c

    r282 r316  
    6868    return 240; 
    6969} 
     70 
     71char *camera_jpeg_count_str() 
     72{ 
     73    //TODO: fix this!! 
     74    return (char*)0x10B80; 
     75} 

  • trunk/platform/ixus65_sd630/sub/100a/makefile.inc

    r279 r316  
    11#0x30FE= 
    22PLATFORMID=12542 
     3 
     4PLATFORMOS=vxworks 
    35 
    46MEMBASEADDR=0x1900 

  • trunk/platform/ixus65_sd630/sub/100a/stubs_entry.S

    r279 r316  
    1414NSTUB(ExecuteEventProcedure, 0xff816bc8) 
    1515NSTUB(ExitTask, 0xff8219dc) 
     16NSTUB(Fclose_Fut, 0xff86984c) 
     17NSTUB(Fopen_Fut, 0xff869810) 
     18NSTUB(Fread_Fut, 0xff869930) 
    1619NSTUB(FreeMemory, 0xff811ad0) 
    1720NSTUB(FreeUncacheableMemory, 0xff814ce4) 
     21NSTUB(Fseek_Fut, 0xff869a18) 
     22NSTUB(Fwrite_Fut, 0xff869980) 
    1823NSTUB(GetCurrentAvValue, 0xffaccaa8) 
    1924NSTUB(GetCurrentTargetDistance, 0xffacca50) 
    2025// Best match: 96% 
    2126NSTUB(GetFocusLensSubjectDistance, 0xffabed90) 
     27// Best match: 92% 
     28NSTUB(GetFocusLensSubjectDistanceFromLens, 0xffabf330) 
    2229// Best match: 86% 
    2330NSTUB(GetParameterData, 0xff9786ac) 
    … …  
    4653NSTUB(PhySw_testgpio, 0xff828020) 
    4754NSTUB(ProtectFile, 0xff868e78) 
     55// Best match: 92% 
     56NSTUB(PutInNdFilter, 0xffacaac4) 
     57// ALT: NSTUB(PutInNdFilter, 0xffacaac4) // 25/2 
     58// ALT: NSTUB(PutInNdFilter, 0xffacc654) // 25/2 
     59// ALT: NSTUB(PutInNdFilter, 0xffacc654) // 25/2 
     60// ALT: NSTUB(PutInNdFilter, 0xffacc69c) // 25/2 
     61// ALT: NSTUB(PutInNdFilter, 0xffacc69c) // 25/2 
     62// Best match: 94% 
     63NSTUB(PutOutNdFilter, 0xffacab0c) 
     64// ALT: NSTUB(PutOutNdFilter, 0xffacab0c) // 16/1 
    4865NSTUB(Read, 0xff870600) 
    4966NSTUB(RefreshPhysicalScreen, 0xff98a644) 
    5067NSTUB(Remove, 0xff87058c) 
     68NSTUB(SetAutoShutdownTime, 0xff973778) 
    5169// Best match: 86% 
    5270NSTUB(SetParameterData, 0xff9785cc) 
    … …  
    148166NSTUB(vsprintf, 0xffb11278) 
    149167NSTUB(write, 0xffb125a0) 
    150 NSTUB(Fclose_Fut, 0xff86984c) 
    151 NSTUB(Fopen_Fut, 0xff869810) 
    152 NSTUB(Fread_Fut, 0xff869930) 
    153 NSTUB(Fseek_Fut, 0xff869a18) 
    154 NSTUB(Fwrite_Fut, 0xff869980) 
    155 // Best match: 78% 
    156 NSTUB(GetDrive_ClusterSize, 0xff86fd94) 
    157 // Best match: 73% 
    158 NSTUB(GetDrive_TotalClusters, 0xff86fd58) 
    159 // ALT: NSTUB(GetDrive_TotalClusters, 0xff86fd94) // 31/11 
    160 // Best match: 75% 
    161 NSTUB(GetDrive_FreeClusters, 0xff86fdd0) 
    162 NSTUB(fclose, 0xffb09bc0) 
    163 NSTUB(fdopen, 0xffb09cac) 
    164 NSTUB(feof, 0xffb09d18) 
    165 // ALT: NSTUB(feof, 0xffb09d84) // 17/0 
    166 NSTUB(ferror, 0xffb09d18) 
    167 // ALT: NSTUB(ferror, 0xffb09d84) // 17/0 
    168 NSTUB(fflush, 0xffb09eb0) 
    169 NSTUB(fgetc, 0xffb09f24) 
    170 NSTUB(fgetpos, 0xffb09fac) 
    171 NSTUB(fgets, 0xffb0a010) 
    172 NSTUB(fileno, 0xffb0a144) 
    173 NSTUB(fopen, 0xffb0a2c8) 
    174 NSTUB(fprintf, 0xffb0a35c) 
    175 NSTUB(fputs, 0xffb0a47c) 
    176 NSTUB(fread, 0xffb0a504) 
    177 NSTUB(freopen, 0xffb0a608) 
    178 NSTUB(fscanf, 0xffb0a7f0) 
    179 NSTUB(fseek, 0xffb0a898) 
    180 NSTUB(fsetpos, 0xffb0ac3c) 
    181 NSTUB(ftell, 0xffb0ac48) 
    182 NSTUB(fwrite, 0xffb0b068) 
    183 NSTUB(fstat, 0xffb0f980) 
    184 NSTUB(fstatfs, 0xffb0fa64) 
    185 NSTUB(fdprintf, 0xffb115dc) 
    186 NSTUB(free, 0xffb1551c) 

  • trunk/platform/ixus65_sd630/wrappers.c

    r279 r316  
    1010    return _GetCurrentTargetDistance(); 
    1111} 
     12 
     13long lens_get_focus_pos_from_lense() 
     14{ 
     15    return _GetFocusLensSubjectDistanceFromLens(); 
     16} 
Note: See TracChangeset for help on using the changeset viewer.