X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Finclude%2Facess.h;h=6373cec51b3717520e0ed74fce3fdb528238907c;hb=0b24cbc2f18942b3d1d74efa025ecfa318ab35ec;hp=5708ad2ee760b1e56a27c9a1f4fac6d0c47a8221;hpb=39b369885f510690e596190ff8a71c9975438ed2;p=tpg%2Facess2.git

diff --git a/Kernel/include/acess.h b/Kernel/include/acess.h
index 5708ad2e..6373cec5 100644
--- a/Kernel/include/acess.h
+++ b/Kernel/include/acess.h
@@ -1,16 +1,15 @@
 /*
  * AcessOS Microkernel Version
- * common.h
+ * acess.h
  */
-#ifndef _COMMON_H
-#define _COMMON_H
+#ifndef _ACESS_H
+#define _ACESS_H
 
 #define NULL	((void*)0)
 #define PACKED	__attribute__((packed))
 #define UNUSED(x)	UNUSED_##x __attribute__((unused))
 #define offsetof(st, m) ((Uint)((char *)&((st *)(0))->m - (char *)0 ))
 
-//#include <stdint.h>
 #include <arch.h>
 #include <stdarg.h>
 #include "errno.h"
@@ -21,6 +20,8 @@ typedef  int	tTID;
 typedef Uint	tUID;
 typedef Uint	tGID;
 typedef Sint64	tTimestamp;
+typedef Sint64	tTime;
+typedef struct sShortSpinlock	tShortSpinlock;
 
 // --- Helper Macros ---
 /**
@@ -38,7 +39,7 @@ typedef Sint64	tTimestamp;
  */
 
 /**
- * \name Per-Process Configuration Settings
+ * \name Per-Thread Configuration Settings
  * \{
  */
 enum eConfigTypes {
@@ -51,10 +52,13 @@ enum eConfigs {
 	CFG_VFS_CWD,
 	CFG_VFS_MAXFILES,
 	CFG_VFS_CHROOT,
+	CFG_ERRNO,
 	NUM_CFG_ENTRIES
 };
 #define CFGINT(id)	(*Threads_GetCfgPtr(id))
 #define CFGPTR(id)	(*(void**)Threads_GetCfgPtr(id))
+
+#define errno	(CFGINT(CFG_ERRNO))
 /**
  * \}
  */
@@ -86,12 +90,12 @@ typedef void (*tThreadFunction)(void*);
  * \{
  */
 typedef struct sKernelSymbol {
-	char	*Name;
-	Uint	Value;
+	const char	*Name;
+	tVAddr	Value;
 } tKernelSymbol;
-#define	EXPORT(_name)	tKernelSymbol _kexp_##_name __attribute__((section ("KEXPORT"),unused))={#_name, (Uint)_name}
-#define	EXPORTV(_name)	tKernelSymbol _kexp_##_name __attribute__((section ("KEXPORT"),unused))={#_name, (Uint)&_name}
-#define	EXPORTAS(_sym,_name)	tKernelSymbol _kexp_##_name __attribute__((section ("KEXPORT"),unused))={#_name, (Uint)_sym}
+#define	EXPORT(_name)	tKernelSymbol _kexp_##_name __attribute__((section ("KEXPORT"),unused))={#_name, (tVAddr)_name}
+#define	EXPORTV(_name)	tKernelSymbol _kexp_##_name __attribute__((section ("KEXPORT"),unused))={#_name, (tVAddr)&_name}
+#define	EXPORTAS(_sym,_name)	tKernelSymbol _kexp_##_name __attribute__((section ("KEXPORT"),unused))={#_name, (tVAddr)_sym}
 /**
  * \}
  */
@@ -99,15 +103,16 @@ typedef struct sKernelSymbol {
 // === FUNCTIONS ===
 // --- IRQs ---
 extern int	IRQ_AddHandler(int Num, void (*Callback)(int));
+extern void	IRQ_RemHandler(int Handle);
 
 // --- 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 ---
 /**
@@ -115,16 +120,16 @@ extern void	Log_Debug(char *Ident, char *Message, ...);
  * \{
  */
 extern void	Debug_KernelPanic(void);	//!< 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	Debug(char *Fmt, ...);	//!< Print a debug message (doesn't go to KTerm)
-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, ...);
-extern void	Debug_HexDump(char *Header, void *Data, Uint Length);
+extern void	Panic(const char *Msg, ...);	//!< Print a panic message (initiates a kernel panic)
+extern void	Warning(const char *Msg, ...);	//!< Print a warning message
+extern void	LogF(const char *Fmt, ...);	//!< Print a log message without a trailing newline
+extern void	Log(const char *Fmt, ...);	//!< Print a log message
+extern void	Debug(const char *Fmt, ...);	//!< Print a debug message (doesn't go to KTerm)
+extern void	LogV(const char *Fmt, va_list Args);	//!< va_list Log message
+extern void	Debug_Enter(const char *FuncName, const char *ArgTypes, ...);
+extern void	Debug_Log(const char *FuncName, const char *Fmt, ...);
+extern void	Debug_Leave(const char *FuncName, char RetType, ...);
+extern void	Debug_HexDump(const char *Header, const void *Data, Uint Length);
 #define UNIMPLEMENTED()	Warning("'%s' unimplemented", __func__)
 #if DEBUG
 # define ENTER(_types...)	Debug_Enter((char*)__func__, _types)
@@ -176,7 +181,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
@@ -254,6 +259,7 @@ extern tPAddr	MM_AllocPhys(void);
 /**
  * \brief Allocate a contiguous range of physical pages
  * \param Pages	Number of pages to allocate
+ * \param MaxBits	Maximum number of address bits allowed
  * \return First physical address allocated
  */
 extern tPAddr	MM_AllocPhysRange(int Pages, int MaxBits);
@@ -267,6 +273,30 @@ 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);
+/**
+ * \brief Set the node associated with a page
+ * \param PAddr	Physical address of page
+ * \param Node	Node pointer (tVFS_Node)
+ * \return Boolean failure
+ * \retval 0	Success
+ * \retval 1	Page not allocated
+ */
+extern int	MM_SetPageNode(tPAddr PAddr, void *Node);
+/**
+ * \brief Get the node associated with a page
+ * \param PAddr	Physical address of page
+ * \param Node	Node pointer (tVFS_Node) destination
+ * \return Boolean failure
+ * \retval 0	Success
+ * \retval 1	Page not allocated
+ */
+extern int	MM_GetPageNode(tPAddr PAddr, void **Node);
 /**
  * \}
  */
@@ -288,8 +318,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);
 /**
  * \}
  */
@@ -299,10 +329,19 @@ extern int	CheckMem(void *Mem, int Num);
  * \name Endianness Swapping
  * \{
  */
-extern Uint16	LittleEndian16(Uint16 Val);
-extern Uint16	BigEndian16(Uint16 Val);
-extern Uint32	LittleEndian32(Uint32 Val);
-extern Uint32	BigEndian32(Uint32 Val);
+#ifdef __BIG_ENDIAN__
+#define	LittleEndian16(_val)	SwapEndian16(_val)
+#define	LittleEndian32(_val)	SwapEndian32(_val)
+#define	BigEndian16(_val)	(_val)
+#define	BigEndian32(_val)	(_val)
+#else
+#define	LittleEndian16(_val)	(_val)
+#define	LittleEndian32(_val)	(_val)
+#define	BigEndian16(_val)	SwapEndian16(_val)
+#define	BigEndian32(_val)	SwapEndian32(_val)
+#endif
+extern Uint16	SwapEndian16(Uint16 Val);
+extern Uint32	SwapEndian32(Uint32 Val);
 /**
  * \}
  */
@@ -314,51 +353,46 @@ extern Uint32	BigEndian32(Uint32 Val);
  */
 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 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);
-extern char	*strdup(const char *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);
 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);
+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 Uint8	ByteSum(void *Ptr, int Size);
+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	UnHex(Uint8 *Dest, size_t DestSize, const char *SourceString);
 /**
  * \}
  */
 
-extern Uint	rand(void);
+extern int	rand(void);
 extern int	CallWithArgArray(void *Function, int NArgs, Uint *Args);
 
 // --- Heap ---
-/**
- * \name Heap
- * \{
- */
-extern void *malloc(size_t size);
-extern void *calloc(size_t num, size_t size);
-extern void	*realloc(void *ptr, size_t size);
-extern void free(void *Ptr);
-extern int	IsHeap(void *Ptr);
-/**
- * \}
- */
+#include <heap.h>
 
 // --- Modules ---
 /**
  * \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);
 /**
  * \}
  */
@@ -391,6 +425,9 @@ extern int	Time_CreateTimer(int Delta, tTimerCallback *Callback, void *Argument)
  * \brief Removed an active timer
  */
 extern void	Time_RemoveTimer(int ID);
+/**
+ * \brief Wait for a period of milliseconds
+ */
 extern void	Time_Delay(int Delay);
 /**
  * \}
@@ -402,7 +439,7 @@ extern void	Time_Delay(int Delay);
  * \{
  */
 extern int	Proc_SpawnWorker(void);
-extern int	Proc_Spawn(char *Path);
+extern int	Proc_Spawn(const char *Path);
 extern void	Threads_Exit(int TID, int Status);
 extern void	Threads_Yield(void);
 extern void	Threads_Sleep(void);
@@ -413,7 +450,7 @@ extern tUID	Threads_GetUID(void);
 extern tGID	Threads_GetGID(void);
 extern int	SpawnTask(tThreadFunction Function, void *Arg);
 extern Uint	*Threads_GetCfgPtr(int Id);
-extern int	Threads_SetName(char *NewName);
+extern int	Threads_SetName(const char *NewName);
 /**
  * \}
  */
@@ -423,6 +460,6 @@ extern int	DivUp(int num, int dem);
 
 #include <binary_ext.h>
 #include <vfs_ext.h>
-#include <adt.h>
+#include <mutex.h>
 
 #endif