Changeset 1056
- Timestamp:
- 02/13/11 23:49:23 (2 years ago)
- Location:
- trunk
- Files:
-
- 43 added
- 4 edited
-
Makefile (modified) (5 diffs)
-
core/kbd.c (modified) (1 diff)
-
include/camera.h (modified) (1 diff)
-
loader/ixus120_sd940 (added)
-
loader/ixus120_sd940/Makefile (added)
-
loader/ixus120_sd940/blobs.S (added)
-
loader/ixus120_sd940/entry.S (added)
-
loader/ixus120_sd940/main.c (added)
-
loader/ixus120_sd940/resetcode (added)
-
loader/ixus120_sd940/resetcode/Makefile (added)
-
loader/ixus120_sd940/resetcode/entry.S (added)
-
loader/ixus120_sd940/resetcode/main.c (added)
-
makefile.inc (modified) (1 diff)
-
platform/ixus120_sd940 (added)
-
platform/ixus120_sd940/Makefile (added)
-
platform/ixus120_sd940/kbd.c (added)
-
platform/ixus120_sd940/lib.c (added)
-
platform/ixus120_sd940/main.c (added)
-
platform/ixus120_sd940/notes.txt (added)
-
platform/ixus120_sd940/shooting.c (added)
-
platform/ixus120_sd940/sub (added)
-
platform/ixus120_sd940/sub/102c (added)
-
platform/ixus120_sd940/sub/102c/Makefile (added)
-
platform/ixus120_sd940/sub/102c/boot.c (added)
-
platform/ixus120_sd940/sub/102c/capt_seq.c (added)
-
platform/ixus120_sd940/sub/102c/lib.c (added)
-
platform/ixus120_sd940/sub/102c/makefile.inc (added)
-
platform/ixus120_sd940/sub/102c/movie_rec.c (added)
-
platform/ixus120_sd940/sub/102c/stubs_asm.h (added)
-
platform/ixus120_sd940/sub/102c/stubs_auto.S (added)
-
platform/ixus120_sd940/sub/102c/stubs_entry.S (added)
-
platform/ixus120_sd940/sub/102c/stubs_entry_2.S (added)
-
platform/ixus120_sd940/sub/102c/stubs_min.S (added)
-
platform/ixus120_sd940/sub/103c (added)
-
platform/ixus120_sd940/sub/103c/Makefile (added)
-
platform/ixus120_sd940/sub/103c/boot.c (added)
-
platform/ixus120_sd940/sub/103c/capt_seq.c (added)
-
platform/ixus120_sd940/sub/103c/lib.c (added)
-
platform/ixus120_sd940/sub/103c/makefile.inc (added)
-
platform/ixus120_sd940/sub/103c/movie_rec.c (added)
-
platform/ixus120_sd940/sub/103c/stubs_asm.h (added)
-
platform/ixus120_sd940/sub/103c/stubs_auto.S (added)
-
platform/ixus120_sd940/sub/103c/stubs_entry.S (added)
-
platform/ixus120_sd940/sub/103c/stubs_entry_2.S (added)
-
platform/ixus120_sd940/sub/103c/stubs_min.S (added)
-
platform/ixus120_sd940/sub/Makefile (added)
-
platform/ixus120_sd940/wrappers.c (added)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r1030 r1056 239 239 $(MAKE) -s --no-print-directory PLATFORM=g11 PLATFORMSUB=100l NO_INC_BUILD=1 firzipsub 240 240 $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 241 $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940 PLATFORMSUB=102c NO_INC_BUILD=1 firzipsub 242 $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940 PLATFORMSUB=103c NO_INC_BUILD=1 firzipsub 243 241 244 $(MAKE) -s --no-print-directory PLATFORM=a480 PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 242 245 $(MAKE) -s --no-print-directory PLATFORM=s90 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub … … 289 292 mv $(topdir)bin/$(VER)-s90-101c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-s90-101c-$(BUILD_NUMBER)_BETA.zip 290 293 mv $(topdir)bin/$(VER)-ixus100_sd780-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus100_sd780-100c-$(BUILD_NUMBER)_BETA.zip 294 mv $(topdir)bin/$(VER)-ixus120_sd940-103c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus120_sd940-102c-$(BUILD_NUMBER)_BETA.zip 295 mv $(topdir)bin/$(VER)-ixus120_sd940-103c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus120_sd940-103c-$(BUILD_NUMBER)_BETA.zip 296 291 297 mv $(topdir)bin/$(VER)-ixus85_sd770-100a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus85_sd770-100a-$(BUILD_NUMBER)_BETA.zip 292 298 mv $(topdir)bin/$(VER)-d10-100a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-d10-100a-$(BUILD_NUMBER)_BETA.zip … … 399 405 $(MAKE) -s --no-print-directory PLATFORM=g11 PLATFORMSUB=100l NO_INC_BUILD=1 firzipsubcomplete 400 406 $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 407 $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940 PLATFORMSUB=102c NO_INC_BUILD=1 firzipsubcomplete 408 $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940 PLATFORMSUB=103c NO_INC_BUILD=1 firzipsubcomplete 409 401 410 $(MAKE) -s --no-print-directory PLATFORM=a480 PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 402 411 $(MAKE) -s --no-print-directory PLATFORM=s90 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete … … 471 480 mv $(topdir)bin/ixus100_sd780-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus100_sd780-100c-$(BUILD_NUMBER)-full_BETA.zip 472 481 mv $(topdir)bin/ixus100_sd780-100c-$(BUILD_NUMBER).zip $(topdir)bin/ixus100_sd780-100c-$(BUILD_NUMBER)_BETA.zip 482 mv $(topdir)bin/ixus120_sd940-102c-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus120_sd940-102c-$(BUILD_NUMBER)-full_BETA.zip 483 mv $(topdir)bin/ixus120_sd940-102c-$(BUILD_NUMBER).zip $(topdir)bin/ixus120_sd940-102c-$(BUILD_NUMBER)_BETA.zip 484 mv $(topdir)bin/ixus120_sd940-103c-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus120_sd940-103c-$(BUILD_NUMBER)-full_BETA.zip 485 mv $(topdir)bin/ixus120_sd940-103c-$(BUILD_NUMBER).zip $(topdir)bin/ixus120_sd940-103c-$(BUILD_NUMBER)_BETA.zip 486 473 487 mv $(topdir)bin/s90-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/s90-100c-$(BUILD_NUMBER)-full_BETA.zip 474 488 mv $(topdir)bin/s90-100c-$(BUILD_NUMBER).zip $(topdir)bin/s90-100c-$(BUILD_NUMBER)_BETA.zip … … 594 608 $(MAKE) -s --no-print-directory PLATFORM=g11 PLATFORMSUB=100l NO_INC_BUILD=1 clean 595 609 $(MAKE) -s --no-print-directory PLATFORM=ixus100_sd780 PLATFORMSUB=100c NO_INC_BUILD=1 clean 610 $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940 PLATFORMSUB=102c NO_INC_BUILD=1 clean 611 $(MAKE) -s --no-print-directory PLATFORM=ixus120_sd940 PLATFORMSUB=103c NO_INC_BUILD=1 clean 612 596 613 $(MAKE) -s --no-print-directory PLATFORM=a480 PLATFORMSUB=100b NO_INC_BUILD=1 clean 597 614 $(MAKE) -s --no-print-directory PLATFORM=s90 PLATFORMSUB=100c NO_INC_BUILD=1 clean -
trunk/core/kbd.c
r1036 r1056 41 41 #endif 42 42 43 #if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_ a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200)43 #if defined(CAMERA_a450) || defined(CAMERA_ixus50_sd400) || defined(CAMERA_ixusizoom_sd30) || defined(CAMERA_ixus40_sd300) || defined(CAMERA_ixus55_sd450) || defined(CAMERA_ixus60_sd600) || defined(CAMERA_ixus65_sd630) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus750_sd550) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus900_sd900) || defined(CAMERA_ixus75_sd750) || defined(CAMERA_a470) || defined(CAMERA_ixus90_sd790) || defined(CAMERA_ixus100_sd780) || defined(CAMERA_ixus120_sd940) || defined(CAMERA_a480) || defined(CAMERA_d10) || defined(CAMERA_ixus85_sd770) || defined(CAMERA_ixus95_sd1200) 44 44 45 45 #define ZSTEP_TABLE_SIZE 7 -
trunk/include/camera.h
r1055 r1056 3235 3235 //---------------------------------------------------------- 3236 3236 3237 #elif defined (CAMERA_ixus120_sd940) 3238 #define CAM_DRYOS_2_3_R39 1 //stat is different, as well as some other functions 3239 #define SYNCHABLE_REMOTE_NOT_ENABLED 1 3240 #define CAM_PROPSET 3 3241 #define CAM_DRYOS 1 3242 3243 #define CAM_RAW_ROWPIX 4080 // 12M 41044080 ?? // from calcs see 100C lib.c 3244 #define CAM_RAW_ROWS 3048 // " " " " " 3245 3246 #undef CAM_SWIVEL_SCREEN 3247 #define CAM_ADJUSTABLE_ALT_BUTTON 0 3248 #define CAM_CAN_SD_OVER_NOT_IN_MF 1 3249 #define CAM_CAN_UNLOCK_OPTICAL_ZOOM_IN_VIDEO 1 3250 #define CAM_HAS_VIDEO_BUTTON 1 3251 #define CAM_VIDEO_QUALITY_ONLY 1 3252 #define CAM_AF_SCAN_DURING_VIDEO_RECORD 1 3253 #define CAM_BRACKETING 1 3254 #undef CAM_VIDEO_CONTROL 3255 #undef CAM_HAS_IRIS_DIAPHRAGM 3256 #define CAM_MULTIPART 1 3257 #undef CAM_HAS_JOGDIAL 3258 #undef CAM_USE_ZOOM_FOR_MF 3259 #undef CAM_UNCACHED_BIT // shut up compiler 3260 #define CAM_UNCACHED_BIT 0x40000000 3261 #define CAM_HAS_ND_FILTER 1 3262 #define CAM_CAN_SD_OVERRIDE 1 3263 3264 #define DNG_SUPPORT 1 3265 // pattern 3266 #define cam_CFAPattern 0x02010100 // Red Green Green Blue 3267 // color 3268 3269 #undef CAM_BITMAP_PALETTE 3270 #define CAM_BITMAP_PALETTE 3 3271 3272 #define CAM_COLORMATRIX1 \ 3273 827547, 1000000, -290458, 1000000, -126086, 1000000, \ 3274 -12829, 1000000, 530507, 1000000, 50537, 1000000, \ 3275 5181, 1000000, 48183, 1000000, 245014, 1000000 3276 3277 #define cam_CalibrationIlluminant1 1 // Daylight 3278 // cropping 3279 #define CAM_JPEG_WIDTH 4000 3280 #define CAM_JPEG_HEIGHT 3000 3281 #define CAM_ACTIVE_AREA_X1 20 3282 #define CAM_ACTIVE_AREA_Y1 12 3283 #define CAM_ACTIVE_AREA_X2 4056 3284 #define CAM_ACTIVE_AREA_Y2 3038 3285 // camera name 3286 #define PARAM_CAMERA_NAME 4 // parameter number for GetParameterData 3287 #undef CAM_SENSOR_BITS_PER_PIXEL 3288 #undef CAM_WHITE_LEVEL 3289 #undef CAM_BLACK_LEVEL 3290 #define CAM_SENSOR_BITS_PER_PIXEL 12 3291 #define CAM_WHITE_LEVEL ((1<<CAM_SENSOR_BITS_PER_PIXEL)-1) 3292 #define CAM_BLACK_LEVEL 127 3293 3294 #define CAM_EXT_TV_RANGE 1 3295 3296 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 3297 3298 //nandoide sept-2009 3299 #undef CAM_USES_ASPECT_CORRECTION 3300 #undef CAM_USES_ASPECT_YCORRECTION 3301 #define CAM_USES_ASPECT_CORRECTION 1 //camera uses the modified graphics primitives to map screens an viewports to buffers more sized 3302 #define CAM_USES_ASPECT_YCORRECTION 0 //only uses mappings on x coordinate 3303 3304 3305 #undef ASPECT_XCORRECTION 3306 #define ASPECT_XCORRECTION(x) (((x)<<1)) //correction x*screen_buffer_width/screen_width 3307 #undef ASPECT_GRID_XCORRECTION 3308 #define ASPECT_GRID_XCORRECTION(x) ( (x) ) //grids are designed on a 360x240 basis 3309 #undef ASPECT_GRID_YCORRECTION 3310 #define ASPECT_GRID_YCORRECTION(y) ( (y) ) //y correction for grids made on a 360x240 As the buffer is 720x240 we have no correction here. 3311 3312 #undef ASPECT_VIEWPORT_XCORRECTION 3313 #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 3314 #undef ASPECT_VIEWPORT_YCORRECTION 3315 #define ASPECT_VIEWPORT_YCORRECTION(y) ( (y) ) 3316 #undef EDGE_HMARGIN 3317 #define EDGE_HMARGIN 20 3318 3319 //games mappings 3320 // renamed GAMES_SCREEN_WIDTH / GAMES_SCREEN_HEIGHT 3321 #undef GAMES_SCREEN_WIDTH 3322 #undef GAMES_SCREEN_HEIGHT 3323 #define GAMES_SCREEN_WIDTH 360 3324 #define GAMES_SCREEN_HEIGHT 240 3325 #undef ASPECT_GAMES_XCORRECTION 3326 // 720/360=2 same aspect than grids and viewport but another approach: there is a lot of corrections to do in game's code, and we decide to paint directly on display buffer wirh another resolution 3327 // used by gui.c that configures the draw environment (trhough new draw_gui function) depending on gui_mode: we have then 360x240 for games (but deformed output:circles are not circles) and 320x240 for 3328 // other modes in perfect aspect ratio 4/3: slightly better visualization: file menus more readable, ... 3329 #define ASPECT_GAMES_XCORRECTION(x) ( ((x)<<1) ) 3330 #undef ASPECT_GAMES_YCORRECTION 3331 #define ASPECT_GAMES_YCORRECTION(y) ( (y) ) //none 3332 3333 //zebra letterbox for saving memory 3334 3335 #undef ZEBRA_HMARGIN0 3336 #define ZEBRA_HMARGIN0 30 //this 30 rows are not used by the display buffer is 720x240 effective, no 960x270, i.e. (270-240) reduction in widht possible but not done (more difficult to manage it and slower). 3337 3338 #define CAM_ZEBRA_ASPECT_ADJUST 1 3339 #define CAM_ZEBRA_NOBUF 1 3340 3341 #define CAM_CHDK_PTP 1 3342 3343 //---------------------------------------------------------- 3237 3344 3238 3345 #else -
trunk/makefile.inc
r1033 r1056 241 241 #PLATFORM=ixus100_sd780 242 242 #PLATFORMSUB=100c 243 244 PLATFORM=ixus120_sd940 245 PLATFORMSUB=102c 246 247 PLATFORM=ixus120_sd940 248 PLATFORMSUB=103c 243 249 244 250 #PLATFORM=ixus90_sd790
Note: See TracChangeset
for help on using the changeset viewer.
