Permalink
Browse files

Merge remote-tracking branch 'owallace/master'

Conflicts:
	filesystem/file_manager.c
  • Loading branch information...
2 parents 7f7df14 + 62762e6 commit 892c96bd42fc33927d41896a88312ea443236514 @asmeurer committed Apr 26, 2012
Showing with 10 additions and 9 deletions.
  1. +1 −1 filesystem/file_manager.c
  2. +9 −8 filesystem/file_test.c
@@ -129,7 +129,7 @@ int _format(int device_num, char fs_name, int blocksize){
}
if (error < 0) {
- return error;
+ //return error;
}
/*Erase*/
View
@@ -855,14 +855,15 @@ int main(int argc, char *argv[]) {
else if(!strcmp(command, "HELP")){
printf("\n~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
printf("COMMANDS:\n");
- printf("INIT_MEM\n");
- printf("ALLOC_PT <page_table_size>\n");
- printf("DEALLOC <page_table_id>\n");
- printf("FILL_PHY_MEM <page_table_id>\n");
- printf("PAGE_HIT <page_table_id> <page_num>\n");
- printf("PAGE_FAULT <page_table_id> <page_num>\n");
- printf("LIST [USER | SYSTEM | BS | PAGETABLE page_table_id]\n");
- printf("LRU_OVERFLOW\n");
+ printf("INIT_FS <device>\n");
+ printf("FORMAT <device> <fs_name> <blocksize>\n");
+ printf("MOUNT <fs_name>\n");
+ printf("OPEN <filename> [ NEW | READ-ONLY \ READ-WRITE ]\n");
+ printf("MKDIR <filepath>\n");
+ printf("READ <filehandle> <block_number> <buf_ptr>\n");
+ printf("WRITE <filehandle> <block_number> <buf_prt> \n");
+ printf("CLOSE <filehandle>\n");
+ printf("DELETE <filepath>\n");
printf("~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\n");
}
else {

0 comments on commit 892c96b

Please sign in to comment.