diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 21f1f80..0cb2865 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -59,8 +59,8 @@ pit_init, atkbd_init, time_init, - /* net_init, */ - /* ne2k_init, */ + net_init, + ne2k_init, devfs_init, pci_init, ubixfs_init, @@ -74,6 +74,9 @@ /*** $Log$ + Revision 1.30 2004/09/07 21:54:38 reddawg + ok reverted back to old scheduling for now.... + Revision 1.29 2004/09/07 20:58:35 reddawg time to roll back i can't think straight by friday diff --git a/src/sys/isa/ne2k.c b/src/sys/isa/ne2k.c index 92bb645..ec95aec 100644 --- a/src/sys/isa/ne2k.c +++ b/src/sys/isa/ne2k.c @@ -316,6 +316,7 @@ } else { for (tmpBuf = ne2kBuffer;tmpBuf->next != 0x0;tmpBuf = tmpBuf->next); + tmpBuf->next = (struct nicBuffer *)kmalloc(sizeof(struct nicBuffer)); tmpBuf = tmpBuf->next; tmpBuf->next = 0x0; @@ -343,6 +344,9 @@ /*** $Log$ + Revision 1.19 2004/09/07 21:54:38 reddawg + ok reverted back to old scheduling for now.... + Revision 1.18 2004/09/06 15:13:25 reddawg Last commit before FreeBSD 6.0 diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index a3027cf..939512b 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -68,13 +68,13 @@ void netMainThread() { struct ip_addr ipaddr, netmask, gw; sys_sem_t sem; - /* + netif_init(); sem = sys_sem_new(0); tcpip_init(tcpip_init_done, &sem); sys_sem_wait(sem); sys_sem_free(sem); - */ + kprintf("TCP/IP initialized.\n"); IP4_ADDR(&gw, 10,4,0,1); @@ -90,7 +90,6 @@ //udpecho_init(); //shell_init(); //bot_init(); - while (1); endTask(_current->id); } diff --git a/src/sys/net/netif/ethernetif.c b/src/sys/net/netif/ethernetif.c index b70bc32..0d4eb29 100644 --- a/src/sys/net/netif/ethernetif.c +++ b/src/sys/net/netif/ethernetif.c @@ -277,9 +277,6 @@ struct eth_hdr *ethhdr = 0x0; struct pbuf *p = 0x0; - kprintf("netif: [0x%X]\n",netif); - while (1); - ethernetif = netif->state; p = low_level_input(ethernetif);