diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index e2379a4..4b38a6b 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -61,8 +61,8 @@ pit_init, atkbd_init, time_init, - net_init, - ne2k_init, + //net_init, + //ne2k_init, devfs_init, pci_init, ubixfs_init, @@ -76,6 +76,9 @@ /*** $Log$ + Revision 1.35 2004/09/11 19:15:37 reddawg + here you go irq 10 io 240 for your ne2k nic + Revision 1.34 2004/09/11 14:12:33 reddawg ok enabled networking diff --git a/src/sys/kernel/sched.c b/src/sys/kernel/sched.c index 5ba4086..7fcb74b 100644 --- a/src/sys/kernel/sched.c +++ b/src/sys/kernel/sched.c @@ -100,10 +100,10 @@ else if (_current->state == DEAD) { delTask = tmpTask; - tmpTask = tmpTask->prev; + tmpTask = tmpTask->next; sched_deleteTask(delTask->id); sched_addDelTask(delTask); - goto schedStart; + goto schedStart; } } @@ -278,6 +278,9 @@ /*** $Log$ + Revision 1.58 2004/09/11 21:45:44 reddawg + Fixed sched to work with gcc 3.3 + Revision 1.57 2004/09/11 21:38:00 reddawg Fixed a few problems diff --git a/src/sys/kernel/systemtask.c b/src/sys/kernel/systemtask.c index 455449e..ae26429 100644 --- a/src/sys/kernel/systemtask.c +++ b/src/sys/kernel/systemtask.c @@ -104,7 +104,6 @@ if (tmpTask->oInfo.cwd != 0x0) kfree(tmpTask->oInfo.cwd); - kfree(tmpTask); } @@ -116,6 +115,9 @@ /*** $Log$ + Revision 1.23 2004/09/11 21:38:00 reddawg + Fixed a few problems + Revision 1.22 2004/09/11 14:23:34 reddawg ok