X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Finclude%2Facess.h;h=c1cc80de13f27ba1f2ff73a4c758422efe6f1a36;hb=f6417c24aede5213c856a78fc21bc3ac7e1becab;hp=27dbb2a60355dd8da7706589fa2363dded957697;hpb=510431249326d5a44fc502ed5cf798b79a442ce8;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/include/acess.h b/KernelLand/Kernel/include/acess.h
index 27dbb2a6..c1cc80de 100644
--- a/KernelLand/Kernel/include/acess.h
+++ b/KernelLand/Kernel/include/acess.h
@@ -9,10 +9,9 @@
  * \brief Acess2 Kernel API Core
  */
 
+#include <stddef.h>
 #include <arch.h>
 
-//! NULL Pointer
-#define NULL	((void*)0)
 //! Pack a structure
 #define PACKED	__attribute__((packed))
 //! Mark a function as not returning
@@ -23,8 +22,6 @@
 #define DEPRECATED	__attribute__((deprecated))
 //! Mark a parameter as unused
 #define UNUSED(x)	UNUSED_##x __attribute__((unused))
-//! Get the offset of a member in a structure
-#define offsetof(st, m) ((Uint)((char *)&((st *)(0))->m - (char *)0 ))
 
 /**
  * \name Boolean constants
@@ -222,7 +219,7 @@ extern Uint	MM_GetFlags(tVAddr VAddr);
  * \param VAddr	Base address to check
  * \return 1 if the memory is all user-accessable, 0 otherwise
  */
-#define MM_IsUser(VAddr)	(!(MM_GetFlags((VAddr))&MM_PFLAG_KERNEL))
+#define MM_IsUser(VAddr)	(!(MM_GetFlags((tVAddr)(VAddr))&MM_PFLAG_KERNEL))
 /**
  * \brief Temporarily map a page into the address space
  * \param PAddr	Physical addres to map
@@ -232,7 +229,7 @@ extern Uint	MM_GetFlags(tVAddr VAddr);
 extern void	*MM_MapTemp(tPAddr PAddr);
 /**
  * \brief Free a temporarily mapped page
- * \param VAddr	Allocate virtual addres of page
+ * \param Ptr	Pointer to page base
  */
 extern void	MM_FreeTemp(void *Ptr);
 /**
@@ -357,42 +354,7 @@ extern Uint64	SwapEndian64(Uint64 Val);
  */
 
 // --- Strings ---
-/**
- * \name Strings
- * \{
- */
-extern int	vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args);
-extern int	snprintf(char *__s, size_t __n, const char *__format, ...);
-extern int	sprintf(char *__s, const char *__format, ...);
-extern size_t	strlen(const char *Str);
-extern char	*strcpy(char *__dest, const char *__src);
-extern char	*strncpy(char *__dest, const char *__src, size_t max);
-extern char	*strcat(char *__dest, const char *__src);
-extern char	*strncat(char *__dest, const char *__src, size_t n);
-extern int	strcmp(const char *__str1, const char *__str2);
-extern int	strncmp(const char *Str1, const char *Str2, size_t num);
-extern int	strucmp(const char *Str1, const char *Str2);
-// strdup macro is defined in heap.h
-extern char	*_strdup(const char *File, int Line, const char *Str);
-extern char	**str_split(const char *__str, char __ch);
-extern char	*strchr(const char *__s, int __c);
-extern char	*strrchr(const char *__s, int __c);
-extern int	strpos(const char *Str, char Ch);
-extern int	strpos8(const char *str, Uint32 search);
-extern void	itoa(char *buf, Uint64 num, int base, int minLength, char pad);
-extern int	atoi(const char *string);
-extern int	ParseInt(const char *string, int *Val);
-extern int	ReadUTF8(const Uint8 *str, Uint32 *Val);
-extern int	WriteUTF8(Uint8 *str, Uint32 Val);
-extern int	ModUtil_SetIdent(char *Dest, const char *Value);
-extern int	ModUtil_LookupString(const char **Array, const char *Needle);
-
-extern Uint8	ByteSum(const void *Ptr, int Size);
-extern int	Hex(char *Dest, size_t Size, const Uint8 *SourceData);
-extern int	UnHex(Uint8 *Dest, size_t DestSize, const char *SourceString);
-/**
- * \}
- */
+#include <acess_string.h>
 
 #include <ctype.h>