Changeset 748
- Timestamp:
- 04/21/09 12:10:37 (1 year ago)
- Files:
-
- trunk/Makefile (modified) (2 diffs)
- trunk/platform/ixus970_sd890/notes.txt (modified) (1 diff)
- trunk/platform/ixus970_sd890/sub/100b/boot.c (modified) (1 diff)
- trunk/platform/ixus970_sd890/sub/100b/capt_seq.c (modified) (9 diffs)
- trunk/platform/ixus970_sd890/sub/100b/movie_rec.c (modified) (3 diffs)
- trunk/platform/ixus970_sd890/sub/100c/boot.c (modified) (1 diff)
- trunk/platform/ixus970_sd890/sub/100c/capt_seq.c (modified) (10 diffs)
- trunk/platform/ixus970_sd890/sub/100c/movie_rec.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/Makefile
r740 r748 219 219 cp $(topdir)bin/$(VER)-ixus75_sd750-101a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus75_sd750-101b-$(BUILD_NUMBER).zip 220 220 cp $(topdir)bin/$(VER)-ixus80_sd1100-101a-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus80_sd1100-101b-$(BUILD_NUMBER).zip 221 cp $(topdir)bin/$(VER)-ixus970_sd890-100c-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-ixus970_sd890-100d-$(BUILD_NUMBER).zip 221 222 cp $(topdir)bin/$(VER)-g9-100g-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-g9-100f-$(BUILD_NUMBER).zip 222 223 cp $(topdir)bin/$(VER)-g9-100i-$(BUILD_NUMBER).zip $(topdir)bin/$(VER)-g9-100h-$(BUILD_NUMBER).zip … … 319 320 cp $(topdir)bin/ixus80_sd1100-101a-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus80_sd1100-101b-$(BUILD_NUMBER)-full.zip 320 321 cp $(topdir)bin/ixus80_sd1100-101a-$(BUILD_NUMBER).zip $(topdir)bin/ixus80_sd1100-101b-$(BUILD_NUMBER).zip 322 cp $(topdir)bin/ixus970_sd890-100c-$(BUILD_NUMBER)-full.zip $(topdir)bin/ixus970_sd890-100d-$(BUILD_NUMBER)-full.zip 323 cp $(topdir)bin/ixus970_sd890-100c-$(BUILD_NUMBER).zip $(topdir)bin/ixus970_sd890-100d-$(BUILD_NUMBER).zip 321 324 cp $(topdir)bin/g9-100g-$(BUILD_NUMBER)-full.zip $(topdir)bin/g9-100f-$(BUILD_NUMBER)-full.zip 322 325 cp $(topdir)bin/g9-100g-$(BUILD_NUMBER).zip $(topdir)bin/g9-100f-$(BUILD_NUMBER).zip trunk/platform/ixus970_sd890/notes.txt
r730 r748 21 21 22 22 IMPORTANT NOTICE: 23 Firmware version 100d is as good as identical to 100c, which is copied for 100d. 23 24 Development is done in the 100c tree! trunk/platform/ixus970_sd890/sub/100b/boot.c
r730 r748 451 451 "MOV R1, #0\n" 452 452 "MOV R0, R8\n" 453 //"BLX R12\n" 454 "MOV LR, PC\n" //expanded 455 "MOV PC, R12\n" //expanded 453 "BLX R12\n" 456 454 "CMP R0, #1\n" 457 455 "BNE loc_FF84EB98\n" trunk/platform/ixus970_sd890/sub/100b/capt_seq.c
r732 r748 494 494 "LDR R1, [R0,#4]\n" 495 495 "MOV R0, R1\n" 496 //"BLX R2\n" 497 "MOV LR, PC\n" //expanded 498 "MOV PC, R2\n" //expanded 496 "BLX R2\n" 499 497 "B loc_FF8B6E50\n" 500 498 … … 520 518 "LDR R0, [R1,#0x8C]\n" 521 519 "LDR R1, [R1,#0x88]\n" 522 //"BLX R1\n" 523 "MOV LR, PC\n" //expanded 524 "MOV PC, R1\n" //expanded 520 "BLX R1\n" 525 521 "B loc_FF8B6E50\n" 526 522 … … 586 582 "LDR R2, [R0,#0x8C]\n" 587 583 "ADD R0, R0, #4\n" 588 //"BLX R3\n" 589 "MOV LR, PC\n" //expanded 590 "MOV PC, R3\n" //expanded 584 "BLX R3\n" 591 585 "LDR R0, [SP,#0x38-0x1C]\n" 592 586 "BL sub_FF8B7EA4\n" // LOCATION: ExpDrv.c:0 … … 596 590 "LDR R2, [R0,#0x94]\n" 597 591 "ADD R0, R0, #4\n" 598 //"BLX R3\n" 599 "MOV LR, PC\n" //expanded 600 "MOV PC, R3\n" //expanded 592 "BLX R3\n" 601 593 "B loc_FF8B6D90\n" 602 594 … … 620 612 "LDR R3, [R0,#4]\n" 621 613 "MOV R0, SP\n" 622 //"BLX R12\n" 623 "MOV LR, PC\n" //expanded 624 "MOV PC, R12\n" //expanded 614 "BLX R12\n" 625 615 "B loc_FF8B6AE0\n" 626 616 … … 635 625 "MOV R2, R4\n" 636 626 "MOV R1, #1\n" 637 //"BLX R12\n" 638 "MOV LR, PC\n" //expanded 639 "MOV PC, R12\n" //expanded 627 "BLX R12\n" 640 628 "LDR R0, [SP,#0x38-0x1C]\n" 641 629 "MOV R2, SP\n" … … 655 643 "ADD R0, R0, #4\n" 656 644 "MOV R2, R4\n" 657 //"BLX R12\n" 658 "MOV LR, PC\n" //expanded 659 "MOV PC, R12\n" //expanded 645 "BLX R12\n" 660 646 "B loc_FF8B6D90\n" 661 647 … … 676 662 "LDR R2, [R0,#0x8C]\n" 677 663 "ADD R0, R0, #4\n" 678 //"BLX R3\n" 679 "MOV LR, PC\n" //expanded 680 "MOV PC, R3\n" //expanded 664 "BLX R3\n" 681 665 "LDR R0, [SP,#0x38-0x1C]\n" 682 666 "BL sub_FF8B4BA4\n" // LOCATION: ExpDrv.c:0 … … 932 916 "LDR R2, [R0,#0x8C]\n" 933 917 "ADD R0, R0, #4\n" 934 //"BLX R3\n" 935 "MOV LR, PC\n" //expanded 936 "MOV PC, R3\n" //expanded 918 "BLX R3\n" 937 919 "CMP R4, #1\n" 938 920 "BNE loc_FF8B6DD8\n" trunk/platform/ixus970_sd890/sub/100b/movie_rec.c
r732 r748 153 153 void __attribute__((naked,noinline)) sub_FF859A9C_my() 154 154 { 155 asm volatile ( 155 asm volatile ( 156 156 "STMFD SP!, {R4-R9,LR}\n" 157 157 "SUB SP, SP, #0x3C\n" … … 167 167 "LDR R0, [R5,#0xA4]\n" 168 168 "MOV R6, #0\n" 169 //"BLX R0\n" 170 "MOV LR, PC\n" //expanded 171 "MOV PC, R0\n" //expanded 169 "BLX R0\n" 172 170 "LDR R0, [R5,#0x3C]\n" 173 171 "CMP R0, #4\n" … … 322 320 "LDR R1, [R5,#0x88]\n" 323 321 "MOV R0, R4\n" 324 //"BLX R1\n" 325 "MOV LR, PC\n" //expanded 326 "MOV PC, R1\n" //expanded 322 "BLX R1\n" 327 323 "STR R4, [R5,#0x74]\n" 328 324 "STR R7, [R5,#0x34]\n" trunk/platform/ixus970_sd890/sub/100c/boot.c
r732 r748 451 451 "MOV R1, #0\n" 452 452 "MOV R0, R8\n" 453 //"BLX R12\n" 454 "MOV LR, PC\n" //expanded 455 "MOV PC, R12\n" //expanded 453 "BLX R12\n" 456 454 "CMP R0, #1\n" 457 455 "BNE loc_FF84EB98\n" trunk/platform/ixus970_sd890/sub/100c/capt_seq.c
r732 r748 494 494 "LDR R1, [R0,#4]\n" 495 495 "MOV R0, R1\n" 496 //"BLX R2\n" 497 "MOV LR, PC\n" //expanded 498 "MOV PC, R2\n" //expanded 496 "BLX R2\n" 499 497 "B loc_FF8B6E50\n" 500 498 … … 520 518 "LDR R0, [R1,#0x8C]\n" 521 519 "LDR R1, [R1,#0x88]\n" 522 //"BLX R1\n" 523 "MOV LR, PC\n" //expanded 524 "MOV PC, R1\n" //expanded 520 "BLX R1\n" 525 521 "B loc_FF8B6E50\n" 526 522 … … 586 582 "LDR R2, [R0,#0x8C]\n" 587 583 "ADD R0, R0, #4\n" 588 //"BLX R3\n" 589 "MOV LR, PC\n" //expanded 590 "MOV PC, R3\n" //expanded 584 "BLX R3\n" 591 585 "LDR R0, [SP,#0x38-0x1C]\n" 592 586 "BL sub_FF8B7EA4\n" // LOCATION: ExpDrv.c:0 … … 596 590 "LDR R2, [R0,#0x94]\n" 597 591 "ADD R0, R0, #4\n" 598 //"BLX R3\n" 599 "MOV LR, PC\n" //expanded 600 "MOV PC, R3\n" //expanded 592 "BLX R3\n" 601 593 "B loc_FF8B6D90\n" 602 594 … … 620 612 "LDR R3, [R0,#4]\n" 621 613 "MOV R0, SP\n" 622 //"BLX R12\n" 623 "MOV LR, PC\n" //expanded 624 "MOV PC, R12\n" //expanded 614 "BLX R12\n" 625 615 "B loc_FF8B6AE0\n" 626 616 … … 635 625 "MOV R2, R4\n" 636 626 "MOV R1, #1\n" 637 //"BLX R12\n" 638 "MOV LR, PC\n" //expanded 639 "MOV PC, R12\n" //expanded 627 "BLX R12\n" 640 628 "LDR R0, [SP,#0x38-0x1C]\n" 641 629 "MOV R2, SP\n" … … 655 643 "ADD R0, R0, #4\n" 656 644 "MOV R2, R4\n" 657 //"BLX R12\n" 658 "MOV LR, PC\n" //expanded 659 "MOV PC, R12\n" //expanded 645 "BLX R12\n" 660 646 "B loc_FF8B6D90\n" 661 647 … … 676 662 "LDR R2, [R0,#0x8C]\n" 677 663 "ADD R0, R0, #4\n" 678 //"BLX R3\n" 679 "MOV LR, PC\n" //expanded 680 "MOV PC, R3\n" //expanded 664 "BLX R3\n" 681 665 "LDR R0, [SP,#0x38-0x1C]\n" 682 666 "BL sub_FF8B4BA4\n" // LOCATION: ExpDrv.c:0 … … 932 916 "LDR R2, [R0,#0x8C]\n" 933 917 "ADD R0, R0, #4\n" 934 //"BLX R3\n" 935 "MOV LR, PC\n" //expanded 936 "MOV PC, R3\n" //expanded 918 "BLX R3\n" 937 919 "CMP R4, #1\n" 938 920 "BNE loc_FF8B6DD8\n" … … 1058 1040 "LDRSH R0, [R4,#6]\n" 1059 1041 //"BL sub_FF895968\n" // LOCATION: Shutter.c:0 1060 "BL sub_FF895968_my\n" 1042 "BL sub_FF895968_my\n" //------------> 1061 1043 "LDRSH R0, [R4,#8]\n" 1062 1044 "MOV R1, #1\n" trunk/platform/ixus970_sd890/sub/100c/movie_rec.c
r732 r748 153 153 void __attribute__((naked,noinline)) sub_FF859A9C_my() 154 154 { 155 asm volatile ( 155 asm volatile ( 156 156 "STMFD SP!, {R4-R9,LR}\n" 157 157 "SUB SP, SP, #0x3C\n" … … 167 167 "LDR R0, [R5,#0xA4]\n" 168 168 "MOV R6, #0\n" 169 //"BLX R0\n" 170 "MOV LR, PC\n" //expanded 171 "MOV PC, R0\n" //expanded 169 "BLX R0\n" 172 170 "LDR R0, [R5,#0x3C]\n" 173 171 "CMP R0, #4\n" … … 322 320 "LDR R1, [R5,#0x88]\n" 323 321 "MOV R0, R4\n" 324 //"BLX R1\n" 325 "MOV LR, PC\n" //expanded 326 "MOV PC, R1\n" //expanded 322 "BLX R1\n" 327 323 "STR R4, [R5,#0x74]\n" 328 324 "STR R7, [R5,#0x34]\n"
