X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Facess.h;h=394f9f1ed7c423e4e79c7eaa80153d37cdb4a70b;hb=eecce4b7a55315f6c385ad8be35c25dbb12d43d8;hp=2cd927b7dbeaaab0fbec04f109cbfb86c96e87d6;hpb=bf7d1cd5635d41bd7c58bf99c61cdc670291c543;p=tpg%2Facess2.git

diff --git a/Kernel/include/acess.h b/Kernel/include/acess.h
index 2cd927b7..394f9f1e 100644
--- a/Kernel/include/acess.h
+++ b/Kernel/include/acess.h
@@ -8,6 +8,7 @@
 #define NULL	((void*)0)
 #define PACKED	__attribute__ ((packed))
 
+//#include <stdint.h>
 #include <arch.h>
 #include <stdarg.h>
 #include "errno.h"
@@ -94,22 +95,29 @@ typedef struct sKernelSymbol {
  */
 
 // === FUNCTIONS ===
-// --- Core ---
-extern void	System_Init(char *ArgString);
-
 // --- IRQs ---
 extern int	IRQ_AddHandler(int Num, void (*Callback)(int));
 
+// --- Logging ---
+extern void	Log_KernelPanic(char *Ident, char *Message, ...);
+extern void	Log_Panic(char *Ident, char *Message, ...);
+extern void	Log_Error(char *Ident, char *Message, ...);
+extern void	Log_Warning(char *Ident, char *Message, ...);
+extern void	Log_Notice(char *Ident, char *Message, ...);
+extern void	Log_Log(char *Ident, char *Message, ...);
+extern void	Log_Debug(char *Ident, char *Message, ...);
+
 // --- Debug ---
 /**
  * \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, ...);
@@ -184,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
@@ -197,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
@@ -214,7 +228,7 @@ extern void	MM_FreeTemp(tVAddr VAddr);
  * \param PAddr	Physical address to map in
  * \param Number	Number of pages to map
  */
-extern tVAddr	MM_MapHWPage(tPAddr PAddr, Uint Number);
+extern tVAddr	MM_MapHWPages(tPAddr PAddr, Uint Number);
 /**
  * \brief Allocates DMA physical memory
  * \param Pages	Number of pages required
@@ -228,7 +242,7 @@ extern tVAddr	MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr);
  * \param VAddr	Virtual address allocate by ::MM_MapHWPage or ::MM_AllocDMA
  * \param Number	Number of pages to free
  */
-extern void	MM_UnmapHWPage(tVAddr VAddr, Uint Number);
+extern void	MM_UnmapHWPages(tVAddr VAddr, Uint Number);
 /**
  * \brief Allocate a single physical page
  * \return Physical address allocated
@@ -295,13 +309,16 @@ extern Uint32	BigEndian32(Uint32 Val);
  * \name Strings
  * \{
  */
+extern int	vsnprintf(char *__s, size_t __maxlen, const char *__format, va_list args);
 extern int	sprintf(char *__s, const char *__format, ...);
 extern Uint	strlen(const char *Str);
 extern char	*strcpy(char *__dest, const char *__src);
+extern char	*strncpy(char *__dest, const char *__src, size_t max);
 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);
@@ -316,6 +333,7 @@ extern Uint8	ByteSum(void *Ptr, int Size);
  */
 
 extern Uint	rand();
+extern int	CallWithArgArray(void *Function, int NArgs, Uint *Args);
 
 // --- Heap ---
 /**
@@ -369,12 +387,14 @@ extern int	Proc_Spawn(char *Path);
 extern void	Threads_Exit();
 extern void	Threads_Yield();
 extern void	Threads_Sleep();
+extern void	Threads_WakeTID(tTID Thread);
 extern tPID	Threads_GetPID();
 extern tTID	Threads_GetTID();
 extern tUID	Threads_GetUID();
 extern tGID	Threads_GetGID();
 extern int	SpawnTask(tThreadFunction Function, void *Arg);
 extern Uint	*Threads_GetCfgPtr(int Id);
+extern int	Threads_SetName(char *NewName);
 /**
  * \}
  */
@@ -384,5 +404,6 @@ extern int	DivUp(int num, int dem);
 
 #include <binary_ext.h>
 #include <vfs_ext.h>
+#include <adt.h>
 
 #endif