Changeset 276
- Timestamp:
- 01/29/08 17:15:39 (5 years ago)
- Location:
- trunk
- Files:
-
- 22 added
- 13 edited
-
Makefile (modified) (2 diffs)
-
core/gui.c (modified) (8 diffs)
-
core/gui_calendar.c (modified) (1 diff)
-
core/gui_fselect.c (modified) (1 diff)
-
core/gui_reversi.c (modified) (2 diffs)
-
core/gui_sokoban.c (modified) (2 diffs)
-
core/raw.h (modified) (1 diff)
-
include/platform.h (modified) (1 diff)
-
loader/ixus70_sd1000/blobs.S (added)
-
loader/ixus70_sd1000/entry.S (added)
-
loader/ixus70_sd1000/main.c (added)
-
loader/ixus70_sd1000/resetcode/entry.S (added)
-
loader/ixus70_sd1000/resetcode/main.c (added)
-
makefile.inc (modified) (1 diff)
-
platform/generic/kbd.c (modified) (1 diff)
-
platform/generic/shooting.c (modified) (1 diff)
-
platform/ixus70_sd1000/Makefile (modified) (1 diff)
-
platform/ixus70_sd1000/kbd.c (added)
-
platform/ixus70_sd1000/lib.c (added)
-
platform/ixus70_sd1000/main.c (added)
-
platform/ixus70_sd1000/shooting.c (added)
-
platform/ixus70_sd1000/sub/102a (added)
-
platform/ixus70_sd1000/sub/102a/Makefile (added)
-
platform/ixus70_sd1000/sub/102a/boot.c (added)
-
platform/ixus70_sd1000/sub/102a/capt_seq.c (added)
-
platform/ixus70_sd1000/sub/102a/lib.c (added)
-
platform/ixus70_sd1000/sub/102a/makefile.inc (added)
-
platform/ixus70_sd1000/sub/102a/movie_rec.c (added)
-
platform/ixus70_sd1000/sub/102a/stubs_asm.h (added)
-
platform/ixus70_sd1000/sub/102a/stubs_auto.S (added)
-
platform/ixus70_sd1000/sub/102a/stubs_entry.S (added)
-
platform/ixus70_sd1000/sub/102a/stubs_entry_2.S (added)
-
platform/ixus70_sd1000/sub/102a/stubs_min.S (added)
-
platform/ixus70_sd1000/wrappers.c (added)
-
platform/ixus800_sd700/sub/101b/stubs_entry_2.S (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r264 r276 83 83 $(MAKE) -s --no-print-directory PLATFORM=ixus700_sd500 PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 84 84 $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700 PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 85 #$(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub 85 86 #$(MAKE) -s --no-print-directory PLATFORM=ixus40_sd300 PLATFORMSUB=100k NO_INC_BUILD=1 firzipsub 86 87 #$(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400 PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub 87 88 #$(MAKE) -s --no-print-directory PLATFORM=ixus65_sd630 PLATFORMSUB=100a NO_INC_BUILD=1 firzipsub 88 89 #$(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 90 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=102a NO_INC_BUILD=1 firzipsub 89 91 #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430 PLATFORMSUB=110a NO_INC_BUILD=1 firzipsub 90 92 $(MAKE) -s --no-print-directory PLATFORM=a720 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub … … 114 116 $(MAKE) -s --no-print-directory PLATFORM=ixus700_sd500 PLATFORMSUB=101b NO_INC_BUILD=1 clean 115 117 $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700 PLATFORMSUB=101b NO_INC_BUILD=1 clean 118 #$(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800 PLATFORMSUB=100e NO_INC_BUILD=1 clean 116 119 #$(MAKE) -s --no-print-directory PLATFORM=ixus40_sd300 PLATFORMSUB=100k NO_INC_BUILD=1 clean 117 120 #$(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400 PLATFORMSUB=101a NO_INC_BUILD=1 clean 118 121 #$(MAKE) -s --no-print-directory PLATFORM=ixus65_sd630 PLATFORMSUB=100a NO_INC_BUILD=1 clean 119 122 #$(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=101b NO_INC_BUILD=1 clean 123 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=102a NO_INC_BUILD=1 clean 120 124 #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430 PLATFORMSUB=110a NO_INC_BUILD=1 clean 121 125 $(MAKE) -s --no-print-directory PLATFORM=a720 PLATFORMSUB=100c NO_INC_BUILD=1 clean -
trunk/core/gui.c
r269 r276 38 38 // #define KEY_NONE (KEY_DUMMY+1) 39 39 40 #if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a560) 40 #if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) 41 41 #define SHORTCUT_TOGGLE_RAW KEY_DISPLAY 42 42 #define SHORTCUT_TOGGLE_HISTO KEY_DOWN … … 190 190 #endif 191 191 {LANG_MENU_MISC_SHOW_SPLASH, MENUITEM_BOOL, &conf.splash_show }, 192 #if !defined(CAMERA_g7) && !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) 192 #if !defined(CAMERA_g7) && !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) 193 193 {LANG_MENU_MISC_ZOOM_FOR_MF, MENUITEM_BOOL, &conf.use_zoom_mf }, 194 194 #endif … … 265 265 {LANG_MENU_VALUES_SHOW_BV_MEASURED, MENUITEM_BOOL, &conf.values_show_bv_measured}, 266 266 {LANG_MENU_VALUES_SHOW_OVEREXPOSURE, MENUITEM_BOOL, &conf.values_show_overexposure}, 267 #if !defined(CAMERA_a570) && !defined(CAMERA_a560) && !defined(CAMERA_a720) 267 #if !defined(CAMERA_a570) && !defined(CAMERA_a560) && !defined(CAMERA_a720) && !defined(CAMERA_ixus850_sd800) && !defined(CAMERA_ixus70_sd1000) 268 268 {LANG_MENU_SHOW_CANON_OVEREXPOSURE, MENUITEM_BOOL, &conf.values_show_canon_overexposure}, 269 269 #endif … … 290 290 {LANG_MENU_ISO_BRACKET_VALUE, MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.iso_bracket_value, MENU_MINMAX(0, 100)}, 291 291 {LANG_MENU_ISO_BRACKET_KOEF, MENUITEM_ENUM, (int*)gui_iso_bracket_koef_enum}, 292 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) 292 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) 293 293 {LANG_MENU_SUBJ_DIST_BRACKET_VALUE, MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.subj_dist_bracket_value, MENU_MINMAX(0, 100)}, 294 294 {LANG_MENU_SUBJ_DIST_BRACKET_KOEF, MENUITEM_ENUM, (int*)gui_subj_dist_bracket_koef_enum}, … … 320 320 {LANG_MENU_OVERRIDE_ISO_KOEF, MENUITEM_ENUM, (int*)gui_iso_override_koef_enum}, 321 321 // {LANG_MENU_OVERRIDE_SUBJ_DIST_VALUE, MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.subj_dist_override_value, MENU_MINMAX(0, 500)}, 322 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) 322 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) 323 323 {LANG_MENU_OVERRIDE_SUBJ_DIST_VALUE, MENUITEM_ENUM, (int*)gui_subj_dist_override_value_enum}, 324 324 {LANG_MENU_OVERRIDE_SUBJ_DIST_KOEF, MENUITEM_ENUM, (int*)gui_subj_dist_override_koef_enum}, … … 1172 1172 draw_restore(); 1173 1173 } else { 1174 #if !defined(CAMERA_g7) && !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) 1174 #if !defined(CAMERA_g7) && !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) 1175 1175 if (shooting_get_focus_mode()){ 1176 1176 if (kbd_is_key_clicked(KEY_RIGHT)) { … … 1339 1339 (m&MODE_SHOOTING_MASK)==MODE_VIDEO_MY_COLORS || 1340 1340 (m&MODE_SHOOTING_MASK)==MODE_VIDEO_COLOR_ACCENT || 1341 (m&MODE_SHOOTING_MASK)==MODE_VIDEO_TIME_LAPSE || 1341 1342 (m&MODE_SHOOTING_MASK)==MODE_STITCH); 1342 1343 … … 1400 1401 } 1401 1402 1402 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) 1403 if (gui_mode==GUI_MODE_NONE && kbd_is_key_pressed(KEY_SHOOT_HALF) && ((m&MODE_MASK)==MODE_REC) &&((m&MODE_SHOOTING_MASK))!=MODE_VIDEO_STD) {1403 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) 1404 if (gui_mode==GUI_MODE_NONE && kbd_is_key_pressed(KEY_SHOOT_HALF) && ((m&MODE_MASK)==MODE_REC) && ((m&MODE_SHOOTING_MASK))!=MODE_VIDEO_STD) { 1404 1405 strcpy(osd_buf,shooting_get_tv_str()); 1405 1406 strcat(osd_buf,"\" "); -
trunk/core/gui_calendar.c
r252 r276 111 111 need_redraw = 1; 112 112 break; 113 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_a560) 113 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_a560) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) 114 114 case KEY_DISPLAY: 115 115 #else -
trunk/core/gui_fselect.c
r254 r276 707 707 } 708 708 break; 709 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_a560) 709 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_a560) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) 710 710 case KEY_DISPLAY: 711 711 #else -
trunk/core/gui_reversi.c
r252 r276 378 378 need_redraw = 1; 379 379 break; 380 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_a560) 380 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_a560) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) 381 381 case KEY_DISPLAY: 382 382 #else … … 389 389 need_redraw = 1; 390 390 break; 391 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) 391 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) 392 392 case KEY_DISPLAY: 393 393 gui_mbox_init(LANG_MBOX_ABOUT_TITLE, (int)"REVERSI\n(c) GrAnd, 2007", MBOX_TEXT_CENTER, NULL); -
trunk/core/gui_sokoban.c
r252 r276 259 259 need_redraw = 1; 260 260 break; 261 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_a560) 261 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_a560) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) 262 262 case KEY_DISPLAY: 263 263 #else … … 267 267 need_redraw = 1; 268 268 break; 269 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) 269 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) 270 270 case KEY_DISPLAY: 271 271 gui_mbox_init(LANG_MBOX_ABOUT_TITLE, (int)"SOKOBAN\n(c) GrAnd, 2007", MBOX_TEXT_CENTER, NULL); -
trunk/core/raw.h
r264 r276 23 23 #define ROWS 2484 // for 8 MP 24 24 25 #elif defined (CAMERA_a620) || defined (CAMERA_a710) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_ixus700_sd500) 25 #elif defined (CAMERA_a620) || defined (CAMERA_a710) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) 26 26 #define ROWPIX 3152 // for 7 MP 27 27 #define ROWS 2340 // for 7 MP -
trunk/include/platform.h
r268 r276 38 38 MODE_VIDEO_HIRES , 39 39 MODE_SCN_AQUARIUM , 40 40 MODE_COLOR_ACCENT , 41 41 MODE_SCN_NIGHT1 , 42 42 MODE_SCN_ISO_3200 , 43 43 MODE_SCN_SPORT , 44 44 MODE_SCN_KIDS_PETS , 45 45 MODE_INDOOR , 46 46 MODE_KIDS_PETS , 47 47 MODE_NIGHT_SNAPSHOT , 48 48 MODE_DIGITAL_MACRO , 49 MODE_SCN_FOLIAGE , 50 MODE_VIDEO_TIME_LAPSE , 51 MODE_SCN_INDOOR , 49 52 }; 50 53 51 #if defined(CAMERA_a570) || defined(CAMERA_a560) || defined(CAMERA_a720) 54 #if defined(CAMERA_a570) || defined(CAMERA_a560) || defined(CAMERA_a720) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) 52 55 #define PROPCASE_DRIVE_MODE 102 53 56 #define PROPCASE_FOCUS_MODE 133 -
trunk/makefile.inc
r264 r276 42 42 #PLATFORM=a720 43 43 #PLATFORMSUB=100c 44 45 #PLATFORM=ixus850_sd800 46 #PLATFORMSUB=100e 47 48 #PLATFORM=ixus70_sd1000 49 #PLATFORMSUB=102a 44 50 45 51 include $(topdir)version.inc -
trunk/platform/generic/kbd.c
r269 r276 26 26 #endif 27 27 28 #if defined(CAMERA_a630) || defined(CAMERA_a640) || defined(CAMERA_a610) || defined(CAMERA_a620) || defined(CAMERA_ixus800_sd700) 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) 29 29 #define USB_MASK 0x8000000 30 30 #define USB_REG 1 -
trunk/platform/generic/shooting.c
r264 r276 812 812 if (bracketing.shoot_counter==0) { // first shoot 813 813 bracketing.shoot_counter=1; 814 #if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a560) 814 #if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus800_sd700) || defined(CAMERA_a560) || defined(CAMERA_ixus850_sd800) || defined(CAMERA_ixus70_sd1000) 815 815 bracketing.tv96=shooting_get_tv96(); 816 816 #else -
trunk/platform/ixus70_sd1000/Makefile
r251 r276 24 24 rm -f $(OBJS) libplatform.a 25 25 26 include $(topdir)bottom.inc -
trunk/platform/ixus800_sd700/sub/101b/stubs_entry_2.S
r254 r276 5 5 NHSTUB(kbd_pwr_on, 0xFF827ECC) 6 6 NHSTUB(kbd_pwr_off, 0xFF827F0C) 7 NHSTUB(GetCurrentAvValue, 0xFFAC4014) 7 8 8 9 // null stubs
Note: See TracChangeset
for help on using the changeset viewer.
