Changeset 403
- Timestamp:
- 05/21/08 11:51:54 (5 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 9 edited
-
include/camera.h (modified) (1 diff)
-
platform/generic/wrappers.c (modified) (5 diffs)
-
platform/ixus700_sd500/main.c (modified) (1 diff)
-
platform/ixus700_sd500/sub/101a/Makefile (modified) (1 diff)
-
platform/ixus700_sd500/sub/101a/mount.c (added)
-
platform/ixus700_sd500/sub/101a/stubs_auto.S (modified) (3 diffs)
-
platform/ixus700_sd500/sub/101a/stubs_entry_2.S (modified) (1 diff)
-
platform/ixus700_sd500/sub/101b/Makefile (modified) (1 diff)
-
platform/ixus700_sd500/sub/101b/mount.c (added)
-
platform/ixus700_sd500/sub/101b/stubs_auto.S (modified) (3 diffs)
-
platform/ixus700_sd500/sub/101b/stubs_entry_2.S (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/camera.h
r395 r403 349 349 #define CAM_SHOW_OSD_IN_SHOOT_MENU 1 350 350 #undef CAM_HAS_IS 351 #define CAM_MULTIPART 1 351 352 352 353 //---------------------------------------------------------- -
trunk/platform/generic/wrappers.c
r395 r403 451 451 452 452 #if CAM_MULTIPART 453 static char mbr_buf[512]; 453 454 #define SECTOR_SIZE 512 455 char *mbr_buf; 454 456 static unsigned long drive_sectors; 455 457 … … 462 464 if ((mbr_sector[0x1FE]!=0x55) || (mbr_sector[0x1FF]!=0xAA)) return 0; // signature check 463 465 464 _memcpy(mbr_buf,mbr_sector,512); 466 mbr_buf=_AllocateUncacheableMemory(SECTOR_SIZE); 467 _memcpy(mbr_buf,mbr_sector,SECTOR_SIZE); 465 468 drive_sectors=drive_total_sectors; 466 469 … … 507 510 mbr_buf[i+0x1CE]=c; 508 511 } 509 _WriteSDCard(0,0,1, &mbr_buf);512 _WriteSDCard(0,0,1,mbr_buf); 510 513 } 511 514 … … 514 517 char type; 515 518 516 _memset(mbr_buf,0, sizeof(mbr_buf));519 _memset(mbr_buf,0,SECTOR_SIZE); 517 520 518 start=1; length=2*1024*1024/ 512; //2 Mb521 start=1; length=2*1024*1024/SECTOR_SIZE; //2 Mb 519 522 type=1; // FAT primary 520 523 mbr_buf[0x1BE + 4]=type; … … 530 533 mbr_buf[0x1FE]=0x55; mbr_buf[0x1FF]=0xAA; // signature; 531 534 532 _WriteSDCard(0,0,1, &mbr_buf);535 _WriteSDCard(0,0,1,mbr_buf); 533 536 } 534 537 -
trunk/platform/ixus700_sd500/main.c
r357 r403 94 94 } 95 95 if (my_ncmp(name, "tInitFileM", 10) == 0){ 96 taskfsprev = (void*)(*entry);97 *entry = (long) task_fs;96 // taskfsprev = (void*)(*entry); 97 *entry = (long)init_file_modules_task; 98 98 } 99 99 -
trunk/platform/ixus700_sd500/sub/101a/Makefile
r379 r403 1 1 topdir=../../../../ 2 2 3 OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o 4 STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 3 OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o mount.o 4 STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c mount.c 5 5 6 6 include $(topdir)/platform/makefile_sub.inc -
trunk/platform/ixus700_sd500/sub/101a/stubs_auto.S
r379 r403 16 16 STUB(FF811AEC) 17 17 STUB(FF811B18) 18 STUB(FF812954) 19 STUB(FF8129A0) 18 20 STUB(FF813E68) 19 21 STUB(FF81FDA0) … … 28 30 STUB(FF82952C) 29 31 STUB(FF829C08) 32 STUB(FF82DC30) 33 STUB(FF82DCA8) 34 STUB(FF85ED80) 35 STUB(FF8663A4) 36 STUB(FF866D84) 37 STUB(FF868100) 38 STUB(FF868EE8) 39 STUB(FF868FEC) 40 STUB(FF869720) 41 STUB(FF869770) 42 STUB(FF869818) 43 STUB(FF869968) 44 STUB(FF869A84) 45 STUB(FF869B0C) 46 STUB(FF869C84) 47 STUB(FF87CDB4) 30 48 STUB(FF898CA0) 31 49 STUB(FF898D4C) … … 77 95 STUB(FF964D9C) 78 96 STUB(FF98D144) 97 STUB(FF9A332C) 98 STUB(FF9A333C) 79 99 STUB(FFA49210) 100 STUB(FFA96858) 101 STUB(FFA96870) 80 102 STUB(FFAA17D4) 81 103 STUB(FFAAF2A0) -
trunk/platform/ixus700_sd500/sub/101a/stubs_entry_2.S
r333 r403 39 39 NHSTUB(GetDrive_TotalClusters, 0xFF86A18C) 40 40 NHSTUB(GetDrive_FreeClusters, 0xFF86A1C8) 41 NHSTUB(WriteSDCard, 0xFF87CACC) -
trunk/platform/ixus700_sd500/sub/101b/Makefile
r379 r403 1 1 topdir=../../../../ 2 2 3 OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o 4 STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c 3 OBJS=boot.o stubs_min.o stubs_auto.o stubs_entry.o lib.o stubs_entry_2.o capt_seq.o movie_rec.o mount.o 4 STUBS_AUTO_DEPS=boot.c capt_seq.c movie_rec.c mount.c 5 5 6 6 include $(topdir)/platform/makefile_sub.inc -
trunk/platform/ixus700_sd500/sub/101b/stubs_auto.S
r379 r403 16 16 STUB(FF811AEC) 17 17 STUB(FF811B18) 18 STUB(FF812954) 19 STUB(FF8129A0) 18 20 STUB(FF813E68) 19 21 STUB(FF81FDA0) … … 28 30 STUB(FF82952C) 29 31 STUB(FF829C08) 32 STUB(FF82DC30) 33 STUB(FF82DCA8) 34 STUB(FF85ED80) 35 STUB(FF8663A4) 36 STUB(FF866D84) 37 STUB(FF868100) 38 STUB(FF868EE8) 39 STUB(FF868FEC) 40 STUB(FF869720) 41 STUB(FF869770) 42 STUB(FF869818) 43 STUB(FF869968) 44 STUB(FF869A84) 45 STUB(FF869B0C) 46 STUB(FF869C84) 47 STUB(FF87CDB4) 30 48 STUB(FF898CA0) 31 49 STUB(FF898D4C) … … 77 95 STUB(FF964DEC) 78 96 STUB(FF98D194) 97 STUB(FF9A337C) 98 STUB(FF9A338C) 79 99 STUB(FFA49260) 100 STUB(FFA968A8) 101 STUB(FFA968C0) 80 102 STUB(FFAA1824) 81 103 STUB(FFAAF2F0) -
trunk/platform/ixus700_sd500/sub/101b/stubs_entry_2.S
r333 r403 39 39 NHSTUB(GetDrive_TotalClusters, 0xFF86A18C) 40 40 NHSTUB(GetDrive_FreeClusters, 0xFF86A1C8) 41 42 43 44 41 NHSTUB(WriteSDCard, 0xFF87CACC)
Note: See TracChangeset
for help on using the changeset viewer.