diff --git a/src/sys/include/string.h b/src/sys/include/string.h index fa1cf2e..e8f54c8 100644 --- a/src/sys/include/string.h +++ b/src/sys/include/string.h @@ -32,10 +32,10 @@ #include -void * kmemcpy(void * dst, const void * src, size_t length); -void *kmemset(void * dst, int c, size_t length); -int kstrlen(const char * string); -int kstrcmp(char *, char *); +void * memcpy(void * dst, const void * src, size_t length); +void *memset(void * dst, int c, size_t length); +int strlen(const char * string); +int strcmp(const char *,const char *); int sprintf(char * str, const char * format, ...); @@ -43,6 +43,12 @@ /*** $Log$ + Revision 1.3 2004/06/04 13:29:56 reddawg + libc: modified mkdir(); interface + kpanic: kPanic(); now says kPanic: %s + system: now reboots when receives message for reboot + also when command start sde is received by system the STD is started + Revision 1.2 2004/05/21 15:22:35 reddawg Cleaned up diff --git a/src/sys/include/sys/_types.h b/src/sys/include/sys/_types.h index 993af06..5f49ac7 100644 --- a/src/sys/include/sys/_types.h +++ b/src/sys/include/sys/_types.h @@ -32,16 +32,28 @@ #include -typedef unsigned int __uint32_t; +typedef __signed char __int8_t; +typedef unsigned char __uint8_t; +typedef short __int16_t; +typedef unsigned short __uint16_t; +typedef int __int32_t; +typedef unsigned int __uint32_t; +typedef long long __int64_t; +typedef unsigned long long __uint64_t; + typedef unsigned long __clock_t; typedef long __time_t; typedef __uint32_t __ino_t; +typedef __int32_t __ssize_t; #endif /*** $Log$ + Revision 1.3 2004/07/05 21:06:53 reddawg + Needed + Revision 1.2 2004/05/21 15:12:17 reddawg Cleaned up diff --git a/src/sys/include/ubixos/syscall.h b/src/sys/include/ubixos/syscall.h index 33c33a8..d8afa3f 100644 --- a/src/sys/include/ubixos/syscall.h +++ b/src/sys/include/ubixos/syscall.h @@ -33,12 +33,16 @@ #include void _sysCall(); +void _sysCallNew(); void invalidCall(); #endif /*** $Log$ + Revision 1.2 2004/05/21 15:20:00 reddawg + Cleaned up + END ***/ diff --git a/src/sys/include/ubixos/types.h b/src/sys/include/ubixos/types.h index 24999ef..32bba37 100644 --- a/src/sys/include/ubixos/types.h +++ b/src/sys/include/ubixos/types.h @@ -44,18 +44,61 @@ typedef short Int16; typedef long Int32; +typedef __uint8_t u_int8_t; /* unsigned integrals (deprecated) */ +typedef __uint16_t u_int16_t; +typedef __uint32_t u_int32_t; +typedef __uint64_t u_int64_t; + +typedef unsigned char u_char; +typedef unsigned short u_short; +typedef unsigned int u_int; +typedef unsigned long u_long; + + typedef int pidType; typedef int pid_t; typedef int size_t; /* standart */ + #ifndef NOBOOL typedef enum { FALSE=0,TRUE=1 } bool; #endif +#ifndef _INO_T_DECLARED +typedef __ino_t ino_t; /* inode number */ +#define _INO_T_DECLARED +#endif + +#ifndef _INT8_T_DECLARED +typedef __int8_t int8_t; +#define _INT8_T_DECLARED +#endif + +#ifndef _INT16_T_DECLARED +typedef __int16_t int16_t; +#define _INT16_T_DECLARED +#endif + +#ifndef _INT32_T_DECLARED +typedef __int32_t int32_t; +#define _INT32_T_DECLARED +#endif + +#ifndef _INT64_T_DECLARED +typedef __int64_t int64_t; +#define _INT64_T_DECLARED +#endif + +typedef __ssize_t ssize_t; + + #endif /*** $Log$ + Revision 1.4 2004/06/01 02:50:45 reddawg + Cleanup + Revision 1.3 2004/05/21 15:20:00 reddawg Cleaned up diff --git a/src/sys/kernel/file.c b/src/sys/kernel/file.c index 2865cd8..fe11569 100644 --- a/src/sys/kernel/file.c +++ b/src/sys/kernel/file.c @@ -173,6 +173,11 @@ } void sysFwrite(char *ptr,int size,userFileDescriptor *userFd) { +//void sysFwrite(uInt32 *stackPtr) { + //char *ptr = stackPtr[0]; + //int size = stackPtr[1]; + //userFileDescriptor *userFd = stackPtr[2]; + //kprintf("Sys FWrite: [0x%X][0x%X][0x%X]\n",ptr,size,userFd); if (userFd->fd == 0x0) { kprintf(ptr); } @@ -263,6 +268,9 @@ /*** $Log$ + Revision 1.6 2004/06/29 00:18:49 reddawg + Sub Dirs + Revision 1.5 2004/06/26 01:24:44 reddawg Fixens diff --git a/src/sys/kernel/syscall.c b/src/sys/kernel/syscall.c index 4130729..193bbdc 100644 --- a/src/sys/kernel/syscall.c +++ b/src/sys/kernel/syscall.c @@ -48,6 +48,23 @@ void sdeTestThread(); asm( + ".globl _sysCallNew \n" + "_sysCallNew: \n" + " cmpl totalCalls,%eax \n" + " jae invalidSysCallNew \n" + " mov %esp,%ebx \n" + " add $12,%ebx \n" + " push (%ebx) \n" + " call *systemCalls(,%eax,4) \n" + " add $4,%esp \n" + " jmp doneNew \n" + "invalidSysCallNew: \n" + " call invalidCall \n" + "doneNew: \n" + " iret \n" + ); + +asm( ".globl _sysCall \n" "_sysCall: \n" " cmpl totalCalls,%eax \n" @@ -193,6 +210,9 @@ /*** $Log$ + Revision 1.15 2004/06/26 01:24:44 reddawg + Fixens + Revision 1.14 2004/06/17 03:20:47 reddawg Cleaned Up diff --git a/src/sys/lib/string.c b/src/sys/lib/string.c index 236f0b2..b440827 100644 --- a/src/sys/lib/string.c +++ b/src/sys/lib/string.c @@ -29,7 +29,7 @@ #include -int strcmp(char *str1, char *str2) { +int strcmp(const char *str1,const char *str2) { while ((*str1 == *str2) && (*str1 != 0x0) && (*str2 != 0x0)) { str1++; str2++; @@ -158,6 +158,9 @@ /*** $Log$ + Revision 1.3 2004/06/28 23:12:58 reddawg + file format now container:/path/to/file + Revision 1.2 2004/05/19 14:40:58 reddawg Cleaned up some warning from leaving out typedefs