X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Facess.h;h=394f9f1ed7c423e4e79c7eaa80153d37cdb4a70b;hb=3c496a30a8c22105fcf21089dce53809e5201205;hp=963cb9cf82e7943f0c272bd68ebf7fa96ee5375c;hpb=775bf8013abe9fe4ef3d4883ea2e43bba2a84da1;p=tpg%2Facess2.git

diff --git a/Kernel/include/acess.h b/Kernel/include/acess.h
index 963cb9cf..394f9f1e 100644
--- a/Kernel/include/acess.h
+++ b/Kernel/include/acess.h
@@ -8,7 +8,7 @@
 #define NULL	((void*)0)
 #define PACKED	__attribute__ ((packed))
 
-#include <stdint.h>
+//#include <stdint.h>
 #include <arch.h>
 #include <stdarg.h>
 #include "errno.h"
@@ -95,9 +95,6 @@ typedef struct sKernelSymbol {
  */
 
 // === FUNCTIONS ===
-// --- Core ---
-extern void	System_Init(char *ArgString);
-
 // --- IRQs ---
 extern int	IRQ_AddHandler(int Num, void (*Callback)(int));
 
@@ -115,11 +112,12 @@ extern void	Log_Debug(char *Ident, char *Message, ...);
  * \name Debugging and Errors
  * \{
  */
-extern void	Panic(char *Msg, ...);
-extern void	Warning(char *Msg, ...);
-extern void	Log(char *Fmt, ...);
-extern void	LogV(char *Fmt, va_list Args);
-extern void	LogF(char *Fmt, ...);
+extern void	Debug_KernelPanic();	//!< Initiate a kernel panic
+extern void	Panic(char *Msg, ...);	//!< Print a panic message (initiates a kernel panic)
+extern void	Warning(char *Msg, ...);	//!< Print a warning message
+extern void	LogF(char *Fmt, ...);	//!< Print a log message without a trailing newline
+extern void	Log(char *Fmt, ...);	//!< Print a log message
+extern void	LogV(char *Fmt, va_list Args);	//!< va_list Log message
 extern void	Debug_Enter(char *FuncName, char *ArgTypes, ...);
 extern void	Debug_Log(char *FuncName, char *Fmt, ...);
 extern void	Debug_Leave(char *FuncName, char RetType, ...);
@@ -194,12 +192,6 @@ extern int	MM_Map(tVAddr VAddr, tPAddr PAddr);
  * \return Physical page mapped at \a Addr
  */
 extern tPAddr	MM_GetPhysAddr(tVAddr Addr);
-/**
- * \brief Checks is a memory range is user accessable
- * \param VAddr	Base address to check
- * \return 1 if the memory is all user-accessable, 0 otherwise
- */
-extern int	MM_IsUser(tVAddr VAddr);
 /**
  * \brief Set the access flags on a page
  * \param VAddr	Virtual address of the page
@@ -207,6 +199,18 @@ extern int	MM_IsUser(tVAddr VAddr);
  * \param Mask	Flags to set
  */
 extern void	MM_SetFlags(tVAddr VAddr, Uint Flags, Uint Mask);
+/**
+ * \brief Get the flags on a flag
+ * \param VAddr	Virtual address of page
+ * \return Flags value of the page
+ */
+extern Uint	MM_GetFlags(tVAddr VAddr);
+/**
+ * \brief Checks is a memory range is user accessable
+ * \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))
 /**
  * \brief Temporarily map a page into the address space
  * \param PAddr	Physical addres to map
@@ -314,6 +318,7 @@ 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);
 extern char	*strdup(const char *Str);
+extern char	**str_split(const char *__str, char __ch);
 extern int	strpos(const char *Str, char Ch);
 extern int	strpos8(const char *str, Uint32 search);
 extern void	itoa(char *buf, Uint num, int base, int minLength, char pad);
@@ -399,5 +404,6 @@ extern int	DivUp(int num, int dem);
 
 #include <binary_ext.h>
 #include <vfs_ext.h>
+#include <adt.h>
 
 #endif