diff --git a/src/sys/include/net/net.h b/src/sys/include/net/net.h index 697c916..b1fa875 100644 --- a/src/sys/include/net/net.h +++ b/src/sys/include/net/net.h @@ -26,7 +26,7 @@ #include -int netInit(); +int net_init(); #endif diff --git a/src/sys/include/ubixos/init.h b/src/sys/include/ubixos/init.h index 9b201cb..c482375 100644 --- a/src/sys/include/ubixos/init.h +++ b/src/sys/include/ubixos/init.h @@ -39,11 +39,11 @@ #include #include #include +#include typedef int (*intFunctionPTR)(); /* - net_init, ne2k_init, devfs_init, ubixfs_init, @@ -60,6 +60,7 @@ pit_init, atkbd_init, time_init, + net_init, }; int init_tasksTotal = sizeof(init_tasks)/sizeof(intFunctionPTR); @@ -68,6 +69,10 @@ /*** $Log$ + Revision 1.11 2004/07/09 13:37:30 reddawg + time: timeInit to time_init + Adjusted initialization routines + Revision 1.3 2004/07/09 12:18:19 reddawg Updating Initialization Procedures diff --git a/src/sys/init/main.c b/src/sys/init/main.c index a893271..1f68beb 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -90,11 +90,6 @@ //smpInit(); //mouseInit(); //pciInit(); - /* Initialize Networking Subsystem */ - if (netInit() != 0x0) { - kpanic("Error: Initializing Networking Subsystem\n"); - } - /* Initialize The NE2000 NIC Device */ if (ne2kInit(0x240) != 0x0) { kpanic("Error: Initializing NE2000\n"); @@ -176,6 +171,10 @@ /*** $Log$ + Revision 1.47 2004/07/09 13:37:30 reddawg + time: timeInit to time_init + Adjusted initialization routines + Revision 1.39 2004/07/09 12:31:15 reddawg Updating Initialization Procedures diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index ea9cd39..4a46cb8 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -46,7 +46,7 @@ void netMainThread(); static void tcpip_init_done(void *arg); -int netInit() { +int net_init() { sys_init(); mem_init(); memp_init();