diff --git a/init/main.c b/init/main.c index f697827..a53600a 100644 --- a/init/main.c +++ b/init/main.c @@ -121,19 +121,11 @@ int main() { serial_print("Loading VGA driver\n"); posix_spawn(NULL,"/initrd/vga_drv",NULL,NULL,NULL,NULL); while(rpc_is_init(6)==0); - serial_print("Opening /dev/vga\n"); stdout=fopen("/dev/vga","w"); if (!stdout) { - serial_print("Could not open /dev/vga\n"); + serial_print("Could not open the VGA file! \n"); exit(1); } - serial_print("Writing to screen\n"); - puts("Puts test"); - printf("Printf test with file opened to %s\n","/dev/vga"); - FILE* file=fopen("/initrd/hi","r"); - char str[64]; - fgets(str,64,file); - printf("Read %s from /initrd/hi\n", str); serial_print("Loading PCI driver\n"); posix_spawn(NULL,"/initrd/pci",NULL,NULL,NULL,NULL); } diff --git a/kernel/cpu/i386/isr.c b/kernel/cpu/i386/isr.c index b22d018..e47463d 100644 --- a/kernel/cpu/i386/isr.c +++ b/kernel/cpu/i386/isr.c @@ -243,23 +243,19 @@ void isr_handler(registers_t* r) { r->ebx=(uint32_t)paging_new_address_space(); break; case SYSCALL_ADDR_SPACES_COPY_DATA: - //serial_printf("address_spaces_copy_data(0x%x,0x%x,0x%x,0x%x);\n",(void*)r->ebx,(void*)r->ecx,r->edx,(void*)r->esi); if ((void*)r->esi!=NULL) { address_spaces_copy_data((void*)r->ebx,(void*)r->ecx,r->edx,(void*)r->esi); } else { r->ebx=(uint32_t)address_spaces_put_data((void*)r->ebx,(void*)r->ecx,r->edx); } - //serial_printf("sycall done\n"); break; case SYSCALL_SERIAL_PRINT: serial_write_string((char*)r->ebx); break; case SYSCALL_GET_INITRD_SZ: - serial_printf("Initrd size is %d bytes\n",initrd_sz); r->ebx=initrd_sz; break; case SYSCALL_COPY_INITRD: - serial_printf("Copying initrd\n"); memcpy((char*)r->ebx,initrd,initrd_sz); break; case SYSCALL_NEW_THREAD: { diff --git a/libc/stdio.c b/libc/stdio.c index 2d3e4b3..288a5c6 100644 --- a/libc/stdio.c +++ b/libc/stdio.c @@ -157,11 +157,8 @@ size_t fwrite(void* buffer_ptr,size_t size,size_t count,FILE* stream) { void register_fs(const char* name,pid_t pid) { serdes_state state={0}; - serial_print("libc register fs 1\n"); serialize_str((char*)name,&state); - serial_print("libc register fs 2\n"); serialize_int(pid,&state); - serial_print("libc register fs 3\n"); rpc_call(2,"register_fs",state.buf,state.sizeorpos); } diff --git a/vfs/main.c b/vfs/main.c index 1f6ebe1..cc039ca 100644 --- a/vfs/main.c +++ b/vfs/main.c @@ -74,7 +74,6 @@ void vfs_mount(void* args) { } void vfs_register_fs(void* args) { - serial_print("register fs\n"); serdes_state state; start_deserialize(args,&state); char* name=deserialize_str(&state);