diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 38db238..b365575 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -139,37 +139,43 @@ } /* 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"); } + */ if (devFSEnable() != 0x0) { kpanic("Error: Enabling devFS\n"); } enableUbixFS(); fdcInit(); - initHardDisk(); + //initHardDisk(); if (mount(0x0,0x0,0x0,0x0,"sys","rw") != 0x0) { kprintf("Problem Mounting sys Mount Point\n"); } if (mount(0x0,0x0,0x1,0x0,"tmp","rw") != 0x0) { kprintf("Problem Mounting tmp Mount Point\n"); } + /* if (mount(0x1,0x1,0x0,0x0,"hd","rw") != 0x0) { kprintf("Problem Mounting HD Mount Point\n"); } + */ execThread(idleTask,(uInt32)(kmalloc(0x2000,sysID)+0x2000),0x0); - //execFile("init@sys",0x0,0x0,0x0); - execFile("shell@sys",0x0,0x0,0x0); + execFile("init@sys",0x0,0x0,0x0); + //execFile("shell@sys",0x0,0x0,0x0); kprintf("Free Pages: [%i]\n",freePages); kprintf("MemoryMap: [0x%X]\n",vmmMemoryMap); kprintf("Starting Os\n"); - kprintf("argc: %i\n",argc); + kprintf("argc: %i:%i\n",argc,argv[0]); irqEnable(0x0); sched(); return(0x0); @@ -191,7 +197,11 @@ At A Later Date Then Reboot The Machine ************************************************************************/ -void _start(int argc,char **argv) { +void _start(char *args, ...) { + int argc; + char **argv; + argv = &args; + argc = * (int *) (argv - 1); asm ("pushl $2; popf"); asm volatile( "lgdtl (loadGDT) \n" @@ -220,6 +230,9 @@ /*** $Log$ + Revision 1.22 2004/05/19 01:21:29 reddawg + Tweaked + Revision 1.21 2004/05/18 10:45:41 reddawg Bug Fix diff --git a/src/sys/net/api/api_lib.c b/src/sys/net/api/api_lib.c index e50658c..5443b21 100644 --- a/src/sys/net/api/api_lib.c +++ b/src/sys/net/api/api_lib.c @@ -374,9 +374,13 @@ msg->msg.conn = conn; msg->msg.msg.bc.ipaddr = addr; msg->msg.msg.bc.port = port; + kprintf("1"); api_msg_post(msg); + kprintf("2: [0x%X]",conn->mbox); sys_mbox_fetch(conn->mbox, NULL); + kprintf("3"); memp_freep(MEMP_API_MSG, msg); + kprintf("4"); return conn->err; } /*-----------------------------------------------------------------------------------*/ diff --git a/src/sys/net/net/bot.c b/src/sys/net/net/bot.c index 6c8e96a..ba945fb 100644 --- a/src/sys/net/net/bot.c +++ b/src/sys/net/net/bot.c @@ -62,7 +62,10 @@ conn = netconn_new(NETCONN_TCP); kprintf("Starting UbixOS Bot\n"); while(1) { - netconn_connect(conn,&ipaddr,6667); + kprintf("[A"); + kprintf("\n\nCONNECT: [%i]\n",netconn_connect(conn,&ipaddr,6667)); + kprintf("B]"); + while (1); if (buf != NULL) { buf = netconn_recv(conn); netbuf_copy(buf, bufr, 1024); diff --git a/src/sys/net/net/init.c b/src/sys/net/net/init.c index 27c08a8..cdba480 100644 --- a/src/sys/net/net/init.c +++ b/src/sys/net/net/init.c @@ -77,7 +77,7 @@ 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)); + netif_set_default(netif_add(&ipaddr, &netmask, &gw, ethernetif_init, tcpip_input)); IP4_ADDR(&gw, 127,0,0,1); IP4_ADDR(&ipaddr, 127,0,0,1); diff --git a/src/sys/net/net/sys_arch.c b/src/sys/net/net/sys_arch.c index 82abc40..b867209 100644 --- a/src/sys/net/net/sys_arch.c +++ b/src/sys/net/net/sys_arch.c @@ -35,6 +35,9 @@ * Modified to work with the ubix operating system * * $Log$ + * Revision 1.1.1.1 2004/04/15 12:07:14 reddawg + * UbixOS v1.0 + * * Revision 1.13 2004/04/13 21:29:53 reddawg * We now have sockets working. Lots of functionality to be added to continually * improve on the existing layers now its clean up time to get things in a better @@ -185,7 +188,7 @@ sys_sem_wait(mbox->mutex); - //kprintf("sys_mbox_post: mbox %p msg %p\n", mbox, msg); + kprintf("sys_mbox_post: mbox %p msg %p\n", mbox, msg); mbox->msgs[mbox->last] = msg; @@ -234,7 +237,7 @@ } if(msg != NULL) { - //kprintf("sys_mbox_fetch: mbox %p msg %p\n", mbox, *msg); + kprintf("sys_mbox_fetch: mbox %p msg %p\n", mbox, *msg); *msg = mbox->msgs[mbox->first]; }