X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=sidebyside;f=Kernel%2Finclude%2Facess.h;h=79c5062b2173d23928beebfb95f1fda75404cdc8;hb=54bf151b1a05b74debdb5f3baec02c18406b74d1;hp=d2e1e8023c469b484c66a04756f28b714bff9f3d;hpb=635bc78017d8a4a16314a973e39c849b2afac795;p=tpg%2Facess2.git

diff --git a/Kernel/include/acess.h b/Kernel/include/acess.h
index d2e1e802..79c5062b 100644
--- a/Kernel/include/acess.h
+++ b/Kernel/include/acess.h
@@ -20,16 +20,8 @@ typedef  int	tTID;
 typedef Uint	tUID;
 typedef Uint	tGID;
 typedef Sint64	tTimestamp;
+typedef Sint64	tTime;
 typedef struct sShortSpinlock	tShortSpinlock;
-typedef struct sMutex	tMutex;
-
-struct sMutex {
-	tShortSpinlock	Protector;	//!< Protector for the lock strucure
-	const char	*Name;	//!< Human-readable name
-	struct sThread	*volatile Owner;	//!< Owner of the lock (set upon getting the lock)
-	struct sThread	*Waiting;	//!< Waiting threads
-	struct sThread	*LastWaiting;	//!< Waiting threads
-};
 
 // --- Helper Macros ---
 /**
@@ -95,7 +87,7 @@ typedef void (*tThreadFunction)(void*);
  * \{
  */
 typedef struct sKernelSymbol {
-	char	*Name;
+	const char	*Name;
 	tVAddr	Value;
 } tKernelSymbol;
 #define	EXPORT(_name)	tKernelSymbol _kexp_##_name __attribute__((section ("KEXPORT"),unused))={#_name, (tVAddr)_name}
@@ -110,13 +102,13 @@ typedef struct sKernelSymbol {
 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, ...);
+extern void	Log_KernelPanic(const char *Ident, const char *Message, ...);
+extern void	Log_Panic(const char *Ident, const char *Message, ...);
+extern void	Log_Error(const char *Ident, const char *Message, ...);
+extern void	Log_Warning(const char *Ident, const char *Message, ...);
+extern void	Log_Notice(const char *Ident, const char *Message, ...);
+extern void	Log_Log(const char *Ident, const char *Message, ...);
+extern void	Log_Debug(const char *Ident, const char *Message, ...);
 
 // --- Debug ---
 /**
@@ -185,7 +177,7 @@ extern Uint64	inq(Uint16 Port);
  * \param VAddr	Virtual Address to allocate at
  * \return Physical address allocated
  */
-extern tPAddr	MM_Allocate(tVAddr VAddr);
+extern tPAddr	MM_Allocate(tVAddr VAddr) __attribute__ ((warn_unused_result));
 /**
  * \brief Deallocate a page
  * \param VAddr	Virtual address to unmap
@@ -277,6 +269,12 @@ extern void	MM_RefPhys(tPAddr PAddr);
  * \param PAddr	Page to dereference
  */
 extern void	MM_DerefPhys(tPAddr PAddr);
+/**
+ * \brief Get the number of times a page has been referenced
+ * \param PAddr	Address to check
+ * \return Reference count for the page
+ */
+extern int	MM_GetRefCount(tPAddr PAddr);
 /**
  * \}
  */
@@ -298,8 +296,8 @@ extern void *memsetd(void *dest, Uint32 val, size_t count);
  * \name Memory Validation
  * \{
  */
-extern int	CheckString(char *String);
-extern int	CheckMem(void *Mem, int Num);
+extern int	CheckString(const char *String);
+extern int	CheckMem(const void *Mem, int Num);
 /**
  * \}
  */
@@ -330,8 +328,7 @@ 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);
-#define strdup(Str)	_strdup(_MODULE_NAME_"/"__FILE__, __LINE__, (Str))
+// 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);
@@ -339,12 +336,12 @@ 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	ReadUTF8(Uint8 *str, Uint32 *Val);
+extern int	ReadUTF8(const Uint8 *str, Uint32 *Val);
 extern int	WriteUTF8(Uint8 *str, Uint32 Val);
-extern int	ModUtil_SetIdent(char *Dest, char *Value);
-extern int	ModUtil_LookupString(char **Array, char *Needle);
+extern int	ModUtil_SetIdent(char *Dest, const char *Value);
+extern int	ModUtil_LookupString(const char **Array, const char *Needle);
 
-extern Uint8	ByteSum(void *Ptr, int Size);
+extern Uint8	ByteSum(const void *Ptr, int Size);
 extern int	UnHex(Uint8 *Dest, size_t DestSize, const char *SourceString);
 /**
  * \}
@@ -361,8 +358,8 @@ extern int	CallWithArgArray(void *Function, int NArgs, Uint *Args);
  * \name Modules
  * \{
  */
-extern int	Module_LoadMem(void *Buffer, Uint Length, char *ArgStr);
-extern int	Module_LoadFile(char *Path, char *ArgStr);
+extern int	Module_LoadMem(void *Buffer, Uint Length, const char *ArgStr);
+extern int	Module_LoadFile(const char *Path, const char *ArgStr);
 /**
  * \}
  */
@@ -421,9 +418,6 @@ extern tGID	Threads_GetGID(void);
 extern int	SpawnTask(tThreadFunction Function, void *Arg);
 extern Uint	*Threads_GetCfgPtr(int Id);
 extern int	Threads_SetName(const char *NewName);
-extern int	Mutex_Acquire(tMutex *Mutex);
-extern void	Mutex_Release(tMutex *Mutex);
-extern int	Mutex_IsLocked(tMutex *Mutex);
 /**
  * \}
  */
@@ -434,5 +428,6 @@ extern int	DivUp(int num, int dem);
 #include <binary_ext.h>
 #include <vfs_ext.h>
 #include <adt.h>
+#include <mutex.h>
 
 #endif