diff --git a/src/sys/init/main.c b/src/sys/init/main.c index 7e92027..2022885 100644 --- a/src/sys/init/main.c +++ b/src/sys/init/main.c @@ -170,8 +170,8 @@ } */ execThread(idleTask,(uInt32)(kmalloc(0x2000)+0x2000),0x0); - execFile("init@sys",0x0,0x0,0x0); - //execFile("shell@sys",0x0,0x0,0x0); + execFile("init",0x0,0x0,0x0); + //execFile("shell",0x0,0x0,0x0); kprintf("Free Pages: [%i]\n",freePages); kprintf("MemoryMap: [0x%X]\n",vmmMemoryMap); kprintf("Starting Os\n"); @@ -230,6 +230,9 @@ /*** $Log$ + Revision 1.25 2004/05/19 17:28:28 reddawg + Added the correct endTask Procedure + Revision 1.24 2004/05/19 04:07:42 reddawg kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been diff --git a/src/sys/lib/kmalloc.c b/src/sys/lib/kmalloc.c index e6ec214..d84e191 100644 --- a/src/sys/lib/kmalloc.c +++ b/src/sys/lib/kmalloc.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.3 2004/05/19 04:07:43 reddawg + kmalloc(size,pid) no more it is no kmalloc(size); the way it should of been + Revision 1.2 2004/04/20 00:53:16 reddawg Works @@ -340,58 +343,6 @@ return; } -/************************************************************************ - -Function: void kfreeProcess(pidType pid) -Description: This Will Find The Descriptor And Free It - -Notes: - -02/17/03 - I need To Make It Join Descriptors - -************************************************************************/ -void kfreeProcess(pidType pid) { - long *data = 0x0; - long i = 0x0; - struct memDescriptor *tmpDesc1 = 0x0; - struct memDescriptor *tmpDesc2 = 0x0; - - while (mallocLock != 0x0) { - while (1) asm("nop"); - } - - /* - mallocLock = sysID;//_current->id; - for (tmpDesc1=kernDesc;tmpDesc1;tmpDesc1=tmpDesc1->next) { - if (tmpDesc1->pid == pid) { - tmpDesc1->status = 0x0; - if (tmpDesc1->prev != 0x0) { - tmpDesc2 = tmpDesc1->prev; - tmpDesc2->next = tmpDesc1->next; - } - if (tmpDesc1->next != 0x0) { - tmpDesc2 = tmpDesc1->next; - tmpDesc2->prev = tmpDesc1->prev; - } - if (kernDesc == tmpDesc1) { - kernDesc = tmpDesc1->next; - } - tmpDesc1->next = 0x0; - tmpDesc1->prev = 0x0; - insertFreeDesc(tmpDesc1); - data = tmpDesc1->baseAddr; - for (i=0;i < (tmpDesc1->limit/4);i++) { - data[i] = 0x0; - } - //mergeMemBlocks(); - } - } - */ - mallocLock = 0x0; - - return; - } - /*** END ***/ diff --git a/src/sys/lib/net.c b/src/sys/lib/net.c index c3e09f0..ef5df21 100644 --- a/src/sys/lib/net.c +++ b/src/sys/lib/net.c @@ -24,6 +24,9 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. $Log$ + Revision 1.2 2004/04/30 14:16:04 reddawg + Fixed all the datatypes to be consistant uInt8,uInt16,uInt32,Int8,Int16,Int32 + Revision 1.1.1.1 2004/04/15 12:07:10 reddawg UbixOS v1.0 @@ -74,7 +77,7 @@ } -inet_aton(cp, addr) +int inet_aton(cp, addr) const char *cp; struct in_addr *addr; {