diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index a58d053..07d1c60 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -58,10 +58,8 @@ pit_init, atkbd_init, time_init, - /* - net_init, - ne2k_init, - */ + /* net_init, */ + /* ne2k_init, */ devfs_init, ubixfs_init, fdc_init, @@ -73,6 +71,9 @@ /*** $Log$ + Revision 1.25 2004/07/28 22:29:29 reddawg + Turned off network support our scheduler... is really horible with cpu bound tasks the system does slow down to much + Revision 1.24 2004/07/28 22:23:02 reddawg make sure it still works before I goto bed diff --git a/src/sys/isa/fdc.c b/src/sys/isa/fdc.c index ed1a635..e972289 100644 --- a/src/sys/isa/fdc.c +++ b/src/sys/isa/fdc.c @@ -179,7 +179,7 @@ if (read && blockBuffer) { p_blockbuff = blockBuffer; p_tbaddr = (char *) 0x80000; - for (copyCount=0; copyCount<(numSectors*512); copyCount++) { + for (copyCount=0x0; copyCount<(numSectors*512); copyCount++) { *p_blockbuff = *p_tbaddr; p_blockbuff++; p_tbaddr++; @@ -303,6 +303,9 @@ /*** $Log$ + Revision 1.18 2004/07/29 21:32:16 reddawg + My quick lunchs breaks worth of updates.... + Revision 1.17 2004/07/27 08:03:36 reddawg chg: stopped push all these extra registers I can't find a good reason as to why I was doing it diff --git a/src/sys/isa/ne2k.c b/src/sys/isa/ne2k.c index a878556..989a76d 100644 --- a/src/sys/isa/ne2k.c +++ b/src/sys/isa/ne2k.c @@ -209,7 +209,8 @@ } outportByte(mDev->ioAddr + NE_IMR,0x0); outportByte(mDev->ioAddr + NE_IMR,0x0B); - outportByte(mPic, eoi); + + outportByte(mPic, eoi); outportByte(sPic,eoi); return; } @@ -342,6 +343,9 @@ /*** $Log$ + Revision 1.16 2004/07/28 22:23:02 reddawg + make sure it still works before I goto bed + Revision 1.15 2004/07/17 17:04:47 reddawg ne2k: added assert hopefully it will help me solve this dma size 0 random error diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index e66c43e..3698bd6 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -70,13 +70,8 @@ sys_sem_free(sem); kprintf("TCP/IP initialized.\n"); - /* - IP4_ADDR(&gw, 192,168,0,1); - IP4_ADDR(&ipaddr, 192,168,0,69); - */ IP4_ADDR(&gw, 10,4,0,1); IP4_ADDR(&ipaddr, 10,4,0,69); - IP4_ADDR(&netmask, 255,255,255,0); netif_set_default(netif_add(&ipaddr, &netmask, &gw, ethernetif_init, tcpip_input)); @@ -88,9 +83,6 @@ //udpecho_init(); //shell_init(); //bot_init(); - - kprintf("Application Started\n"); - endTask(_current->id); } diff --git a/src/sys/net/netif/ethernetif.c b/src/sys/net/netif/ethernetif.c index 6dc3af7..85c8937 100644 --- a/src/sys/net/netif/ethernetif.c +++ b/src/sys/net/netif/ethernetif.c @@ -84,7 +84,7 @@ ethernetif = netif->state; dev = (struct device *)kmalloc(sizeof(struct device)); dev->ioAddr = 0x280; - dev->irq = 10; + dev->irq = 0x10; /* Obtain MAC address from network interface. */ ethernetif->ethaddr->addr[0] = 0x00; @@ -344,7 +344,7 @@ /*-----------------------------------------------------------------------------------*/ void ethernetif_thread(void *arg) { - struct netif *netif; + struct netif *netif = 0x0; netif = arg;