Changeset 312
- Timestamp:
- 03/01/08 22:25:31 (5 years ago)
- Location:
- trunk
- Files:
-
- 30 added
- 41 edited
-
Makefile (modified) (2 diffs)
-
core/conf.c (modified) (1 diff)
-
core/gui.c (modified) (9 diffs)
-
core/gui_lang.c (modified) (1 diff)
-
core/gui_lang.h (modified) (1 diff)
-
core/gui_osd.c (modified) (2 diffs)
-
core/gui_osd.h (modified) (1 diff)
-
include/conf.h (modified) (1 diff)
-
lang/english.lng (modified) (1 diff)
-
lib/ubasic/ubasic.c (modified) (1 diff)
-
loader/ixus850_sd800 (added)
-
loader/ixus850_sd800/Makefile (added)
-
loader/ixus850_sd800/blobs.S (added)
-
loader/ixus850_sd800/entry.S (added)
-
loader/ixus850_sd800/main.c (added)
-
loader/ixus850_sd800/resetcode (added)
-
loader/ixus850_sd800/resetcode/Makefile (added)
-
loader/ixus850_sd800/resetcode/entry.S (added)
-
loader/ixus850_sd800/resetcode/main.c (added)
-
platform/a460/sub/100d/boot.c (modified) (2 diffs)
-
platform/a560/sub/100a/boot.c (modified) (2 diffs)
-
platform/a570/sub/100e/boot.c (modified) (2 diffs)
-
platform/a570/sub/101a/boot.c (modified) (2 diffs)
-
platform/a610/sub/100e/boot.c (modified) (2 diffs)
-
platform/a610/sub/100f/boot.c (modified) (2 diffs)
-
platform/a620/sub/100f/boot.c (modified) (2 diffs)
-
platform/a630/sub/100c/boot.c (modified) (2 diffs)
-
platform/a640/sub/100b/boot.c (modified) (2 diffs)
-
platform/a640/sub/100b/stubs_auto.S (modified) (1 diff)
-
platform/a650/sub/100d/boot.c (modified) (2 diffs)
-
platform/a700/sub/100b/boot.c (modified) (2 diffs)
-
platform/a710/sub/100a/boot.c (modified) (2 diffs)
-
platform/a720/sub/100c/boot.c (modified) (2 diffs)
-
platform/a720/sub/100c/stubs_auto.S (modified) (1 diff)
-
platform/g7/sub/100e/boot.c (modified) (2 diffs)
-
platform/g7/sub/100g/boot.c (modified) (2 diffs)
-
platform/g7/sub/100i/boot.c (modified) (2 diffs)
-
platform/g7/sub/100j/boot.c (modified) (2 diffs)
-
platform/generic/shooting.c (modified) (19 diffs)
-
platform/ixus700_sd500/sub/101a/boot.c (modified) (2 diffs)
-
platform/ixus700_sd500/sub/101b/boot.c (modified) (2 diffs)
-
platform/ixus70_sd1000/sub/101b/boot.c (modified) (2 diffs)
-
platform/ixus70_sd1000/sub/102a/boot.c (modified) (2 diffs)
-
platform/ixus800_sd700/sub/100b/boot.c (modified) (2 diffs)
-
platform/ixus800_sd700/sub/101b/boot.c (modified) (2 diffs)
-
platform/ixus850_sd800 (added)
-
platform/ixus850_sd800/Makefile (added)
-
platform/ixus850_sd800/kbd.c (added)
-
platform/ixus850_sd800/lib.c (added)
-
platform/ixus850_sd800/main.c (added)
-
platform/ixus850_sd800/shooting.c (added)
-
platform/ixus850_sd800/sub (added)
-
platform/ixus850_sd800/sub/100e (added)
-
platform/ixus850_sd800/sub/100e/Makefile (added)
-
platform/ixus850_sd800/sub/100e/boot.c (added)
-
platform/ixus850_sd800/sub/100e/capt_seq.c (added)
-
platform/ixus850_sd800/sub/100e/lib.c (added)
-
platform/ixus850_sd800/sub/100e/makefile.inc (added)
-
platform/ixus850_sd800/sub/100e/movie_rec.c (added)
-
platform/ixus850_sd800/sub/100e/stubs_asm.h (added)
-
platform/ixus850_sd800/sub/100e/stubs_auto.S (added)
-
platform/ixus850_sd800/sub/100e/stubs_entry.S (added)
-
platform/ixus850_sd800/sub/100e/stubs_entry_2.S (added)
-
platform/ixus850_sd800/sub/100e/stubs_min.S (added)
-
platform/ixus850_sd800/sub/Makefile (added)
-
platform/ixus850_sd800/wrappers.c (added)
-
platform/s2is/sub/100e/boot.c (modified) (2 diffs)
-
platform/s2is/sub/100f/boot.c (modified) (2 diffs)
-
platform/s2is/sub/100g/boot.c (modified) (2 diffs)
-
platform/s3is/sub/100a/boot.c (modified) (2 diffs)
-
version.inc (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile
r309 r312 102 102 $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700 PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 103 103 $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700 PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 104 #$(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub105 #$(MAKE) -s --no-print-directory PLATFORM=ixus40_sd300 PLATFORMSUB=100k NO_INC_BUILD=1 firzipsub106 #$(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400 PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub107 #$(MAKE) -s --no-print-directory PLATFORM=ixus65_sd630 PLATFORMSUB=100a NO_INC_BUILD=1 firzipsub108 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub109 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=102a NO_INC_BUILD=1 firzipsub110 #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430 PLATFORMSUB=110a NO_INC_BUILD=1 firzipsub104 $(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800 PLATFORMSUB=100e NO_INC_BUILD=1 firzipsub 105 #$(MAKE) -s --no-print-directory PLATFORM=ixus40_sd300 PLATFORMSUB=100k NO_INC_BUILD=1 firzipsub 106 #$(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400 PLATFORMSUB=101a NO_INC_BUILD=1 firzipsub 107 #$(MAKE) -s --no-print-directory PLATFORM=ixus65_sd630 PLATFORMSUB=100a NO_INC_BUILD=1 firzipsub 108 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=101b NO_INC_BUILD=1 firzipsub 109 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=102a NO_INC_BUILD=1 firzipsub 110 #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430 PLATFORMSUB=110a NO_INC_BUILD=1 firzipsub 111 111 $(MAKE) -s --no-print-directory PLATFORM=a720 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 112 112 $(MAKE) -s --no-print-directory PLATFORM=a650 PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub … … 139 139 $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700 PLATFORMSUB=101b NO_INC_BUILD=1 clean 140 140 $(MAKE) -s --no-print-directory PLATFORM=ixus800_sd700 PLATFORMSUB=100b NO_INC_BUILD=1 clean 141 #$(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800 PLATFORMSUB=100e NO_INC_BUILD=1 clean142 #$(MAKE) -s --no-print-directory PLATFORM=ixus40_sd300 PLATFORMSUB=100k NO_INC_BUILD=1 clean143 #$(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400 PLATFORMSUB=101a NO_INC_BUILD=1 clean144 #$(MAKE) -s --no-print-directory PLATFORM=ixus65_sd630 PLATFORMSUB=100a NO_INC_BUILD=1 clean145 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=101b NO_INC_BUILD=1 clean146 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=102a NO_INC_BUILD=1 clean147 #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430 PLATFORMSUB=110a NO_INC_BUILD=1 clean141 $(MAKE) -s --no-print-directory PLATFORM=ixus850_sd800 PLATFORMSUB=100e NO_INC_BUILD=1 clean 142 #$(MAKE) -s --no-print-directory PLATFORM=ixus40_sd300 PLATFORMSUB=100k NO_INC_BUILD=1 clean 143 #$(MAKE) -s --no-print-directory PLATFORM=ixus50_sd400 PLATFORMSUB=101a NO_INC_BUILD=1 clean 144 #$(MAKE) -s --no-print-directory PLATFORM=ixus65_sd630 PLATFORMSUB=100a NO_INC_BUILD=1 clean 145 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=101b NO_INC_BUILD=1 clean 146 $(MAKE) -s --no-print-directory PLATFORM=ixus70_sd1000 PLATFORMSUB=102a NO_INC_BUILD=1 clean 147 #$(MAKE) -s --no-print-directory PLATFORM=ixusW_sd430 PLATFORMSUB=110a NO_INC_BUILD=1 clean 148 148 $(MAKE) -s --no-print-directory PLATFORM=a720 PLATFORMSUB=100c NO_INC_BUILD=1 clean 149 149 $(MAKE) -s --no-print-directory PLATFORM=a650 PLATFORMSUB=100d NO_INC_BUILD=1 clean -
trunk/core/conf.c
r308 r312 267 267 CONF_INFO(141, conf.tv_enum_type, CONF_DEF_VALUE, i:1, NULL), 268 268 269 269 CONF_INFO(142, conf.user_menu_enable, CONF_DEF_VALUE, i:0, NULL), 270 270 CONF_INFO(143, conf.user_menu_vars, CONF_DEF_PTR, ptr:&def_user_menu_vars, NULL), 271 271 CONF_INFO(144, conf.zoom_scale, CONF_DEF_VALUE, i:100, NULL), 272 272 }; 273 273 #define CONF_NUM (sizeof(conf_info)/sizeof(conf_info[0])) -
trunk/core/gui.c
r309 r312 309 309 {LANG_MENU_VALUES_SHOW_ZOOM, MENUITEM_BOOL, &conf.values_show_zoom}, 310 310 {LANG_MENU_OSD_ZOOM_VALUE, MENUITEM_ENUM, (int*)gui_zoom_value_enum }, 311 {LANG_MENU_OSD_ZOOM_SCALE, MENUITEM_INT|MENUITEM_F_UNSIGNED|MENUITEM_F_MINMAX, &conf.zoom_scale, MENU_MINMAX(0, 1000)}, 311 312 {LANG_MENU_VALUES_SHOW_REAL_APERTURE, MENUITEM_BOOL, &conf.values_show_real_aperture}, 312 313 {LANG_MENU_VALUES_SHOW_REAL_ISO, MENUITEM_BOOL, &conf.values_show_real_iso}, … … 336 337 static CMenuItem bracketing_in_continuous_submenu_items[] = { 337 338 {LANG_MENU_TV_BRACKET_VALUE, MENUITEM_ENUM, (int*)gui_tv_bracket_values_enum }, 338 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)339 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 339 340 {LANG_MENU_AV_BRACKET_VALUE, MENUITEM_ENUM, (int*)gui_av_bracket_values_enum }, 340 341 #endif … … 370 371 {LANG_MENU_OVERRIDE_AV_VALUE, MENUITEM_ENUM, (int*)gui_av_override_enum }, 371 372 #endif 372 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_g7) || defined (CAMERA_a460)373 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_g7) || defined (CAMERA_a460) 373 374 {LANG_MENU_OVERRIDE_ND_FILTER, MENUITEM_ENUM, (int*)gui_nd_filter_state_enum }, 374 375 #endif … … 1364 1365 if (kbd_is_key_clicked(SHORTCUT_TOGGLE_RAW)) { 1365 1366 if (conf.ns_enable_memdump) dump_memory(); 1366 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a460)1367 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a460) 1367 1368 else if (!shooting_get_common_focus_mode()) 1368 1369 #else … … 1379 1380 gui_subj_dist_override_koef_enum(1,0); 1380 1381 } 1381 #elif defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560)1382 #elif defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) 1382 1383 else 1383 1384 { … … 1391 1392 draw_restore(); 1392 1393 } else { 1393 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a460)1394 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a460) 1394 1395 if (kbd_is_key_clicked(SHORTCUT_MF_TOGGLE)) { 1395 1396 if (conf.subj_dist_override_koef>0) … … 1407 1408 if (kbd_is_key_clicked(KEY_RIGHT)) { 1408 1409 gui_subj_dist_override_koef_enum(1,0); 1409 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560)1410 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) 1410 1411 if (conf.subj_dist_override_koef==0) conf.subj_dist_override_koef=1; 1411 1412 #endif … … 1415 1416 { 1416 1417 gui_subj_dist_override_koef_enum(-1,0); 1417 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560)1418 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) 1418 1419 if (conf.subj_dist_override_koef==0) conf.subj_dist_override_koef=1; 1419 1420 #endif … … 1623 1624 return; 1624 1625 } 1625 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)1626 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 1626 1627 if (!(conf.show_osd && (canon_menu_active==(int)&canon_menu_active-4) && (canon_shoot_menu_active==0))) return; 1627 1628 #else -
trunk/core/gui_lang.c
r308 r312 383 383 "301 \" \"\n" 384 384 385 "302 \" Adapter Lens Scale, 100=1x\"\n" 385 386 ; 386 387 -
trunk/core/gui_lang.h
r308 r312 393 393 #define LANG_MENU_ITEM_BLANK 301 394 394 395 #define LANG_MENU_OSD_ZOOM_SCALE 302 396 395 397 //------------------------------------------------------------------- 396 #define GUI_LANG_ITEMS 30 1398 #define GUI_LANG_ITEMS 302 397 399 398 400 //------------------------------------------------------------------- -
trunk/core/gui_osd.c
r310 r312 713 713 } 714 714 if (conf.av_override_value || gui_mode==GUI_MODE_OSD) gui_print_osd_state_string_float("AV:", "%d.%02d ", 100, shooting_get_aperture_from_av96(shooting_get_av96_override_value())); 715 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_a710) || defined (CAMERA_g7)715 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_a710) || defined (CAMERA_g7) 716 716 if (conf.nd_filter_state || gui_mode==GUI_MODE_OSD) gui_print_osd_state_string_chr("NDFILTER:", ((conf.nd_filter_state==1)?"IN":"OUT")); 717 717 #endif … … 754 754 case ZOOM_SHOW_EFL: 755 755 fl=get_effective_focal_length(zp); 756 // scale by users adapter lens eg. Canon Wide .42 or Canon Tele 1.75 757 fl = fl * conf.zoom_scale / 100; 756 758 sprintf(osd_buf, "Z:%3dmm%8s", fl/1000, ""); 757 759 break; -
trunk/core/gui_osd.h
r307 r312 20 20 #define ZOOM_SHOW_FL 1 21 21 #define ZOOM_SHOW_EFL 2 22 23 #define ZOOM_SCALE_042 0 24 #define ZOOM_SCALE_100 1 25 #define ZOOM_SCALE_175 2 26 #define ZOOM_SCALE_200 3 27 #define ZOOM_SCALE_300 4 22 28 23 29 //ARM begin -
trunk/include/conf.h
r308 r312 169 169 int user_menu_enable; 170 170 int user_menu_vars[10]; 171 171 int zoom_scale; 172 172 } Conf; 173 173 -
trunk/lang/english.lng
r308 r312 394 394 395 395 298 " Shutter speed enum type" 396 "299 "User Menu Enable"397 "300 "User Menu"398 "301 " "399 400 401 396 299 "User Menu Enable" 397 300 "User Menu" 398 301 " " 399 400 302 " Adapter Lens Scale, 100=1x" 401 -
trunk/lib/ubasic/ubasic.c
r309 r312 1132 1132 (m==MODE_VIDEO_MY_COLORS) || 1133 1133 (m==MODE_VIDEO_COLOR_ACCENT)); 1134 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ a560) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a460)1134 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_a560) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a460) 1135 1135 if (shooting_get_focus_mode() || (mode_video)) shooting_set_focus(to, SET_NOW); 1136 1136 else shooting_set_focus(to, SET_LATER); -
trunk/platform/a460/sub/100d/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xD5730\n" // 0x95730 + 0x40000 102 ); 103 // "LDR R2, =0xC5730\n" // 0x95730 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/a560/sub/100a/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 150 152 "LDR R0, =h_usrRoot\n" //sub_FFC01A5C 151 153 "MOV R1, #0x4000\n" 152 "LDR R2, =0xE6090\n" //0xA6090+0x40000 154 ); 155 // "LDR R2, =0xD6090\n" //0xA6090+0x30000 156 asm volatile ( 157 "LDR R2, =new_sa\n" 158 "LDR R2, [R2]\n" 159 ); 160 asm volatile ( 153 161 "STR R12, [SP]\n" 154 162 "STR R4, [SP,#4]\n" -
trunk/platform/a570/sub/100e/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xE6C30\n" // 0xA6C30 + 0x40000 102 ); 103 // "LDR R2, =0xD6C30\n" // 0xA6C30 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/a570/sub/101a/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xE6C30\n" // 0xA6C30 + 0x40000 102 ); 103 // "LDR R2, =0xD6C30\n" // 0xA6C30 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/a610/sub/100e/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 96 98 "LDR R0, =h_usrRoot\n" 97 99 "MOV R1, #0x4000\n" 98 "LDR R2, =0xE0B70\n" // 0xA0B70 + 0x40000 100 ); 101 // "LDR R2, =0xD0B70\n" // 0xA0B70 + 0x30000 102 asm volatile ( 103 "LDR R2, =new_sa\n" 104 "LDR R2, [R2]\n" 105 ); 106 asm volatile ( 99 107 "STR R12, [SP]\n" 100 108 "STR R4, [SP,#4]\n" -
trunk/platform/a610/sub/100f/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 96 98 "LDR R0, =h_usrRoot\n" 97 99 "MOV R1, #0x4000\n" 98 "LDR R2, =0xE0B70\n" // 0xA0B70 + 0x40000 100 ); 101 // "LDR R2, =0xD0B70\n" // 0xA0B70 + 0x30000 102 asm volatile ( 103 "LDR R2, =new_sa\n" 104 "LDR R2, [R2]\n" 105 ); 106 asm volatile ( 99 107 "STR R12, [SP,#0x10-0x10]\n" 100 108 "STR R4, [SP,#0x10-0xC]\n" -
trunk/platform/a620/sub/100f/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xDF990\n" // 0x9F990 + 0x40000 102 ); 103 // "LDR R2, =0xCF990\n" // 0x9F990 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/a630/sub/100c/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xD4810\n" // 0x94810 + 0x40000 102 ); 103 // "LDR R2, =0xD4810\n" // 0x94810 + 0x40000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/a640/sub/100b/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xD4D10\n" // 0x94D10 + 0x40000 102 ); 103 // "LDR R2, =0xD4D10\n" // 0x94D10 + 0x40000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/a640/sub/100b/stubs_auto.S
r300 r312 28 28 STUB(FFC24350) 29 29 STUB(FFC56118) 30 STUB(FFC5F46C)31 STUB(FFC5FDE0)32 STUB(FFC5FF2C)33 30 STUB(FFC60978) 34 31 STUB(FFC60A50) -
trunk/platform/a650/sub/100d/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 93 95 "MOV R0, #0x53000\n" 94 96 "STR R0, [SP,#4]\n" 95 "LDR R0, =0xE3F20\n" // new heap start: 0xA3F20+0x40000 96 97 ); 98 // "LDR R0, =0xD3F20\n" // new heap start: 0xA3F20+0x30000 99 asm volatile ( 100 "LDR R0, =new_sa\n" 101 "LDR R0, [R2]\n" 102 ); 103 asm volatile ( 97 104 "LDR R2, =0x2ABC00\n" // DRY_SYS_MEM_START 98 105 "LDR R1, =0x2A4968\n" // heap end -
trunk/platform/a700/sub/100b/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xDC090\n" // 0x9C090 + 0x40000 102 ); 103 // "LDR R2, =0xCC090\n" // 0x9C090 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/a710/sub/100a/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xDF9B0\n" // 0x9F9B0 + 0x40000 102 ); 103 // "LDR R2, =0xDF9B0\n" // 0x9F9B0 + 0x40000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/a720/sub/100c/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 109 111 "MOV R0, #0x53000\n" 110 112 "STR R0, [SP,#0x74-0x70]\n" 111 "LDR R0, =0xDD024\n" // 0x9d024 + 0x40000, note: 0x20000 *should* have been enough, but our code was overwritten... 113 ); 114 // "LDR R0, =0xDD024\n" // 0x9d024 + 0x40000, note: 0x20000 *should* have been enough, but our code was overwritten... 112 115 // ...thus we push the memory pool a little more up (0x30000 = 192k) 116 asm volatile ( 117 "LDR R0, =new_sa\n" 118 "LDR R0, [R2]\n" 119 ); 120 asm volatile ( 113 121 "LDR R2, =0x2ABC00\n" 114 122 "LDR R1, =0x2A4968\n" -
trunk/platform/a720/sub/100c/stubs_auto.S
r271 r312 2 2 #include "stubs_asm.h" 3 3 4 STUB(2)5 STUB(3)6 STUB(30)7 STUB(4)8 STUB(5)9 4 STUB(FFC001a4) 10 5 STUB(FFC0095C) -
trunk/platform/g7/sub/100e/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xE7910\n" // 0xA7910 + 0x40000 102 ); 103 // "LDR R2, =0xE7910\n" // 0xA7910 + 0x40000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/g7/sub/100g/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xE7910\n" // 0xA7910 + 0x40000 102 ); 103 // "LDR R2, =0xE7910\n" // 0xA7910 + 0x40000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/g7/sub/100i/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xE7910\n" // 0xA7910 + 0x40000 102 ); 103 // "LDR R2, =0xE7910\n" // 0xA7910 + 0x40000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/g7/sub/100j/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xE7910\n" // 0xA7910 + 0x40000 102 ); 103 // "LDR R2, =0xE7910\n" // 0xA7910 + 0x40000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/generic/shooting.c
r309 r312 84 84 int shooting_get_user_tv_id() 85 85 { 86 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_a560) && !defined (CAMERA_a460)86 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined(CAMERA_ixus850_sd800) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 87 87 short tvv; 88 88 long i; … … 111 111 void shooting_set_user_tv_by_id(int v) 112 112 { 113 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)113 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined(CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 114 114 long i; 115 115 // if ((v<SSID_MIN) || (v>SSID_MAX)) … … 161 161 void shooting_set_user_tv_by_id_rel(int v) 162 162 { 163 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)163 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 164 164 int cv = shooting_get_user_tv_id(); 165 165 shooting_set_user_tv_by_id(cv+v); … … 169 169 int shooting_get_user_av_id() 170 170 { 171 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)171 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 172 172 short avv; 173 173 long i; … … 182 182 183 183 short shooting_get_real_aperture() { 184 //#if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus800_sd700) 184 //#if defined(CAMERA_ixus700_sd500) || defined(CAMERA_ixus70_sd1000) || defined(CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) 185 185 // return shooting_get_min_real_aperture(); 186 186 //#else … … 510 510 short shooting_get_user_tv96() 511 511 { 512 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)512 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 513 513 short tv; 514 514 _GetPropertyCase(PROPCASE_USER_TV, &tv, sizeof(tv)); … … 521 521 void shooting_set_user_tv96(short v) 522 522 { 523 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)524 523 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 524 long i; 525 525 // if ((v<SSID_MIN) || (v>SSID_MAX)) 526 526 // return; … … 604 604 short shooting_get_user_av96() 605 605 { 606 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)606 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 607 607 short av; 608 608 _GetPropertyCase(PROPCASE_USER_AV, &av, sizeof(av)); … … 629 629 void shooting_set_nd_filter_state(short v, short is_now) 630 630 { 631 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_g7) || defined (CAMERA_a460)631 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_g7) || defined (CAMERA_a460) 632 632 if (is_now) { 633 633 if (v==1) _PutInNdFilter(); … … 651 651 void shooting_set_user_av96(short v) 652 652 { 653 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)653 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 654 654 long i; 655 655 … … 704 704 short shooting_get_common_focus_mode() 705 705 { 706 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a460)706 #if defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a460) 707 707 return shooting_get_subject_distance_override_koef(); 708 708 #elif defined (CAMERA_ixus700_sd500) … … 715 715 short shooting_get_focus_mode() 716 716 { 717 718 719 717 short m; 718 _GetPropertyCase(PROPCASE_FOCUS_MODE, &m, sizeof(m)); 719 return m; 720 720 } 721 721 … … 733 733 void shooting_set_user_av_by_id(int v) 734 734 { 735 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)735 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 736 736 long i; 737 737 // if ((v<ASID_MIN) || (v>ASID_MAX)) … … 750 750 void shooting_set_user_av_by_id_rel(int v) 751 751 { 752 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus 70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460)752 #if !defined (CAMERA_ixus700_sd500) && !defined (CAMERA_ixus800_sd700) && !defined (CAMERA_ixus850_sd800) && !defined (CAMERA_ixus70_sd1000) && !defined (CAMERA_a560) && !defined (CAMERA_a460) 753 753 int cv = shooting_get_user_av_id(); 754 754 shooting_set_user_av_by_id(cv+v); … … 773 773 void shooting_set_iso_mode(int v) 774 774 { 775 775 long i; 776 776 for (i=0;i<ISO_SIZE;i++){ 777 777 if (iso_table[i].id == v){ … … 780 780 return; 781 781 } 782 }782 } 783 783 } 784 784 … … 1072 1072 photo_param_put_off.tv96=0; 1073 1073 } 1074 else if ((conf.tv_override_value) && (conf.tv_override_koef)) 1074 else if ((conf.tv_override_value) && (conf.tv_override_koef)) 1075 1075 { 1076 1076 if (conf.tv_enum_type) shooting_set_tv96_direct(32*(conf.tv_override_value-18),SET_NOW); … … 1083 1083 else if ((conf.iso_override_value) && (conf.iso_override_koef)) 1084 1084 shooting_set_iso_real(shooting_get_iso_override_value(), SET_NOW); 1085 1086 1085 if ((state_kbd_script_run) && (photo_param_put_off.av96)) { 1087 1086 shooting_set_av96_direct(photo_param_put_off.av96, SET_NOW); … … 1090 1089 else if (conf.av_override_value) 1091 1090 shooting_set_av96_direct(shooting_get_av96_override_value(), SET_NOW); 1092 1093 1091 if ((state_kbd_script_run) && (photo_param_put_off.subj_dist)) { 1094 1092 shooting_set_focus(photo_param_put_off.subj_dist, SET_NOW); 1095 1093 photo_param_put_off.subj_dist=0; 1096 1094 } 1097 else if ((conf.subj_dist_override_value) && (conf.subj_dist_override_koef))1095 else if ((conf.subj_dist_override_value) && (conf.subj_dist_override_koef)) 1098 1096 { 1099 1097 shooting_set_focus(shooting_get_subject_distance_override_value(), SET_NOW); 1100 1098 } 1101 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus 70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_g7) || defined (CAMERA_a460)1099 #if defined (CAMERA_ixus700_sd500) || defined (CAMERA_ixus800_sd700) || defined (CAMERA_ixus850_sd800) || defined (CAMERA_ixus70_sd1000) || defined (CAMERA_a560) || defined (CAMERA_a570) || defined (CAMERA_g7) || defined (CAMERA_a460) 1102 1100 if ((state_kbd_script_run) && (photo_param_put_off.nd_filter)) { 1103 1101 shooting_set_nd_filter_state(photo_param_put_off.nd_filter, SET_NOW); -
trunk/platform/ixus700_sd500/sub/101a/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 262 264 "LDR R0, =h_usrRoot\n" 263 265 "MOV R1, #0x4000\n" 264 "LDR R2, =0xBC2B0\n" // 0x7C2B0 + 0x40000 266 ); 267 // "LDR R2, =0xAC2B0\n" // 0x7C2B0 + 0x30000 268 asm volatile ( 269 "LDR R2, =new_sa\n" 270 "LDR R2, [R2]\n" 271 ); 272 asm volatile ( 265 273 "STR R12, [SP]\n" 266 274 "STR R4, [SP,#4]\n" -
trunk/platform/ixus700_sd500/sub/101b/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 262 264 "LDR R0, =h_usrRoot\n" 263 265 "MOV R1, #0x4000\n" 264 "LDR R2, =0xBC2B0\n" // 0x7C2B0 + 0x40000 266 ); 267 // "LDR R2, =0xAC2B0\n" // 0x7C2B0 + 0x30000 268 asm volatile ( 269 "LDR R2, =new_sa\n" 270 "LDR R2, [R2]\n" 271 ); 272 asm volatile ( 265 273 "STR R12, [SP]\n" 266 274 "STR R4, [SP,#4]\n" -
trunk/platform/ixus70_sd1000/sub/101b/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" // R0, =sub_FF811A60 (h_usrRoot)) 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xFEF70\n" // 0xBEF70 + 0x40000 102 ); 103 // "LDR R2, =0xEEF70\n" // 0xBEF70 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/ixus70_sd1000/sub/102a/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" // R0, =sub_FF811A60 (h_usrRoot)) 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xFEF70\n" // 0xBEF70 + 0x40000 102 ); 103 // "LDR R2, =0xEEF70\n" // 0xBEF70 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/ixus800_sd700/sub/100b/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xDC890\n" // 0x9C890 + 0x40000 102 ); 103 // "LDR R2, =0xCC890\n" // 0x9C890 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/ixus800_sd700/sub/101b/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xDC890\n" // 0x9C890 + 0x40000 102 ); 103 // "LDR R2, =0xCC890\n" // 0x9C890 + 0x30000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/platform/s2is/sub/100e/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 168 170 "LDR R0, =h_usrRoot\n" 169 171 "MOV R1, #0x4000\n" 170 "LDR R2, =0xAEF50\n" // 0x6EF50 + 0x40000 172 ); 173 // "LDR R2, =0x9EF50\n" // 0x6EF50 + 0x30000 174 asm volatile ( 175 "LDR R2, =new_sa\n" 176 "LDR R2, [R2]\n" 177 ); 178 asm volatile ( 171 179 "STR R12, [SP]\n" 172 180 "STR R4, [SP,#4]\n" -
trunk/platform/s2is/sub/100f/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 169 171 "LDR R0, =h_usrRoot\n" 170 172 "MOV R1, #0x4000\n" 171 "LDR R2, =0xAEF50\n" // 0x6EF50 + 0x40000 173 ); 174 // "LDR R2, =0x9EF50\n" // 0x6EF50 + 0x30000 175 asm volatile ( 176 "LDR R2, =new_sa\n" 177 "LDR R2, [R2]\n" 178 ); 179 asm volatile ( 172 180 "STR R12, [SP]\n" 173 181 "STR R4, [SP,#4]\n" -
trunk/platform/s2is/sub/100g/boot.c
r311 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 168 170 "LDR R0, =h_usrRoot\n" 169 171 "MOV R1, #0x4000\n" 170 "LDR R2, =0xAEF70\n" // 0x6EF70 + 0x40000 172 ); 173 // "LDR R2, =0x9EF70\n" // 0x6EF70 + 0x30000 174 asm volatile ( 175 "LDR R2, =new_sa\n" 176 "LDR R2, [R2]\n" 177 ); 178 asm volatile ( 171 179 "STR R12, [SP]\n" 172 180 "STR R4, [SP,#4]\n" -
trunk/platform/s3is/sub/100a/boot.c
r307 r312 2 2 #include "platform.h" 3 3 #include "core.h" 4 5 const long new_sa = MEMISOSTART + MEMISOSIZE; 4 6 5 7 /* Ours stuff */ … … 98 100 "LDR R0, =h_usrRoot\n" 99 101 "MOV R1, #0x4000\n" 100 "LDR R2, =0xD6410\n" // 0x96410 + 0x40000 102 ); 103 // "LDR R2, =0xD6410\n" // 0x96410 + 0x40000 104 asm volatile ( 105 "LDR R2, =new_sa\n" 106 "LDR R2, [R2]\n" 107 ); 108 asm volatile ( 101 109 "STR R12, [SP]\n" 102 110 "STR R4, [SP,#4]\n" -
trunk/version.inc
r309 r312 1 BUILD_NUMBER := 3 81 BUILD_NUMBER := 39
Note: See TracChangeset
for help on using the changeset viewer.
