diff --git a/src/sys/i386/syscall.c b/src/sys/i386/syscall.c index f49b543..2967b73 100644 --- a/src/sys/i386/syscall.c +++ b/src/sys/i386/syscall.c @@ -197,6 +197,7 @@ ); kprintf("Invalid System Call #[%i]\n",sys_call); + kpanic("PID: %i, File: %s, Line: %i", _curent->id, _FILE_, _LINE_); return(0); } */ diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 242c2af..9828773 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -111,8 +111,6 @@ if (init_tasks[i]() != 0x0) kpanic("Error: Initializing System Task[%i].\n", i); } - // irqEnable(0x0); -//while(1); /* New Root Mount Point */ //Old 2 new 10 @@ -140,18 +138,12 @@ sysTask = kmalloc(0x2000); - asm("nop"); - if (sysTask == 0x0) kprintf("OS: Unable to allocate memory\n"); execThread(systemTask, (uInt32) sysTask + 0x2000, 0x0); kprintf("Thread Start!\n"); - irqEnable(0x0); - while (0x1) - asm("hlt"); - execFile("sys:/bin/init", 0x0, 0x0, 0x0); /* OS Initializer */ //execFile( "sys:/bin/login", 0x0, 0x0, 0x0 ); /* OS Initializer */ diff --git a/src/sys/kernel/gen_calls.c b/src/sys/kernel/gen_calls.c index 7635199..4e14314 100644 --- a/src/sys/kernel/gen_calls.c +++ b/src/sys/kernel/gen_calls.c @@ -172,6 +172,7 @@ /* MrOlsen 2016-01-18 */ int sys_invalid( struct thread *td, void *args ) { kprintf( "Invalid System Call #[%i]\n", td->frame->tf_eax ); +kpanic("PID: %i, File: %s, Line: %i", _current->id, __FILE__, __LINE__); return (0); } diff --git a/src/sys/kernel/syscall_new.c b/src/sys/kernel/syscall_new.c index eda9474..88f4a28 100644 --- a/src/sys/kernel/syscall_new.c +++ b/src/sys/kernel/syscall_new.c @@ -61,6 +61,7 @@ if ( code > totalCalls ) { kprintf( "Invalid Call: [%i]\n", frame->tf_eax ); + kpanic("PID: %i", _current->id); } else if ( (uint32_t) systemCalls[code].sc_status == SYSCALL_INVALID ) { kprintf( "Invalid Call: [%i][0x%X]\n", code, (uint32_t) systemCalls[code].sc_name ); @@ -129,5 +130,6 @@ ); kprintf( "Invalid System Call #[%i]\n", sys_call ); + kpanic("PID: %i", _current->id); return (0); } diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index 3a47c2c..457305d 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -50,6 +50,7 @@ //static void tcpip_init_done(void *arg); int net_init() { +return(0); ip_addr_t ipaddr, netmask, gw; struct netif netif; @@ -63,8 +64,7 @@ netif_set_default(&netif); //netif_set_default(netif_add(&ipaddr, &netmask, &gw, ethernetif_init, tcpip_input)); - //irqEnable(0x9); - sys_thread_new("lncThread", (void *) lnc_thread, 0x0, 0x1000, 0x0); +// sys_thread_new("lncThread", (void *) lnc_thread, 0x0, 0x1000, 0x0); return(0x0); } @@ -107,7 +107,6 @@ //udpecho_init(); shell_init(); //bot_init(); - irqEnable(0x9); endTask(_current->id); while (1) sched_yield(); diff --git a/src/sys/net/net/sys_arch.c b/src/sys/net/net/sys_arch.c index a95ea11..7ed19b0 100644 --- a/src/sys/net/net/sys_arch.c +++ b/src/sys/net/net/sys_arch.c @@ -220,8 +220,9 @@ //lk_time_t start = current_time(); uint32_t start = sys_now(); - kprintf("Timeout: %i]", timeout); + kprintf("Timeout1: %i]", timeout); res = sys_arch_sem_wait(&(mbox->full), timeout ? timeout : INFINITE_TIME); + kprintf("Timeout2: %i]", timeout); //res = sem_timedwait(&mbox->full, timeout ? timeout : INFINITE_TIME); if (res == ERR_TIMED_OUT) { //LTRACE_EXIT; diff --git a/src/sys/pci/lnc.c b/src/sys/pci/lnc.c index e09c060..2f0ddf4 100644 --- a/src/sys/pci/lnc.c +++ b/src/sys/pci/lnc.c @@ -248,7 +248,7 @@ void lnc_INT() { uint16_t csr0 = 0x0; -// kprintf("\nINTR\n"); + kprintf("\nINTR\n"); // while ((csr0 = lnc_readCSR32(lnc, CSR0)) & INTR) { //kprintf("CSR0: [0x%X]\n", csr0); if (csr0 & ERR) { @@ -301,7 +301,8 @@ lnc_nextRxPtr(lnc); //kprintf("RINT-LOOP[%i][0x%X][0x%X]\n", lnc->rxPtr,lnc->rxRing[lnc->rxPtr].md[1],plen); } - kprintf("RINT-DONE[%i][0x%X]\n", lnc->rxPtr,lnc->rxRing[lnc->rxPtr].md[1]); +// kprintf("RINT-DONE[%i][0x%X]\n", lnc->rxPtr,lnc->rxRing[lnc->rxPtr].md[1]); + sched_yield(); } }