diff --git a/src/sys/Makefile.incl b/src/sys/Makefile.incl index 853845d..2ec2aa3 100644 --- a/src/sys/Makefile.incl +++ b/src/sys/Makefile.incl @@ -11,5 +11,5 @@ KMAKE= ${MAKE} ${KERNEL_FLAGS} INCLUDE=${KERNEL_INC} KERNEL=${KERNEL_NAME} INCLUDES = -I${INCLUDE} -CFLAGS = ${KFLAGS} -m32 -DNO_SYS=1 -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -ffreestanding -O +CFLAGS = ${KFLAGS} -m32 -Wall -nostdlib -nostdinc -fno-builtin -fno-exceptions -ffreestanding -O ROOT=/ubixos diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 50dc6c7..6c220a7 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include @@ -56,7 +56,7 @@ typedef int (*intFunctionPTR)( void ); intFunctionPTR init_tasks[] = { vmm_init, static_constructors, i8259_init, idt_init, vitals_init, sysctl_init, vfs_init, sched_init, pit_init, atkbd_init, time_init, - pci_init, devfs_init, tty_init, ufs_init, initHardDisk, initLNC, tcpip_init }; + pci_init, devfs_init, tty_init, ufs_init, initHardDisk, initLNC, net_init }; //ne2k_init, //ubixfs_init, diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index 121336d..6a91aec 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -49,6 +49,17 @@ static void tcpip_init_done(void *arg); int net_init() { + tcpip_init(NULL, NULL); + + IP4_ADDR(&gw, 10, 50, 0, 1); + IP4_ADDR(&ipaddr, 10, 50, 0, 7); + IP4_ADDR(&netmask, 255, 255, 0, 0); + netif_set_default(netif_add(&ipaddr, &netmask, &gw, ethernetif_init, tcpip_input)); + + return(0x0); +} + +int net_init_dead() { sys_init(); mem_init(); memp_init();