diff --git a/src/Makefile.inc b/src/Makefile.inc index c30c9f5..d95264c 100644 --- a/src/Makefile.inc +++ b/src/Makefile.inc @@ -2,8 +2,8 @@ # Global 'Source' Options # allow you to change your default compiler without affecting your other work -CC = gcc -CXX = g++ +CC = gcc295 +CXX = g++295 LD = ld AR = ar REMOVE = rm -rf diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 025d51f..e2379a4 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -62,9 +62,7 @@ atkbd_init, time_init, net_init, - /* ne2k_init, - */ devfs_init, pci_init, ubixfs_init, @@ -78,6 +76,9 @@ /*** $Log$ + Revision 1.34 2004/09/11 14:12:33 reddawg + ok enabled networking + Revision 1.33 2004/09/08 22:04:10 apwillia Added calling of static constructors, commented out tty_printf in kprintf (due to deadlock) diff --git a/src/sys/isa/ne2k.c b/src/sys/isa/ne2k.c index ec95aec..35c0c41 100644 --- a/src/sys/isa/ne2k.c +++ b/src/sys/isa/ne2k.c @@ -193,7 +193,6 @@ void ne2kHandler() { uInt16 isr = 0x0; uInt16 status = 0x0; - asm("sti"); isr = inportByte(mDev->ioAddr + NE_ISR); @@ -344,6 +343,9 @@ /*** $Log$ + Revision 1.20 2004/09/07 22:26:04 reddawg + synced in + Revision 1.19 2004/09/07 21:54:38 reddawg ok reverted back to old scheduling for now.... diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index 939512b..0a502f0 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -88,7 +88,7 @@ netif_add(&ipaddr, &netmask, &gw, loopif_init, tcpip_input); //udpecho_init(); - //shell_init(); + shell_init(); //bot_init(); endTask(_current->id); } diff --git a/src/sys/net/net/shell.c b/src/sys/net/net/shell.c index 4bea657..70503b3 100644 --- a/src/sys/net/net/shell.c +++ b/src/sys/net/net/shell.c @@ -34,6 +34,7 @@ */ #include +#include #include #include "net/mem.h" @@ -80,6 +81,9 @@ netconn_close(conn); break; } + else if (!strcmp(buffer,"ls")) { + sendstr("no\nfucken\nfiles\here\n", conn); + } prompt(conn); } } @@ -94,12 +98,13 @@ netconn_listen(conn); while(1) { + kprintf("1"); newconn = netconn_accept(conn); - kprintf("2\n"); + kprintf("2"); shell_main(newconn); - kprintf("3\n"); - netconn_delete(newconn); - kprintf("4\n"); + kprintf("3"); + //netconn_delete(newconn); + kprintf("4"); } }