# HG changeset patch
# User Jonathan Pevarnek <pevarnj@gmail.com>
# Date 1302273063 14400
# Node ID a6be89bc4b043d7f3081664dc22ec54982fdf2e4
# Parent  9cec88f4c98bfe28fa60b738d3246a36bad3ba1b
Moved fs.c to testFS.c

diff -r 9cec88f4c98b -r a6be89bc4b04 Makefile
--- a/Makefile	Fri Apr 08 09:56:20 2011 -0400
+++ b/Makefile	Fri Apr 08 10:31:03 2011 -0400
@@ -11,11 +11,11 @@
 CXXFLAGS=$(CFLAGS)
 LDFLAGS=-m elf64_s390
 
-BINS=sarpn dynamic fs
+BINS=sarpn dynamic testFS
 
 sarpn_OBJS=src/sarpn.o arch/arch.a src/std.o src/stack.o src/operations.o src/math.o
 dynamic_OBJS=src/dynamic.o arch/arch.a src/std.o src/stack.o
-fs_OBJS=src/fs.o arch/arch.a src/std.o
+testFS_OBJS=src/testFS.o arch/arch.a src/std.o
 
 ARCH_OBJS=arch/io.o arch/cons.o arch/ebcdic.o arch/fba.o arch/ioint.o
 
@@ -41,7 +41,7 @@
 	$(LD) $(LDFLAGS) -T scripts/linker.script -o $@ $^
 dynamic: $(dynamic_OBJS)
 	$(LD) $(LDFLAGS) -T scripts/linker.script -o $@ $^
-fs: $(fs_OBJS)
+testFS: $(testFS_OBJS)
 	$(LD) $(LDFLAGS) -T scripts/linker.script -o $@ $^
 
 arch/arch.a: $(ARCH_OBJS)
diff -r 9cec88f4c98b -r a6be89bc4b04 src/fs.c
--- a/src/fs.c	Fri Apr 08 09:56:20 2011 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,150 +0,0 @@
-#include <std.h>
-
-struct SUPERBLOCK {
-	u32 magic;              // == 0x42420374
-	u32 root_inode;         // the disk block containing the root inode
-	u32 nblocks;            // number of block on the disk
-	u32 _pad[253];          // unused (should be '\0' filled)
-};
-typedef struct SUPERBLOCK Superblock;
-
-struct INODE {
-	u32 size;               // file length in bytes
-	u32 _pad0;              // unused (should be 0)
-	u64 ctime;              // creation time stamp
-	u64 mtime;              // last modification time stamp
-	u16 nblocks;            // number of data blocks in this file
-	u16 _pad1;              // unused (should be 0)
-	u32 _pad2;              // unused (should be 0)
-	u32 blocks[248];        // file block ptrs
-};
-typedef struct INODE Inode;
-
-struct DIRENTRY { //32 bytes
-	char fname[28];
-	u32 inode;
-};
-typedef struct DIRENTRY Direntry;
-
-//REQUIRES:   fsBlock points to an object with size at least 1024
-//EFFECTS:    Sets fsBlock to be equal
-int readFSBlock(u32 dev, u32 blkno, void *fsBlock)
-{
-	if(fba_read_blk(dev, blkno*2, fsBlock)) return 1;
-	if(fba_read_blk(dev, blkno*2 + 1, fsBlock + 512)) return 1;
-	return 0;
-}
-
-void printFname(char *name)
-{
-	putline(name, 28);
-}
-
-//Sets name to contain a filename entered by the user
-//REQUIRES:   name is 28 characters long
-void getFname(char *fname)
-{
-	int chars = getline(fname, 28);
-	for(;chars < 28; chars++) {
-		fname[chars] = ' ';
-	}
-}
-
-//Checks whether two file names are equal
-int fnameCmp(const char *a, const char *b)
-{
-	int i;
-	for(i = 0; i < 28; i++, a++, b++) {
-		if(*a - *b) return *a - *b;
-	}
-	return 0;
-}
-
-//Finds the item within an array of filenames with the same name as fname
-int fnameLookup(char *fname, const Direntry array[], int last)
-{
-	int i;
-	for(i = 0; i < last; i++)
-		if(!fnameCmp(fname, array[i].fname)) return i;
-	return last;
-}
-
-void dumpText(char *text, int size)
-{
-	do {
-		putline(text, (size > CON_LEN)?CON_LEN:size);
-		size -= CON_LEN;
-		text += CON_LEN;
-	} while(size > 0);
-}
-
-void start(u64 __memsize)
-{
-	init_io_int();
-	init_console();
-	char buffer[256];
-	int i;
-	
-	u32 dev = find_dev(0x100);
-	Superblock sb;
-	if(readFSBlock(dev, 1, &sb)) { //get the super block
-		sPrint("ERROR\n");
-		goto END;
-	}
-	Inode root;
-	if(readFSBlock(dev, sb.root_inode, &root)) { //get the root inode
-		sPrint("ERROR\n");
-		goto END;
-	}
-	int nFiles = root.size/sizeof(Direntry);
-		//calculate how many files (assume less than 32 for the moment)
-		//TODO get rid of assumption
-	Direntry direntries[32];
-	if(readFSBlock(dev, root.blocks[0], direntries)) { //get the "first 32" files
-		sPrint("ERROR\n");
-		goto END;
-	}
-
-	while(1) {
-		
-		//Prints off the name of each file
-		Direntry *dp;
-		for(dp = direntries; dp - direntries < nFiles; dp++) {
-			printFname(dp->fname), sPrint("\n");
-		}
-		char fname[28];
-		sPrint("Please enter the file to read: ");
-		getFname(fname);
-		int file = fnameLookup(fname, direntries, nFiles);
-
-		u32 fileLoc = direntries[file].inode;
-		if(fileLoc == nFiles) continue;
-
-		Inode fileToRead;
-		if(readFSBlock(dev, fileLoc, &fileToRead)) {
-			sPrint("ERROR\n");
-			goto END;
-		}
-
-		u32 fileSize = fileToRead.size;
-
-		for(i = 0; i < fileToRead.nblocks; i++) {
-			char text[1024];
-			if(readFSBlock(dev, fileToRead.blocks[i], text)) {
-				sPrint("ERROR\n");
-				goto END;
-			}
-			dumpText(text, (fileSize > 1024)?1024:fileSize);
-			fileSize -= 1024;
-		}
-	}
-
-
-END:
-	sPrint("DONE\n");
-	for(;;) {
-		char buffer[1];
-		sGet(buffer, 0);
-	}
-}
-
diff -r 9cec88f4c98b -r a6be89bc4b04 src/testFS.c
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/testFS.c	Fri Apr 08 10:31:03 2011 -0400
@@ -0,0 +1,149 @@
+#include <std.h>
+
+struct SUPERBLOCK {
+	u32 magic;              // == 0x42420374
+	u32 root_inode;         // the disk block containing the root inode
+	u32 nblocks;            // number of block on the disk
+	u32 _pad[253];          // unused (should be '\0' filled)
+};
+typedef struct SUPERBLOCK Superblock;
+
+struct INODE {
+	u32 size;               // file length in bytes
+	u32 _pad0;              // unused (should be 0)
+	u64 ctime;              // creation time stamp
+	u64 mtime;              // last modification time stamp
+	u16 nblocks;            // number of data blocks in this file
+	u16 _pad1;              // unused (should be 0)
+	u32 _pad2;              // unused (should be 0)
+	u32 blocks[248];        // file block ptrs
+};
+typedef struct INODE Inode;
+
+struct DIRENTRY { //32 bytes
+	char fname[28];
+	u32 inode;
+};
+typedef struct DIRENTRY Direntry;
+
+//REQUIRES:   fsBlock points to an object with size at least 1024
+//EFFECTS:    Sets fsBlock to be equal
+int readFSBlock(u32 dev, u32 blkno, void *fsBlock)
+{
+	if(fba_read_blk(dev, blkno*2, fsBlock)) return 1;
+	if(fba_read_blk(dev, blkno*2 + 1, fsBlock + 512)) return 1;
+	return 0;
+}
+
+void printFname(char *name)
+{
+	putline(name, 28);
+}
+
+//Sets name to contain a filename entered by the user
+//REQUIRES:   name is 28 characters long
+void getFname(char *fname)
+{
+	int chars = getline(fname, 28);
+	for(;chars < 28; chars++) {
+		fname[chars] = ' ';
+	}
+}
+
+//Checks whether two file names are equal
+int fnameCmp(const char *a, const char *b)
+{
+	int i;
+	for(i = 0; i < 28; i++, a++, b++) {
+		if(*a - *b) return *a - *b;
+	}
+	return 0;
+}
+
+//Finds the item within an array of filenames with the same name as fname
+int fnameLookup(char *fname, const Direntry array[], int last)
+{
+	int i;
+	for(i = 0; i < last; i++)
+		if(!fnameCmp(fname, array[i].fname)) return i;
+	return last;
+}
+
+void dumpText(char *text, int size)
+{
+	do {
+		putline(text, (size > CON_LEN)?CON_LEN:size);
+		size -= CON_LEN;
+		text += CON_LEN;
+	} while(size > 0);
+}
+
+void start(u64 __memsize)
+{
+	init_io_int();
+	init_console();
+	char buffer[256];
+	int i;
+	
+	u32 dev = find_dev(0x100);
+	Superblock sb;
+	if(readFSBlock(dev, 1, &sb)) { //get the super block
+		sPrint("ERROR\n");
+		goto END;
+	}
+	Inode root;
+	if(readFSBlock(dev, sb.root_inode, &root)) { //get the root inode
+		sPrint("ERROR\n");
+		goto END;
+	}
+	int nFiles = root.size/sizeof(Direntry);
+		//calculate how many files (assume less than 32 for the moment)
+		//TODO get rid of assumption
+	Direntry direntries[32];
+	if(readFSBlock(dev, root.blocks[0], direntries)) { //get the "first 32" files
+		sPrint("ERROR\n");
+		goto END;
+	}
+
+	while(1) {
+		
+		//Prints off the name of each file
+		Direntry *dp;
+		for(dp = direntries; dp - direntries < nFiles; dp++) {
+			printFname(dp->fname), sPrint("\n");
+		}
+		char fname[28];
+		sPrint("Please enter the file to read: ");
+		getFname(fname);
+		int file = fnameLookup(fname, direntries, nFiles);
+
+		u32 fileLoc = direntries[file].inode;
+		if(fileLoc == nFiles) continue;
+
+		Inode fileToRead;
+		if(readFSBlock(dev, fileLoc, &fileToRead)) {
+			sPrint("ERROR\n");
+			goto END;
+		}
+
+		u32 fileSize = fileToRead.size;
+
+		for(i = 0; i < fileToRead.nblocks; i++) {
+			char text[1024];
+			if(readFSBlock(dev, fileToRead.blocks[i], text)) {
+				sPrint("ERROR\n");
+				goto END;
+			}
+			dumpText(text, (fileSize > 1024)?1024:fileSize);
+			fileSize -= 1024;
+		}
+	}
+
+
+END:
+	sPrint("DONE\n");
+	for(;;) {
+		sGet(buffer, 0);
+	}
+}
+