Browse Source

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

david 15 years ago
parent
commit
74e238bdca
6 changed files with 34 additions and 269 deletions
  1. 1 0
      .gitignore
  2. 2 0
      bugs/project.yaml
  3. 2 2
      snes/fatfstest/Makefile
  4. 5 0
      snes/fatfstest/hook.asm
  5. 2 2
      snes/fatfstest/main.c
  6. 22 265
      snesram.tmproj

+ 1 - 0
.gitignore

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

+ 2 - 0
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: []
 

+ 2 - 2
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

+ 5 - 0
snes/fatfstest/hook.asm

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

+ 2 - 2
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)

+ 22 - 265
snesram.tmproj

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>currentDocument</key>
-	<string>snes/fatfstest/diskio.c</string>
+	<string>snes/fatfstest/integer.h</string>
 	<key>documents</key>
 	<array>
 		<dict>
@@ -77,42 +77,14 @@
 			<key>firstVisibleLine</key>
 			<integer>211</integer>
 		</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>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>0</integer>
-				<key>line</key>
-				<integer>71</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>
+				<integer>1</integer>
 				<key>line</key>
-				<integer>4</integer>
+				<integer>39</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
@@ -124,30 +96,16 @@
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>9</integer>
-				<key>line</key>
-				<integer>7</integer>
-			</dict>
-			<key>firstVisibleColumn</key>
-			<integer>0</integer>
-			<key>firstVisibleLine</key>
-			<integer>0</integer>
-		</dict>
-		<key>snes/fatfstest/diskio.h</key>
-		<dict>
-			<key>caret</key>
-			<dict>
-				<key>column</key>
-				<integer>28</integer>
+				<integer>25</integer>
 				<key>line</key>
-				<integer>50</integer>
+				<integer>39</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>3</integer>
+			<integer>13</integer>
 		</dict>
-		<key>snes/fatfstest/event.c</key>
+		<key>snes/fatfstest/event.h</key>
 		<dict>
 			<key>caret</key>
 			<dict>
@@ -161,49 +119,35 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</dict>
-		<key>snes/fatfstest/ff.c</key>
+		<key>snes/fatfstest/integer.h</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>0</integer>
+				<integer>2</integer>
 				<key>line</key>
-				<integer>169</integer>
+				<integer>35</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<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>
-			<key>firstVisibleLine</key>
-			<integer>49</integer>
 		</dict>
 		<key>snes/fatfstest/main.c</key>
 		<dict>
 			<key>caret</key>
 			<dict>
 				<key>column</key>
-				<integer>0</integer>
+				<integer>13</integer>
 				<key>line</key>
-				<integer>114</integer>
+				<integer>22</integer>
 			</dict>
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>98</integer>
+			<integer>62</integer>
 		</dict>
-		<key>snes/fatfstest/pad.h</key>
+		<key>snes/fatfstest/pad.c</key>
 		<dict>
 			<key>caret</key>
 			<dict>
@@ -245,48 +189,6 @@
 			<key>firstVisibleLine</key>
 			<integer>24</integer>
 		</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>
 		<dict>
 			<key>caret</key>
@@ -299,21 +201,7 @@
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>89</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>
+			<integer>24</integer>
 		</dict>
 		<key>tools/bsnes/chip/fatfs/fatfs.cpp</key>
 		<dict>
@@ -327,7 +215,7 @@
 			<key>firstVisibleColumn</key>
 			<integer>0</integer>
 			<key>firstVisibleLine</key>
-			<integer>0</integer>
+			<integer>43</integer>
 		</dict>
 		<key>tools/bsnes/chip/fatfs/fatfs.hpp</key>
 		<dict>
@@ -343,20 +231,6 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</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>
 		<dict>
 			<key>caret</key>
@@ -371,139 +245,22 @@
 			<key>firstVisibleLine</key>
 			<integer>0</integer>
 		</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>
 	<key>openDocuments</key>
 	<array>
 		<string>snes/fatfstest/debug.c</string>
-		<string>tools/bsnes/chip/cmmio/cmmio.hpp</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/pad.c</string>
+		<string>snes/fatfstest/diskio.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>snes/fatfstest/event.h</string>
+		<string>snes/fatfstest/integer.h</string>
+		<string>tools/bsnes/chip/fatfs/fatfs.hpp</string>
 		<string>tools/bsnes/chip/fatfs/fatfs.cpp</string>
-		<string>snes/fatfstest/diskio.c</string>
-		<string>snes/fatfstest/diskio.h</string>
-		<string>tools/bsnes/chip/fatfs/config.h</string>
 		<string>tools/bsnes/chip/fatfs/diskio.cpp</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>
 	</array>
 	<key>showFileHierarchyDrawer</key>
 	<false/>
 	<key>windowFrame</key>
-	<string>{{0, 55}, {1110, 823}}</string>
+	<string>{{0, 60}, {1110, 818}}</string>
 </dict>
 </plist>