diff --git a/src/include/sys/sys.h b/src/include/sys/sys.h index 19ee01f..d8954d6 100644 --- a/src/include/sys/sys.h +++ b/src/include/sys/sys.h @@ -26,7 +26,7 @@ int exec(char *,int argc,char **argv); int pidStatus(int pid); -void *getPage(int count); +void *getPage(int,int); void *getDrives(); int getuptime(); int gettime(); diff --git a/src/lib/libc_old/stdlib/malloc.c b/src/lib/libc_old/stdlib/malloc.c index 4740ad4..33b8624 100644 --- a/src/lib/libc_old/stdlib/malloc.c +++ b/src/lib/libc_old/stdlib/malloc.c @@ -65,7 +65,7 @@ return(tmpDesc); } - if ((emptyKernDesc = (struct memDescriptor *)getPage(0x4)) == 0x0) + if ((emptyKernDesc = (struct memDescriptor *)getPage(0x4,1)) == 0x0) return(0x0); /* zero out the memory so we know there is no garbage */ @@ -146,7 +146,7 @@ tmpDesc1 = getEmptyDesc(); //printf("no empty desc\n"); if (tmpDesc1 != 0x0) { - tmpDesc1->baseAddr = (struct memDescriptor *)getPage((len + 4095)/4096); + tmpDesc1->baseAddr = (struct memDescriptor *)getPage((len + 4095)/4096,1); tmpDesc1->limit = len; tmpDesc1->next = usedKernDesc; tmpDesc1->prev = 0x0; @@ -286,6 +286,9 @@ /*** $Log$ + Revision 1.8 2006/10/27 12:50:48 reddawg + Fixed compile errors + Revision 1.7 2004/10/02 12:58:38 reddawg weird... diff --git a/src/lib/libc_old/sys/getpage.c b/src/lib/libc_old/sys/getpage.c index 005a7c1..abadf24 100644 --- a/src/lib/libc_old/sys/getpage.c +++ b/src/lib/libc_old/sys/getpage.c @@ -30,22 +30,16 @@ #include -void *getPage(int count) { +void *getPage(int count,int type) { volatile uInt32 pageAddr = 0x0; asm volatile( - "int %0 \n" - : : "i" (0x80),"a" (7),"b" (&pageAddr),"c" (count) + "int %0\n" + : : "i" (0x80),"a" (7),"b" (&pageAddr),"c" (count),"d" (type) ); return((void *)pageAddr); } /*** - $Log$ - Revision 1.4 2004/08/01 20:14:18 reddawg - Fixens - - Revision 1.3 2004/08/01 19:59:19 reddawg - *** empty log message *** - END ***/ +