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

Remove some debug output

Browse Source
This commit is contained in:
pjht 2020-08-31 12:16:55 -05:00
parent 61b71b4491
commit 5fabb01a8b
4 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
init/main.c
View File

@ -121,19 +121,11 @@ int main() {
serial_print("Loading VGA driver\n"); serial_print("Loading VGA driver\n");
posix_spawn(NULL,"/initrd/vga_drv",NULL,NULL,NULL,NULL); posix_spawn(NULL,"/initrd/vga_drv",NULL,NULL,NULL,NULL);
while(rpc_is_init(6)==0); while(rpc_is_init(6)==0);
serial_print("Opening /dev/vga\n");
stdout=fopen("/dev/vga","w"); stdout=fopen("/dev/vga","w");
if (!stdout) { if (!stdout) {
serial_print("Could not open /dev/vga\n"); serial_print("Could not open the VGA file! \n");
exit(1); 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"); serial_print("Loading PCI driver\n");
posix_spawn(NULL,"/initrd/pci",NULL,NULL,NULL,NULL); posix_spawn(NULL,"/initrd/pci",NULL,NULL,NULL,NULL);
} }

4
kernel/cpu/i386/isr.c
View File

@ -243,23 +243,19 @@ void isr_handler(registers_t* r) {
r->ebx=(uint32_t)paging_new_address_space(); r->ebx=(uint32_t)paging_new_address_space();
break; break;
case SYSCALL_ADDR_SPACES_COPY_DATA: 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) { if ((void*)r->esi!=NULL) {
address_spaces_copy_data((void*)r->ebx,(void*)r->ecx,r->edx,(void*)r->esi); address_spaces_copy_data((void*)r->ebx,(void*)r->ecx,r->edx,(void*)r->esi);
} else { } else {
r->ebx=(uint32_t)address_spaces_put_data((void*)r->ebx,(void*)r->ecx,r->edx); r->ebx=(uint32_t)address_spaces_put_data((void*)r->ebx,(void*)r->ecx,r->edx);
} }
//serial_printf("sycall done\n");
break; break;
case SYSCALL_SERIAL_PRINT: case SYSCALL_SERIAL_PRINT:
serial_write_string((char*)r->ebx); serial_write_string((char*)r->ebx);
break; break;
case SYSCALL_GET_INITRD_SZ: case SYSCALL_GET_INITRD_SZ:
serial_printf("Initrd size is %d bytes\n",initrd_sz);
r->ebx=initrd_sz; r->ebx=initrd_sz;
break; break;
case SYSCALL_COPY_INITRD: case SYSCALL_COPY_INITRD:
serial_printf("Copying initrd\n");
memcpy((char*)r->ebx,initrd,initrd_sz); memcpy((char*)r->ebx,initrd,initrd_sz);
break; break;
case SYSCALL_NEW_THREAD: { case SYSCALL_NEW_THREAD: {

3
libc/stdio.c
View File

@ -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) { void register_fs(const char* name,pid_t pid) {
serdes_state state={0}; serdes_state state={0};
serial_print("libc register fs 1\n");
serialize_str((char*)name,&state); serialize_str((char*)name,&state);
serial_print("libc register fs 2\n");
serialize_int(pid,&state); serialize_int(pid,&state);
serial_print("libc register fs 3\n");
rpc_call(2,"register_fs",state.buf,state.sizeorpos); rpc_call(2,"register_fs",state.buf,state.sizeorpos);
} }

1
vfs/main.c
View File

@ -74,7 +74,6 @@ void vfs_mount(void* args) {
} }
void vfs_register_fs(void* args) { void vfs_register_fs(void* args) {
serial_print("register fs\n");
serdes_state state; serdes_state state;
start_deserialize(args,&state); start_deserialize(args,&state);
char* name=deserialize_str(&state); char* name=deserialize_str(&state);