pjht/os
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Undo all the commented out init code

Browse Source
This commit is contained in:
pjht 2019-08-04 10:58:29 -05:00
parent e80d084584
commit 05ad7d964a
2 changed files with 14 additions and 6080 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
init/main.c
View File

@ -166,24 +166,20 @@ int main(char* initrd, uint32_t initrd_sz) {
vga_write_string("INIT\n");
uint32_t datapos=find_loc("vfs",initrd);
load_task(datapos,initrd);
// yield();
// datapos=find_loc("fsdrv",initrd);
// load_task(datapos,initrd);
// yield();
// FILE* file;
// do {
// vga_write_string("CALLING FOPEN\n");
// file=fopen("/dev/sda","w");
// vga_write_string("FOPEN RETURNED\n");
// } while(file==NULL);
// vga_write_string("CALLING FPUTS\n");
// fputs("FPUTS String",file);
// vga_write_string("FPUTS RETURNED\n");
// // yield();
// // // uint32_t fs_box=mailbox_new(16);
// // // test_vfs("/dev/sda",box,fs_box);
// // // test_vfs("/dev/sdb",box,fs_box);
yield(); // Bochs fails here
datapos=find_loc("fsdrv",initrd);
load_task(datapos,initrd);
yield();
FILE* file;
do {
vga_write_string("CALLING FOPEN\n");
file=fopen("/dev/sda","w");
vga_write_string("FOPEN RETURNED\n");
} while(file==NULL);
vga_write_string("CALLING FPUTS\n");
fputs("FPUTS String",file);
vga_write_string("FPUTS RETURNED\n");
for(;;) {
//yield();
s
}
}

6062
log
View File

File diff suppressed because it is too large Load Diff