Merge branch 'master' of git@github.com:optixx/snesram

This commit is contained in:
david 2009-06-05 10:21:14 +02:00
commit 74e238bdca
6 changed files with 35 additions and 270 deletions

1
.gitignore vendored
View File

@ -26,3 +26,4 @@
*.TMP *.TMP
*.vfat *.vfat
*.wla* *.wla*
*.rcc

View File

@ -4,5 +4,7 @@ version: "0.5"
components: components:
- !ditz.rubyforge.org,2008-03-06/component - !ditz.rubyforge.org,2008-03-06/component
name: snesram name: snesram
- !ditz.rubyforge.org,2008-03-06/component
name: fatfs
releases: [] releases: []

View File

@ -66,15 +66,15 @@ hook.obj: hook.asm
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -HB -M21 -V -T -Pff \ $(LD) -HB -M21 -V -T -Pff \
-C008000,000000 -U000000,000000 \ -C3e8000,000000 -U000000,000000 \
-Avectors=FFE4,7FE4 \ -Avectors=FFE4,7FE4 \
-Aregistration_data=FFB0,7FB0 \ -Aregistration_data=FFB0,7FB0 \
-Aressource=3f8000,8000 \ -Aressource=3f8000,8000 \
-Ahook=0108000,0000 \
-N $(OBJS) $(LIBS) -O $@ -N $(OBJS) $(LIBS) -O $@
ucon64 -snes -chk $(APP) 2>&1 >/dev/null ucon64 -snes -chk $(APP) 2>&1 >/dev/null
#-Ahook=008000,0000 \
clean: clean:
rm -vf $(APP) *.obj *.TMP rm -vf $(APP) *.obj *.TMP

5
snes/fatfstest/hook.asm Normal file
View File

@ -0,0 +1,5 @@
HOOK SECTION
XDEF START
HOOK:
jsr >START
brk

View File

@ -119,7 +119,7 @@ FRESULT scan_files (char* path){
return res; return res;
} }
void wait(){ void wait(void){
printfc("SNES::wait: press A to continue\n"); printfc("SNES::wait: press A to continue\n");
enablePad(); enablePad();
//waitForVBlank(); //waitForVBlank();
@ -152,7 +152,7 @@ void main(void) {
put_rc(f_mount(0, &fatfs[0])); put_rc(f_mount(0, &fatfs[0]));
#if 0 #if 1
printfc("SNES::main: Try to get free\n"); printfc("SNES::main: Try to get free\n");
res = f_getfree("", &p2, &fs); res = f_getfree("", &p2, &fs);
if (res) if (res)

View File

@ -3,7 +3,7 @@
<plist version="1.0"> <plist version="1.0">
<dict> <dict>
<key>currentDocument</key> <key>currentDocument</key>
<string>snes/fatfstest/diskio.c</string> <string>snes/fatfstest/integer.h</string>
<key>documents</key> <key>documents</key>
<array> <array>
<dict> <dict>
@ -77,42 +77,14 @@
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>211</integer> <integer>211</integer>
</dict> </dict>
<key>snes/fatfstest/data.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>snes/fatfstest/debug.c</key> <key>snes/fatfstest/debug.c</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
<dict> <dict>
<key>column</key> <key>column</key>
<integer>0</integer> <integer>1</integer>
<key>line</key> <key>line</key>
<integer>71</integer> <integer>39</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>43</integer>
</dict>
<key>snes/fatfstest/debug.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>19</integer>
<key>line</key>
<integer>4</integer>
</dict> </dict>
<key>firstVisibleColumn</key> <key>firstVisibleColumn</key>
<integer>0</integer> <integer>0</integer>
@ -124,30 +96,16 @@
<key>caret</key> <key>caret</key>
<dict> <dict>
<key>column</key> <key>column</key>
<integer>9</integer> <integer>25</integer>
<key>line</key> <key>line</key>
<integer>7</integer> <integer>39</integer>
</dict> </dict>
<key>firstVisibleColumn</key> <key>firstVisibleColumn</key>
<integer>0</integer> <integer>0</integer>
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>0</integer> <integer>13</integer>
</dict> </dict>
<key>snes/fatfstest/diskio.h</key> <key>snes/fatfstest/event.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>28</integer>
<key>line</key>
<integer>50</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>3</integer>
</dict>
<key>snes/fatfstest/event.c</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
<dict> <dict>
@ -161,49 +119,35 @@
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>snes/fatfstest/ff.c</key> <key>snes/fatfstest/integer.h</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
<dict> <dict>
<key>column</key> <key>column</key>
<integer>0</integer> <integer>2</integer>
<key>line</key> <key>line</key>
<integer>169</integer> <integer>35</integer>
</dict> </dict>
<key>firstVisibleColumn</key> <key>firstVisibleColumn</key>
<integer>0</integer> <integer>0</integer>
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>136</integer>
</dict>
<key>snes/fatfstest/ff.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>22</integer>
<key>line</key>
<integer>40</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer> <integer>0</integer>
<key>firstVisibleLine</key>
<integer>49</integer>
</dict> </dict>
<key>snes/fatfstest/main.c</key> <key>snes/fatfstest/main.c</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
<dict> <dict>
<key>column</key> <key>column</key>
<integer>0</integer> <integer>13</integer>
<key>line</key> <key>line</key>
<integer>114</integer> <integer>22</integer>
</dict> </dict>
<key>firstVisibleColumn</key> <key>firstVisibleColumn</key>
<integer>0</integer> <integer>0</integer>
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>98</integer> <integer>62</integer>
</dict> </dict>
<key>snes/fatfstest/pad.h</key> <key>snes/fatfstest/pad.c</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
<dict> <dict>
@ -245,48 +189,6 @@
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>24</integer> <integer>24</integer>
</dict> </dict>
<key>tools/bsnes/chip/cmmio/cmmio.cpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>14</integer>
<key>line</key>
<integer>34</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/chip/cmmio/cmmio.hpp</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>16</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/chip/fatfs/config.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>1</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/chip/fatfs/diskio.cpp</key> <key>tools/bsnes/chip/fatfs/diskio.cpp</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
@ -299,21 +201,7 @@
<key>firstVisibleColumn</key> <key>firstVisibleColumn</key>
<integer>0</integer> <integer>0</integer>
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>89</integer> <integer>24</integer>
</dict>
<key>tools/bsnes/chip/fatfs/diskio.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>28</integer>
<key>line</key>
<integer>50</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>11</integer>
</dict> </dict>
<key>tools/bsnes/chip/fatfs/fatfs.cpp</key> <key>tools/bsnes/chip/fatfs/fatfs.cpp</key>
<dict> <dict>
@ -327,7 +215,7 @@
<key>firstVisibleColumn</key> <key>firstVisibleColumn</key>
<integer>0</integer> <integer>0</integer>
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>0</integer> <integer>43</integer>
</dict> </dict>
<key>tools/bsnes/chip/fatfs/fatfs.hpp</key> <key>tools/bsnes/chip/fatfs/fatfs.hpp</key>
<dict> <dict>
@ -343,20 +231,6 @@
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>tools/bsnes/chip/fatfs/integer.h</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>0</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
<key>tools/bsnes/cpu/scpu/memory/memory.hpp</key> <key>tools/bsnes/cpu/scpu/memory/memory.hpp</key>
<dict> <dict>
<key>caret</key> <key>caret</key>
@ -371,139 +245,22 @@
<key>firstVisibleLine</key> <key>firstVisibleLine</key>
<integer>0</integer> <integer>0</integer>
</dict> </dict>
<key>tools/ffsample/linux/diskio.c</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>141</integer>
</dict>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>115</integer>
</dict>
<key>tools/ffsample/linux/main.c</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>63</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>149</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>52</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>63</integer>
</dict>
</dict>
<key>tools/wdcheader/TIME.H</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>13</integer>
<key>line</key>
<integer>103</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>71</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>12</integer>
<key>line</key>
<integer>103</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>18</integer>
<key>line</key>
<integer>103</integer>
</dict>
</dict>
<key>tools/wdcheader/WCHAR.H</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>76</integer>
</dict>
<key>columnSelection</key>
<false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
<integer>0</integer>
<key>selectFrom</key>
<dict>
<key>column</key>
<integer>74</integer>
<key>line</key>
<integer>76</integer>
</dict>
<key>selectTo</key>
<dict>
<key>column</key>
<integer>0</integer>
<key>line</key>
<integer>76</integer>
</dict>
</dict>
</dict> </dict>
<key>openDocuments</key> <key>openDocuments</key>
<array> <array>
<string>snes/fatfstest/debug.c</string> <string>snes/fatfstest/debug.c</string>
<string>tools/bsnes/chip/cmmio/cmmio.hpp</string> <string>snes/fatfstest/pad.c</string>
<string>tools/bsnes/chip/cmmio/cmmio.cpp</string>
<string>snes/fatfstest/ff.h</string>
<string>snes/fatfstest/ff.c</string>
<string>tools/ffsample/linux/main.c</string>
<string>snes/fatfstest/pad.h</string>
<string>snes/fatfstest/event.c</string>
<string>snes/fatfstest/main.c</string>
<string>tools/wdcheader/TIME.H</string>
<string>tools/wdcheader/WCHAR.H</string>
<string>snes/fatfstest/debug.h</string>
<string>tools/ffsample/linux/diskio.c</string>
<string>snes/fatfstest/data.h</string>
<string>tools/bsnes/chip/fatfs/fatfs.cpp</string>
<string>snes/fatfstest/diskio.c</string> <string>snes/fatfstest/diskio.c</string>
<string>snes/fatfstest/diskio.h</string> <string>snes/fatfstest/main.c</string>
<string>tools/bsnes/chip/fatfs/config.h</string> <string>snes/fatfstest/event.h</string>
<string>tools/bsnes/chip/fatfs/diskio.cpp</string> <string>snes/fatfstest/integer.h</string>
<string>tools/bsnes/chip/fatfs/diskio.h</string>
<string>tools/bsnes/chip/fatfs/integer.h</string>
<string>tools/bsnes/chip/fatfs/fatfs.hpp</string> <string>tools/bsnes/chip/fatfs/fatfs.hpp</string>
<string>tools/bsnes/chip/fatfs/fatfs.cpp</string>
<string>tools/bsnes/chip/fatfs/diskio.cpp</string>
</array> </array>
<key>showFileHierarchyDrawer</key> <key>showFileHierarchyDrawer</key>
<false/> <false/>
<key>windowFrame</key> <key>windowFrame</key>
<string>{{0, 55}, {1110, 823}}</string> <string>{{0, 60}, {1110, 818}}</string>
</dict> </dict>
</plist> </plist>