diff --git a/.gitignore b/.gitignore index f7f48d0..596b10b 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ *.TMP *.vfat *.wla* +*.rcc diff --git a/bugs/project.yaml b/bugs/project.yaml index 4f13f96..0f294db 100644 --- a/bugs/project.yaml +++ b/bugs/project.yaml @@ -4,5 +4,7 @@ version: "0.5" components: - !ditz.rubyforge.org,2008-03-06/component name: snesram +- !ditz.rubyforge.org,2008-03-06/component + name: fatfs releases: [] diff --git a/snes/fatfstest/Makefile b/snes/fatfstest/Makefile index 6f0a838..8c9c055 100644 --- a/snes/fatfstest/Makefile +++ b/snes/fatfstest/Makefile @@ -66,15 +66,15 @@ hook.obj: hook.asm $(APP): $(OBJS) $(LD) -HB -M21 -V -T -Pff \ - -C008000,000000 -U000000,000000 \ + -C3e8000,000000 -U000000,000000 \ -Avectors=FFE4,7FE4 \ -Aregistration_data=FFB0,7FB0 \ -Aressource=3f8000,8000 \ + -Ahook=0108000,0000 \ -N $(OBJS) $(LIBS) -O $@ ucon64 -snes -chk $(APP) 2>&1 >/dev/null - #-Ahook=008000,0000 \ clean: rm -vf $(APP) *.obj *.TMP diff --git a/snes/fatfstest/hook.asm b/snes/fatfstest/hook.asm new file mode 100644 index 0000000..b6c81ab --- /dev/null +++ b/snes/fatfstest/hook.asm @@ -0,0 +1,5 @@ +HOOK SECTION + XDEF START +HOOK: + jsr >START + brk diff --git a/snes/fatfstest/main.c b/snes/fatfstest/main.c index 172d4e0..0a4e11b 100644 --- a/snes/fatfstest/main.c +++ b/snes/fatfstest/main.c @@ -119,7 +119,7 @@ FRESULT scan_files (char* path){ return res; } -void wait(){ +void wait(void){ printfc("SNES::wait: press A to continue\n"); enablePad(); //waitForVBlank(); @@ -152,7 +152,7 @@ void main(void) { put_rc(f_mount(0, &fatfs[0])); -#if 0 +#if 1 printfc("SNES::main: Try to get free\n"); res = f_getfree("", &p2, &fs); if (res) diff --git a/snesram.tmproj b/snesram.tmproj index 26e913b..72a28d8 100644 --- a/snesram.tmproj +++ b/snesram.tmproj @@ -3,7 +3,7 @@ currentDocument - snes/fatfstest/diskio.c + snes/fatfstest/integer.h documents @@ -77,42 +77,14 @@ firstVisibleLine 211 - snes/fatfstest/data.h - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - snes/fatfstest/debug.c caret column - 0 + 1 line - 71 - - firstVisibleColumn - 0 - firstVisibleLine - 43 - - snes/fatfstest/debug.h - - caret - - column - 19 - line - 4 + 39 firstVisibleColumn 0 @@ -124,30 +96,16 @@ caret column - 9 + 25 line - 7 + 39 firstVisibleColumn 0 firstVisibleLine - 0 + 13 - snes/fatfstest/diskio.h - - caret - - column - 28 - line - 50 - - firstVisibleColumn - 0 - firstVisibleLine - 3 - - snes/fatfstest/event.c + snes/fatfstest/event.h caret @@ -161,49 +119,35 @@ firstVisibleLine 0 - snes/fatfstest/ff.c + snes/fatfstest/integer.h caret column - 0 + 2 line - 169 + 35 firstVisibleColumn 0 firstVisibleLine - 136 - - snes/fatfstest/ff.h - - caret - - column - 22 - line - 40 - - firstVisibleColumn 0 - firstVisibleLine - 49 snes/fatfstest/main.c caret column - 0 + 13 line - 114 + 22 firstVisibleColumn 0 firstVisibleLine - 98 + 62 - snes/fatfstest/pad.h + snes/fatfstest/pad.c caret @@ -245,48 +189,6 @@ firstVisibleLine 24 - tools/bsnes/chip/cmmio/cmmio.cpp - - caret - - column - 14 - line - 34 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/bsnes/chip/cmmio/cmmio.hpp - - caret - - column - 0 - line - 16 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - - tools/bsnes/chip/fatfs/config.h - - caret - - column - 0 - line - 1 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - tools/bsnes/chip/fatfs/diskio.cpp caret @@ -299,21 +201,7 @@ firstVisibleColumn 0 firstVisibleLine - 89 - - tools/bsnes/chip/fatfs/diskio.h - - caret - - column - 28 - line - 50 - - firstVisibleColumn - 0 - firstVisibleLine - 11 + 24 tools/bsnes/chip/fatfs/fatfs.cpp @@ -327,7 +215,7 @@ firstVisibleColumn 0 firstVisibleLine - 0 + 43 tools/bsnes/chip/fatfs/fatfs.hpp @@ -343,20 +231,6 @@ firstVisibleLine 0 - tools/bsnes/chip/fatfs/integer.h - - caret - - column - 0 - line - 0 - - firstVisibleColumn - 0 - firstVisibleLine - 0 - tools/bsnes/cpu/scpu/memory/memory.hpp caret @@ -371,139 +245,22 @@ firstVisibleLine 0 - tools/ffsample/linux/diskio.c - - caret - - column - 0 - line - 141 - - firstVisibleColumn - 0 - firstVisibleLine - 115 - - tools/ffsample/linux/main.c - - caret - - column - 0 - line - 63 - - columnSelection - - firstVisibleColumn - 0 - firstVisibleLine - 149 - selectFrom - - column - 0 - line - 52 - - selectTo - - column - 0 - line - 63 - - - tools/wdcheader/TIME.H - - caret - - column - 13 - line - 103 - - columnSelection - - firstVisibleColumn - 0 - firstVisibleLine - 71 - selectFrom - - column - 12 - line - 103 - - selectTo - - column - 18 - line - 103 - - - tools/wdcheader/WCHAR.H - - caret - - column - 0 - line - 76 - - columnSelection - - firstVisibleColumn - 0 - firstVisibleLine - 0 - selectFrom - - column - 74 - line - 76 - - selectTo - - column - 0 - line - 76 - - openDocuments snes/fatfstest/debug.c - tools/bsnes/chip/cmmio/cmmio.hpp - tools/bsnes/chip/cmmio/cmmio.cpp - snes/fatfstest/ff.h - snes/fatfstest/ff.c - tools/ffsample/linux/main.c - snes/fatfstest/pad.h - snes/fatfstest/event.c - snes/fatfstest/main.c - tools/wdcheader/TIME.H - tools/wdcheader/WCHAR.H - snes/fatfstest/debug.h - tools/ffsample/linux/diskio.c - snes/fatfstest/data.h - tools/bsnes/chip/fatfs/fatfs.cpp + snes/fatfstest/pad.c snes/fatfstest/diskio.c - snes/fatfstest/diskio.h - tools/bsnes/chip/fatfs/config.h - tools/bsnes/chip/fatfs/diskio.cpp - tools/bsnes/chip/fatfs/diskio.h - tools/bsnes/chip/fatfs/integer.h + snes/fatfstest/main.c + snes/fatfstest/event.h + snes/fatfstest/integer.h tools/bsnes/chip/fatfs/fatfs.hpp + tools/bsnes/chip/fatfs/fatfs.cpp + tools/bsnes/chip/fatfs/diskio.cpp showFileHierarchyDrawer windowFrame - {{0, 55}, {1110, 823}} + {{0, 60}, {1110, 818}}