Changeset 232
- Timestamp:
- 01/31/10 10:53:26 (3 years ago)
- Location:
- branches/fe50t
- Files:
-
- 11 added
- 8 edited
-
Makefile (modified) (7 diffs)
-
platform/ixus90_sd790/kbd.c (modified) (5 diffs)
-
platform/ixus90_sd790/main.c (modified) (1 diff)
-
platform/ixus90_sd790/sub/100c (added)
-
platform/ixus90_sd790/sub/100c/Makefile (added)
-
platform/ixus90_sd790/sub/100c/boot.c (added)
-
platform/ixus90_sd790/sub/100c/capt_seq.c (added)
-
platform/ixus90_sd790/sub/100c/lib.c (added)
-
platform/ixus90_sd790/sub/100c/makefile.inc (added)
-
platform/ixus90_sd790/sub/100c/movie_rec.c (added)
-
platform/ixus90_sd790/sub/100c/stubs_asm.h (added)
-
platform/ixus90_sd790/sub/100c/stubs_entry.S (added)
-
platform/ixus90_sd790/sub/100c/stubs_entry_2.S (added)
-
platform/ixus90_sd790/sub/100c/stubs_min.S (added)
-
platform/ixus90_sd790/sub/100d/boot.c (modified) (18 diffs)
-
platform/ixus90_sd790/sub/100d/capt_seq.c (modified) (17 diffs)
-
platform/ixus90_sd790/sub/100d/lib.c (modified) (2 diffs)
-
platform/ixus90_sd790/sub/100d/movie_rec.c (modified) (1 diff)
-
platform/ixus90_sd790/wrappers.c (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/fe50t/Makefile
r221 r232 224 224 $(MAKE) -s --no-print-directory PLATFORM=sx110is PLATFORMSUB=100b NO_INC_BUILD=1 firzipsub 225 225 $(MAKE) -s --no-print-directory PLATFORM=sx200is PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 226 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsub 226 227 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100d NO_INC_BUILD=1 firzipsub 227 228 @echo "**** All firmwares created successfully" … … 240 241 cp $(topdir)bin/$(VER)-sx200is-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx200is-100d-$(BUILD_NUMBER).zip 241 242 cp $(topdir)bin/$(VER)-ixus960_sd950-100d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus960_sd950-100c-$(BUILD_NUMBER).zip 243 cp $(topdir)bin/$(VER)-ixus90_sd790-100d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus90_sd790-100e-$(BUILD_NUMBER).zip 242 244 mv $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-200h-$(BUILD_NUMBER)_BETA.zip 243 245 mv $(topdir)bin/$(VER)-sx1-201a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-sx1-201a-$(BUILD_NUMBER)_BETA.zip … … 247 249 mv $(topdir)bin/$(VER)-ixus980_sd990-101b-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus980_sd990-101b-$(BUILD_NUMBER)_BETA.zip 248 250 mv $(topdir)bin/$(VER)-a2000-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-a2000-100c-$(BUILD_NUMBER)_BETA.zip 251 mv $(topdir)bin/$(VER)-ixus90_sd790-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus90_sd790-100c-$(BUILD_NUMBER)_BETA.zip 249 252 mv $(topdir)bin/$(VER)-ixus90_sd790-100d-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus90_sd790-100d-$(BUILD_NUMBER)_BETA.zip 250 253 @echo "**** Done Copying duplicate Firmwares" … … 342 345 $(MAKE) -s --no-print-directory PLATFORM=sx110is PLATFORMSUB=100b NO_INC_BUILD=1 firzipsubcomplete 343 346 $(MAKE) -s --no-print-directory PLATFORM=sx200is PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 347 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100c NO_INC_BUILD=1 firzipsubcomplete 344 348 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100d NO_INC_BUILD=1 firzipsubcomplete 345 349 @echo "**** All zipfiles including firmwares and extra stuff created successfully" … … 371 375 cp $(topdir)bin/ixus960_sd950-100d-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus960_sd950-100c-$(BUILD_NUMBER)-full.zip 372 376 cp $(topdir)bin/ixus960_sd950-100d-$(BUILD_NUMBER).zip $(topdir)bin/ixus960_sd950-100c-$(BUILD_NUMBER).zip 377 cp $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus90_sd790-100e-$(BUILD_NUMBER)-full.zip 378 cp $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER).zip $(topdir)bin/ixus90_sd790-100e-$(BUILD_NUMBER).zip 373 379 mv $(topdir)bin/sx1-200h-$(BUILD_NUMBER)-full.zip $(topdir)bin/sx1-200h-$(BUILD_NUMBER)-full_BETA.zip 374 380 mv $(topdir)bin/sx1-200h-$(BUILD_NUMBER).zip $(topdir)bin/sx1-200h-$(BUILD_NUMBER)_BETA.zip … … 385 391 mv $(topdir)bin/a2000-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/a2000-100c-$(BUILD_NUMBER)-full_BETA.zip 386 392 mv $(topdir)bin/a2000-100c-$(BUILD_NUMBER).zip $(topdir)bin/a2000-100c-$(BUILD_NUMBER)_BETA.zip 393 mv $(topdir)bin/ixus90_sd790-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus90_sd790-100c-$(BUILD_NUMBER)-full_BETA.zip 394 mv $(topdir)bin/ixus90_sd790-100c-$(BUILD_NUMBER).zip $(topdir)bin/ixus90_sd790-100c-$(BUILD_NUMBER)_BETA.zip 387 395 mv $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER)-full_BETA.zip 388 396 mv $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER).zip $(topdir)bin/ixus90_sd790-100d-$(BUILD_NUMBER)_BETA.zip … … 479 487 $(MAKE) -s --no-print-directory PLATFORM=sx110is PLATFORMSUB=100b NO_INC_BUILD=1 clean 480 488 $(MAKE) -s --no-print-directory PLATFORM=sx200is PLATFORMSUB=100c NO_INC_BUILD=1 clean 489 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100c NO_INC_BUILD=1 clean 481 490 $(MAKE) -s --no-print-directory PLATFORM=ixus90_sd790 PLATFORMSUB=100d NO_INC_BUILD=1 clean 482 491 .PHONY: fir upload -
branches/fe50t/platform/ixus90_sd790/kbd.c
r222 r232 11 11 } KeyMap; 12 12 13 14 13 static long kbd_new_state[3]; 15 14 static long kbd_prev_state[3]; … … 17 16 static KeyMap keymap[]; 18 17 static long last_kbd_key = 0; 19 static long alt_mode_key_mask = 0x00000800;18 //static long alt_mode_key_mask = 0x00000800; 20 19 static int usb_power=0; 21 20 static int remote_key, remote_count; 21 static int shoot_counter=0; 22 #define DELAY_TIMEOUT 10000 22 23 23 24 #define KEYS_MASK0 (0x00000000) … … 39 40 40 41 long __attribute__((naked)) wrap_kbd_p1_f() ; 42 43 void wait_until_remote_button_is_released(void) 44 { 45 int count1; 46 int count2; 47 int tick,tick2,tick3; 48 int nSW; 49 int prev_usb_power,cur_usb_power; 50 51 static int nMode; 52 53 asm volatile ("STMFD SP!, {R0-R11,LR}\n"); // store R0-R11 and LR in stack 54 55 debug_led(1); 56 tick = get_tick_count(); 57 tick2 = tick; 58 static long usb_physw[3]; 59 if (conf.synch_enable && conf.ricoh_ca1_mode && conf.remote_enable && (!shooting_get_drive_mode()|| (shooting_get_drive_mode()==1) || ((shooting_get_drive_mode()==2) && state_shooting_progress != SHOOTING_PROGRESS_PROCESSING))) { 60 nMode=0; 61 usb_physw[2] = 0; // makes sure USB bit is cleared. 62 _kbd_read_keys_r2(usb_physw); 63 if((usb_physw[2] & USB_MASK)==USB_MASK) { 64 nMode=1; 65 } 66 67 if(conf.ricoh_ca1_mode && conf.remote_enable) { 68 if(shooting_get_drive_mode() ==1 && state_shooting_progress == SHOOTING_PROGRESS_PROCESSING) { //continuous-shooting mode 69 if(conf.bracket_type>2) { 70 if(shoot_counter<2) shutter_int=3; 71 shoot_counter--; 72 } else { 73 prev_usb_power=0; 74 nSW = 0; 75 do { 76 usb_physw[2] = 0; // makes sure USB bit is cleared. 77 _kbd_read_keys_r2(usb_physw); 78 cur_usb_power = (usb_physw[2] & USB_MASK)==USB_MASK; 79 if(cur_usb_power) { 80 if(!prev_usb_power) { 81 tick2 = get_tick_count(); 82 prev_usb_power=cur_usb_power; 83 } else { 84 if((int)get_tick_count()-tick2>1000) { 85 debug_led(0); 86 } 87 } 88 } 89 else { 90 if(prev_usb_power) { 91 tick3 = (int)get_tick_count()-tick2; 92 if(nSW==10) { 93 if(tick3>50) shutter_int=1; 94 nSW=20; 95 } 96 if(nSW==0 && tick3>0) { 97 if(tick3<50) { 98 nSW=10; 99 } else { 100 if(tick3>1000) { 101 shutter_int=1; 102 } 103 nSW=20; 104 } 105 } 106 prev_usb_power=cur_usb_power; 107 } 108 } 109 if((int)get_tick_count()-tick >= DELAY_TIMEOUT) { 110 nSW=20;shutter_int=2; 111 } 112 } while(nSW<20); 113 } 114 } else { //nomal mode 115 shoot_counter=0; 116 if(conf.bracket_type>2) { 117 shoot_counter=(conf.bracket_type-2)*2; 118 } 119 do { 120 usb_physw[2] = 0; // makes sure USB bit is cleared. 121 _kbd_read_keys_r2(usb_physw); 122 } while(((((usb_physw[2] & USB_MASK)!=USB_MASK) && (nMode==0)) || (((usb_physw[2] & USB_MASK)==USB_MASK) && (nMode==1))) && ((int)get_tick_count()-tick < DELAY_TIMEOUT)); 123 } 124 } else { 125 do { 126 usb_physw[2] = 0; // makes sure USB bit is cleared. 127 _kbd_read_keys_r2(usb_physw); 128 } while((usb_physw[2]&USB_MASK) && ((int)get_tick_count()-tick < DELAY_TIMEOUT)); 129 } 130 } 131 132 if (conf.synch_delay_enable && conf.synch_delay_value>0) { // if delay is switched on and greater than 0 133 for (count1=0;count1<conf.synch_delay_value+(conf.synch_delay_coarse_value*1000);count1++) { // wait delay_value * 0.1ms 134 for (count2=0;count2<1400;count2++) { // delay approx. 0.1ms 135 } 136 } 137 } 138 139 debug_led(0); 140 asm volatile ("LDMFD SP!, {R0-R11,LR}\n"); // restore R0-R11 and LR from stack 141 } 41 142 42 143 static void __attribute__((noinline)) mykbd_task_proceed() … … 129 230 physw_status[0] = kbd_new_state[0]; 130 231 physw_status[1] = kbd_new_state[1]; 131 physw_status[2] = kbd_new_state[2] | alt_mode_key_mask; 232 physw_status[2] = kbd_new_state[2]; 233 // physw_status[2] = kbd_new_state[2] | alt_mode_key_mask; 132 234 jogdial_stopped=0; 133 235 … … 167 269 168 270 _kbd_read_keys_r2(physw_status); 169 170 // physw_status[2] = physw_status[2] & ~SD_READONLY_FLAG;171 172 173 remote_key = (physw_status[2] & USB_MASK)==USB_MASK;174 271 175 272 if (conf.remote_enable) { -
branches/fe50t/platform/ixus90_sd790/main.c
r223 r232 29 29 30 30 // Ixus 90 focal length range is 6.2 - 18.6 mm, 35-105 in 35-mm equivalent. 31 // So, CF_EFL = 35/6.2*10000=5645 1 or 105/18.6*10000=56451.31 // So, CF_EFL = 35/6.2*10000=56452 or 105/18.6*10000=56452. 32 32 static const int fl_tbl[] = {6200, 7230, 8295, 9681, 11614, 14303, 18600}; 33 #define CF_EFL 5645 133 #define CF_EFL 56452 34 34 #define NUM_FL (sizeof(fl_tbl)/sizeof(fl_tbl[0])) 35 35 -
branches/fe50t/platform/ixus90_sd790/sub/100d/boot.c
r223 r232 126 126 "LDR R0, =0x19B\n" 127 127 "MOV R1, #0x64\n" 128 //"STRD R0, [SP,#0x74-0x54]\n" 129 "STR R0, [SP,#0x74-0x54]\n" 130 "STR R1, [SP,#0x74-0x50]\n" 128 "STRD R0, [SP,#0x74-0x54]\n" 131 129 "MOV R0, #0x78\n" 132 //"STRD R0, [SP,#0x74-0x4C]\n" 133 "STR R0, [SP,#0x74-0x4C]\n" 134 "STR R1, [SP,#0x74-0x48]\n" 130 "STRD R0, [SP,#0x74-0x4C]\n" 135 131 "MOV R0, #0\n" 136 132 "STR R0, [SP,#0x74-0x44]\n" … … 204 200 "TST R0, #1\n" 205 201 "MOVEQ R0, #0x12C\n" 206 "BLEQ sub_FF828400\n"202 "BLEQ _SleepTask\n" 207 203 "BL sub_FF821BFC\n" 208 204 "CMP R0, #0\n" … … 228 224 "MOV R1, #0x19\n" 229 225 "LDR R0, =0xFF81CD44\n" // ; "Startup"\n" 230 "BL sub_FF81B818\n"226 "BL _CreateTask\n" 231 227 "MOV R0, #0\n" 232 228 //"LDMFD SP!, {R3-R5,PC}\n" … … 274 270 ); 275 271 }; //#fe 272 276 273 277 274 void CreateTask_spytask() { //#fs … … 409 406 }; //#fe 410 407 411 412 413 408 void __attribute__((naked,noinline)) sub_FF84ED40_my() { //#fs ; Partition t 414 409 asm volatile ( … … 426 421 "B loc_FF84EE8C\n" 427 422 428 429 423 "loc_FF84ED70:\n" // ; CODE XREF: sub_FF84ED40+28j 430 424 "B loc_FF84EDA4\n" 431 425 432 433 426 "loc_FF84ED74:\n" // ; CODE XREF: sub_FF84ED40+28j 434 427 "B loc_FF84ED8C\n" 435 428 436 437 429 "loc_FF84ED78:\n" // ; CODE XREF: sub_FF84ED40+28j 438 430 "B loc_FF84ED8C\n" 439 431 440 441 432 "loc_FF84ED7C:\n" // ; CODE XREF: sub_FF84ED40+28j 442 433 "B loc_FF84ED8C\n" 443 434 444 445 435 "loc_FF84ED80:\n" // ; CODE XREF: sub_FF84ED40+28j 446 436 "B loc_FF84ED8C\n" 447 437 448 449 438 "loc_FF84ED84:\n" // ; CODE XREF: sub_FF84ED40+28j 450 439 "B loc_FF84EE84\n" 451 440 452 453 441 "loc_FF84ED88:\n" // ; CODE XREF: sub_FF84ED40+28j 454 442 "B loc_FF84ED8C\n" 455 456 443 "loc_FF84ED8C:\n" // ; CODE XREF: sub_FF84ED40+28j 457 458 459 444 "MOV R2, #0\n" 460 445 "MOV R1, #0x200\n" … … 463 448 "MOVS R4, R0\n" 464 449 "BNE loc_FF84EDAC\n" 465 466 450 "loc_FF84EDA4:\n" // ; CODE XREF: sub_FF84ED40+28j 467 468 469 451 "MOV R0, #0\n" 470 452 "LDMFD SP!, {R4-R8,PC}\n" 471 453 472 473 454 "loc_FF84EDAC:\n" // ; CODE XREF: sub_FF84ED40+60j 474 455 "LDR R12, [R7,#0x4C]\n" … … 486 467 "B loc_FF84EDA4\n" 487 468 488 489 469 "loc_FF84EDD8:\n" // ; CODE XREF: sub_FF84ED40+88j 490 470 "MOV R0, R8\n" … … 493 473 "MOV R1, R4\n" // pointer to MBR in R1 494 474 "BL mbr_read_dryos\n" // total sectors count in R0 before and after call 495 496 475 // Start of DataGhost's FAT32 autodetection code 497 476 // Policy: If there is a partition which has type W95 FAT32, use the first one of those for image storage … … 543 522 "ORR R3, R3, R12\n" 544 523 //"LDRB R12, [R4,#0x1FE]\n" 545 546 524 "LDRB R12, [LR,#0x1FE]\n" 547 525 "LDRB LR, [LR,#0x1FF]\n" 548 549 526 "MOV R4, #0\n" 550 527 "BNE loc_FF84EE60\n" … … 558 535 "MOVEQ R5, R3\n" 559 536 "MOVEQ R4, #1\n" 560 561 537 "loc_FF84EE60:\n" // ; CODE XREF: sub_FF84ED40+F8j 562 563 538 "MOV R0, #3\n" 564 539 "BL sub_FF867DD4\n" … … 571 546 "B loc_FF84EE98\n" 572 547 573 574 548 "loc_FF84EE84:\n" // ; CODE XREF: sub_FF84ED40+28j 575 576 577 549 "MOV R5, #0x40\n" 578 550 "B loc_FF84EE98\n" 579 551 580 581 552 "loc_FF84EE8C:\n" // ; CODE XREF: sub_FF84ED40+28j 582 583 584 553 "MOV R1, #0x374\n" 585 554 "LDR R0, =0xFF84ED34\n" // aMounter_c ; "Mounter.c"\n" 586 555 "BL _DebugAssert\n" 587 588 556 "loc_FF84EE98:\n" // ; CODE XREF: sub_FF84ED40+12Cj 589 590 557 "STR R6, [R7,#0x44]!\n" 591 558 "MOV R0, #1\n" 592 559 "STR R5, [R7,#4]\n" 593 560 "LDMFD SP!, {R4-R8,PC}\n" 594 595 561 ); 596 562 }; //#fe 597 598 563 // Extracted method: sub_FF842A44 + 240 599 564 // Extracted method: sub_FF842C84 … … 609 574 "MOV R9, #1\n" 610 575 "MOV R10, #0\n" 611 612 576 "loc_FF842CA4:\n" 613 577 "LDR R3, =0x1A1\n" // HL … … 619 583 "MOV R0, #40\n" // + 620 584 "BL _SleepTask\n" // LOCATION: KerSys.c:0 621 622 585 //------------------ added code --------------------- 623 586 "labelA:\n" … … 631 594 "labelB:\n" 632 595 //------------------ original code ------------------ 633 634 596 "LDR R0, [R7,#0x104]\n" 635 597 "MOV R0, R0,ASR#16\n" … … 655 617 "ADD R5, R5, #1\n" 656 618 "EOR R4, R4, #1\n" 657 658 619 "loc_FF842D1C:\n" 659 620 "LDR R0, [R6,#0x14]\n" … … 668 629 "LDR R0, =0xB01\n" 669 630 "BL sub_FF875370\n" 670 671 631 "loc_FF842D48:\n" 672 632 "MOV R0, R11\n" 673 633 "BL sub_FF875370\n" 674 675 634 "loc_FF842D50:\n" 676 635 "LDR R0, [R8,R4,LSL#2]\n" … … 678 637 "STR R0, [R6,#0x1C]\n" 679 638 "BL sub_FF8752b8\n" 680 681 639 "loc_FF842D60:\n" 682 640 "LDRH R0, [R6]\n" 683 641 "STRH R0, [R6,#2]\n" 684 685 642 "loc_FF842D68:\n" 686 643 "STR R10, [R7,#0x100]\n" -
branches/fe50t/platform/ixus90_sd790/sub/100d/capt_seq.c
r223 r232 3 3 #include "core.h" 4 4 5 static long *nrflag = (long*)0x9F90; 5 // @ FF93D898 6 static long *nrflag = (long*)0x91AC; 6 7 7 8 #include "../../../generic/capt_seq.c" … … 16 17 "BL sub_FF827B50\n" 17 18 "MOV R2, #4\n" 18 19 "ADD R1, SP, #0x30-0x28\n" 19 20 "MOV R0, #0x8A\n" 20 21 "BL sub_FF86D25C\n" … … 28 29 "LDR R0, [R5,#0x7C]\n" 29 30 "BL sub_FF8F3DC8\n" 30 "BL sub_FF845570\n" //GetCCDTemperature\n"31 "BL _GetCCDTemperature\n" 31 32 "LDR R2, =0x91B0\n" 32 33 "ADD R3, R4, #0x8C\n" 33 34 "STRH R0, [R4,#0x88]\n" 34 // "STRD R2, [SP,#0x30-0x30]\n" 35 "STR R2, [SP]\n" //+ 36 "STR R3, [SP,#4]\n" //+ 35 "STRD R2, [SP,#0x30-0x30]\n" 37 36 "MOV R1, R0\n" 38 37 "LDRH R0, [R5,#0x54]\n" … … 40 39 "LDR R3, =0x91AC\n" 41 40 "BL sub_FF93E880\n" 41 "BL wait_until_remote_button_is_released\n" // + 42 42 "BL capt_seq_hook_set_nr\n" 43 "BL 43 "BL sub_FF93D894\n" 44 44 ); 45 45 } … … 83 83 "B loc_FF85E6C4\n" 84 84 85 86 85 "loc_FF85E6B4:\n" // ; CODE XREF: sub_FF85E634+38j 87 86 "LDR R0, =0x54E0\n" … … 126 125 "LDR R0, =0xFF85DF88\n" // ; "SsShootTask.c"\n" 127 126 "BL _DebugAssert\n" 128 "BL sub_FF81BAA8\n" // ExitTask\n"127 "BL _ExitTask\n" 129 128 "LDMFD SP!, {R3-R9,PC}\n" 130 131 129 132 130 "loc_FF85E2F0:\n" // ; CODE XREF: task_CaptSeqTask+28j … … 137 135 "B loc_FF85E510\n" 138 136 139 140 137 "loc_FF85E304:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 141 138 "B loc_FF85E374\n" 142 139 143 144 140 "loc_FF85E308:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 145 141 "B loc_FF85E3DC\n" 146 142 147 148 143 "loc_FF85E30C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 149 144 "B loc_FF85E3E4\n" 150 145 151 152 146 "loc_FF85E310:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 153 147 "B loc_FF85E3FC\n" 154 148 155 156 149 "loc_FF85E314:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 157 150 "B loc_FF85E3F0\n" 158 151 159 160 152 "loc_FF85E318:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 161 153 "B loc_FF85E404\n" 162 154 163 164 155 "loc_FF85E31C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 165 156 "B loc_FF85E40C\n" 166 157 167 168 158 "loc_FF85E320:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 169 159 "B loc_FF85E414\n" 170 160 171 172 161 "loc_FF85E324:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 173 162 "B loc_FF85E46C\n" 174 163 175 176 164 "loc_FF85E328:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 177 165 "B loc_FF85E478\n" 178 166 179 180 167 "loc_FF85E32C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 181 168 "B loc_FF85E480\n" 182 169 183 184 170 "loc_FF85E330:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 185 171 "B loc_FF85E488\n" 186 172 187 188 173 "loc_FF85E334:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 189 174 "B loc_FF85E490\n" 190 175 191 192 176 "loc_FF85E338:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 193 177 "B loc_FF85E498\n" 194 178 195 196 179 "loc_FF85E33C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 197 180 "B loc_FF85E4A0\n" 198 181 199 200 182 "loc_FF85E340:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 201 183 "B loc_FF85E4A8\n" 202 184 203 204 185 "loc_FF85E344:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 205 186 "B loc_FF85E4B0\n" 206 187 207 208 188 "loc_FF85E348:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 209 189 "B loc_FF85E4BC\n" 210 190 211 212 191 "loc_FF85E34C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 213 192 "B loc_FF85E4C4\n" 214 193 215 216 194 "loc_FF85E350:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 217 195 "B loc_FF85E4CC\n" 218 196 219 220 197 "loc_FF85E354:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 221 198 "B loc_FF85E4D4\n" 222 199 223 224 200 "loc_FF85E358:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 225 201 "B loc_FF85E4E0\n" 226 202 227 228 203 "loc_FF85E35C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 229 204 "B loc_FF85E4E8\n" 230 205 231 232 206 "loc_FF85E360:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 233 207 "B loc_FF85E4F0\n" 234 208 235 236 209 "loc_FF85E364:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 237 210 "B loc_FF85E4F8\n" 238 211 239 240 212 "loc_FF85E368:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 241 213 "B loc_FF85E500\n" 242 214 243 244 215 "loc_FF85E36C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 245 216 "B loc_FF85E508\n" 246 217 247 248 218 "loc_FF85E370:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 249 219 "B loc_FF85E51C\n" 250 251 220 252 221 "loc_FF85E374:\n" // ; CODE XREF: task_CaptSeqTask+4Cj … … 282 251 "B loc_FF85E51C\n" 283 252 284 285 253 "loc_FF85E3DC:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 286 254 … … 289 257 "B loc_FF85E3F4\n" 290 258 291 292 259 "loc_FF85E3E4:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 293 294 260 295 261 "MOV R0, #1\n" … … 297 263 "B loc_FF85E51C\n" 298 264 299 300 265 "loc_FF85E3F0:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 301 266 302 303 267 "BL sub_FF93BE00\n" 304 268 … … 308 272 "B loc_FF85E51C\n" 309 273 310 311 274 "loc_FF85E3FC:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 312 313 275 314 276 "BL sub_FF93C134\n" 315 277 "B loc_FF85E3F4\n" 316 278 317 318 279 "loc_FF85E404:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 319 280 320 321 281 "BL sub_FF93C13C\n" 322 282 "B loc_FF85E51C\n" 323 283 324 325 284 "loc_FF85E40C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 326 327 285 328 286 "BL sub_FF93C230\n" 329 287 "B loc_FF85E470\n" 330 288 331 332 289 "loc_FF85E414:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 333 334 290 335 291 "LDR R4, [R0,#0xC]\n" … … 358 314 "B loc_FF85E51C\n" 359 315 360 361 316 "loc_FF85E46C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 362 363 317 364 318 "BL sub_FF93C290\n" … … 368 322 "B loc_FF85E51C\n" 369 323 370 371 324 "loc_FF85E478:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 372 325 373 374 326 "BL sub_FF93C134\n" 375 327 "B loc_FF85E51C\n" 376 328 377 378 329 "loc_FF85E480:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 379 330 380 381 331 "BL sub_FF93CBC4\n" 382 332 "B loc_FF85E51C\n" 383 333 384 385 334 "loc_FF85E488:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 386 335 387 388 336 "BL sub_FF93CDAC\n" 389 337 "B loc_FF85E51C\n" 390 338 391 392 339 "loc_FF85E490:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 393 340 394 395 341 "BL sub_FF93CE3C\n" 396 342 "B loc_FF85E51C\n" 397 343 398 399 344 "loc_FF85E498:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 400 345 401 402 346 "BL sub_FF93CEF0\n" 403 347 "B loc_FF85E51C\n" 404 348 405 406 349 "loc_FF85E4A0:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 407 350 408 409 351 "BL sub_FF93D0E8\n" 410 352 "B loc_FF85E51C\n" 411 353 412 413 354 "loc_FF85E4A8:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 414 355 415 416 356 "BL sub_FF93D138\n" 417 357 "B loc_FF85E51C\n" 418 358 419 420 359 "loc_FF85E4B0:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 421 422 360 423 361 "MOV R0, #0\n" … … 425 363 "B loc_FF85E51C\n" 426 364 427 428 365 "loc_FF85E4BC:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 429 366 430 431 367 "BL sub_FF93D30C\n" 432 368 "B loc_FF85E51C\n" 433 369 434 435 370 "loc_FF85E4C4:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 436 371 437 438 372 "BL sub_FF93D3A0\n" 439 373 "B loc_FF85E51C\n" 440 374 441 442 375 "loc_FF85E4CC:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 443 376 444 445 377 "BL sub_FF93D468\n" 446 378 "B loc_FF85E51C\n" 447 379 448 449 380 "loc_FF85E4D4:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 450 451 381 452 382 "BL sub_FF93C434\n" … … 454 384 "B loc_FF85E51C\n" 455 385 456 457 386 "loc_FF85E4E0:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 458 387 459 460 388 "BL sub_FF93CFAC\n" 461 389 "B loc_FF85E51C\n" 462 390 463 464 391 "loc_FF85E4E8:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 465 392 466 467 393 "BL sub_FF93D018\n" 468 394 "B loc_FF85E51C\n" 469 395 470 471 396 "loc_FF85E4F0:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 472 397 473 474 398 "BL sub_FF93F24C\n" 475 399 "B loc_FF85E51C\n" 476 400 477 478 401 "loc_FF85E4F8:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 479 402 480 481 403 "BL sub_FF93F268\n" 482 404 "B loc_FF85E51C\n" 483 405 484 485 406 "loc_FF85E500:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 486 407 487 488 408 "BL sub_FF93F278\n" 489 409 "B loc_FF85E51C\n" 490 410 491 492 411 "loc_FF85E508:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 493 412 494 495 413 "BL sub_FF93F2A4\n" 496 414 "B loc_FF85E51C\n" 497 415 498 499 416 "loc_FF85E510:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 500 501 417 502 418 "LDR R1, =0x58E\n" … … 505 421 506 422 "loc_FF85E51C:\n" // ; CODE XREF: task_CaptSeqTask+4Cj 507 508 423 509 424 "LDR R0, [SP,#0x20-0x20]\n" … … 566 481 "MOV R1, #1\n" 567 482 "BL sub_FF827B1C\n" 568 "BL sub_FF81BAA8\n" // eventproc_export_ExitTask483 "BL _ExitTask\n" 569 484 "ADD SP, SP, #0x20\n" 570 485 "LDMFD SP!, {R4-R8,PC}\n" -
branches/fe50t/platform/ixus90_sd790/sub/100d/lib.c
r222 r232 23 23 void *vid_get_viewport_live_fb() 24 24 { 25 // @ FF8C6004 25 26 void **fb=(void **)0x7424; 26 27 unsigned char buff = *((unsigned char*)0x72A0); … … 31 32 void *vid_get_bitmap_fb() 32 33 { 34 // @ FF8EAF4C 33 35 return (void*)0x10361000; // ixus90 34 36 } -
branches/fe50t/platform/ixus90_sd790/sub/100d/movie_rec.c
r222 r232 267 267 "LDR R0, [R5,#0x14]\n" 268 268 "MOV R1, #0x3E8\n" 269 "BL sub_FF81B6AC\n" // eventproc_export_TakeSemaphore269 "BL _TakeSemaphore\n" 270 270 "CMP R0, #9\n" 271 271 "BNE loc_FF859EA8\n" -
branches/fe50t/platform/ixus90_sd790/wrappers.c
r222 r232 3 3 long lens_get_focus_pos() 4 4 { 5 //return _GetFocusLensSubjectDistance(); // returns plaintext, calls GetCurrentTargetDistance to get value 6 return _GetCurrentTargetDistance(); 5 return _GetFocusLensSubjectDistance(); 7 6 } 8 7
Note: See TracChangeset
for help on using the changeset viewer.
