X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FKernel%2Finclude%2Facess.h;h=24148e149d02ac6e3fbbb6df3f3307ea7267265e;hb=04a050f42807686dc119838c82372409246d55bb;hp=0121eb24bc3cd8526d2de696b0353b17223857c3;hpb=934d0f535e1929fd90ae0606e77794484aa55284;p=tpg%2Facess2.git

diff --git a/KernelLand/Kernel/include/acess.h b/KernelLand/Kernel/include/acess.h
index 0121eb24..24148e14 100644
--- a/KernelLand/Kernel/include/acess.h
+++ b/KernelLand/Kernel/include/acess.h
@@ -9,18 +9,19 @@
  * \brief Acess2 Kernel API Core
  */
 
-//! NULL Pointer
-#define NULL	((void*)0)
+#include <stddef.h>
+#include <arch.h>
+
 //! Pack a structure
 #define PACKED	__attribute__((packed))
 //! Mark a function as not returning
 #define NORETURN	__attribute__((noreturn))
+//! Mark a function that its return value should be used
+#define WARN_UNUSED_RET	__attribute__((warn_unused_result))
 //! Mark a function (or variable) as deprecated
 #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
@@ -32,12 +33,12 @@
  * \}
  */
 
-#include <arch.h>
 #include <stdarg.h>
 #include "errno.h"
 
 // --- Types ---
 typedef Uint32	tPID;	//!< Process ID type
+typedef Uint32	tPGID;	//!< Process Group ID type
 typedef Uint32	tTID;	//!< Thread ID Type
 typedef Uint32	tUID;	//!< User ID Type
 typedef Uint32	tGID;	//!< Group ID Type
@@ -45,6 +46,7 @@ typedef Sint64	tTimestamp;	//!< Timestamp (miliseconds since 00:00 1 Jan 1970)
 typedef Sint64	tTime;	//!< Same again
 typedef struct sShortSpinlock	tShortSpinlock;	//!< Opaque (kinda) spinlock
 typedef int	bool;	//!< Boolean type
+typedef Uint64	off_t;	//!< VFS Offset
 
 // --- Helper Macros ---
 /**
@@ -58,7 +60,8 @@ typedef int	bool;	//!< Boolean type
 
 extern char	__buildnum[];
 #define BUILD_NUM	((int)(Uint)&__buildnum)
-extern const char gsGitHash[];
+extern const char	gsGitHash[];
+extern const char	gsBuildInfo[];
 
 #define VER2(major,minor)	((((major)&0xFF)<<8)|((minor)&0xFF))
 /**
@@ -92,6 +95,8 @@ extern const char gsGitHash[];
 #define CLONE_VM	0x10
 //! Don't copy user pages
 #define CLONE_NOUSER	0x20
+//! Inherit the parent's PGID
+#define CLONE_PGID	0x40
 /**
  * \}
  */
@@ -137,60 +142,7 @@ extern void	IRQ_RemHandler(int Handle);
  * \}
  */
 
-// --- Logging ---
-/**
- * \name Logging to kernel ring buffer
- * \{
- */
-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 ---
-/**
- * \name Debugging and Errors
- * \{
- */
-extern void	Debug_KernelPanic(void);	//!< Initiate a kernel panic
-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)
-# define LOG(_fmt...)	Debug_Log((char*)__func__, _fmt)
-# define LEAVE(_t...)	Debug_Leave((char*)__func__, _t)
-# define LEAVE_RET(_t,_v...)	do{LEAVE(_t,_v);return _v;}while(0)
-# define LEAVE_RET0()	do{LEAVE('-');return;}while(0)
-#else
-# define ENTER(...)
-# define LOG(...)
-# define LEAVE(...)
-# define LEAVE_RET(_t,_v...)	return (_v)
-# define LEAVE_RET0()	return
-#endif
-#if SANITY
-# define ASSERT(expr) do{if(!(expr))Panic("%s:%i - %s: Assertion '"#expr"' failed",__FILE__,__LINE__,(char*)__func__);}while(0)
-#else
-# define ASSERT(expr)
-#endif
-/**
- * \}
- */
+#include "logdebug.h"
 
 // --- IO ---
 #if NO_IO_BUS
@@ -248,7 +200,7 @@ extern int	MM_Map(tVAddr VAddr, tPAddr PAddr);
  * \param Addr	Address of the page to get the physical address of
  * \return Physical page mapped at \a Addr
  */
-extern tPAddr	MM_GetPhysAddr(tVAddr Addr);
+extern tPAddr	MM_GetPhysAddr(const void *Addr);
 /**
  * \brief Set the access flags on a page
  * \param VAddr	Virtual address of the page
@@ -274,12 +226,12 @@ extern Uint	MM_GetFlags(tVAddr VAddr);
  * \return Virtual address of page in memory
  * \note There is only a limited ammount of slots avaliable
  */
-extern tVAddr	MM_MapTemp(tPAddr PAddr);
+extern void	*MM_MapTemp(tPAddr PAddr);
 /**
  * \brief Free a temporarily mapped page
  * \param VAddr	Allocate virtual addres of page
  */
-extern void	MM_FreeTemp(tVAddr VAddr);
+extern void	MM_FreeTemp(void *Ptr);
 /**
  * \brief Map a physcal address range into the virtual address space
  * \param PAddr	Physical address to map in
@@ -382,16 +334,21 @@ extern int	CheckMem(const void *Mem, int Num);
 #ifdef __BIG_ENDIAN__
 #define	LittleEndian16(_val)	SwapEndian16(_val)
 #define	LittleEndian32(_val)	SwapEndian32(_val)
+#define	LittleEndian64(_val)	SwapEndian32(_val)
 #define	BigEndian16(_val)	(_val)
 #define	BigEndian32(_val)	(_val)
+#define	BigEndian64(_val)	(_val)
 #else
 #define	LittleEndian16(_val)	(_val)
 #define	LittleEndian32(_val)	(_val)
+#define	LittleEndian64(_val)	(_val)
 #define	BigEndian16(_val)	SwapEndian16(_val)
 #define	BigEndian32(_val)	SwapEndian32(_val)
+#define	BigEndian64(_val)	SwapEndian64(_val)
 #endif
 extern Uint16	SwapEndian16(Uint16 Val);
 extern Uint32	SwapEndian32(Uint32 Val);
+extern Uint64	SwapEndian64(Uint64 Val);
 /**
  * \}
  */
@@ -402,6 +359,7 @@ extern Uint32	SwapEndian32(Uint32 Val);
  * \{
  */
 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);
@@ -415,6 +373,7 @@ extern int	strucmp(const char *Str1, const char *Str2);
 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);
@@ -432,6 +391,8 @@ extern int	UnHex(Uint8 *Dest, size_t DestSize, const char *SourceString);
  * \}
  */
 
+#include <ctype.h>
+
 /**
  * \brief Get a random number
  * \return Random number
@@ -472,10 +433,12 @@ extern int	Module_LoadFile(const char *Path, const char *ArgStr);
  */
 /**
  * \brief Create a timestamp from a time
+ * \note Days/Months are zero-based (e.g. December is 11, and has a day range of 0-30)
  */
 extern tTime	timestamp(int sec, int mins, int hrs, int day, int month, int year);
 /**
  * \brief Extract the date/time from a timestamp
+ * \note Days/Months are zero-based (e.g. December is 11, and has a day range of 0-30)
  */
 extern void	format_date(tTime TS, int *year, int *month, int *day, int *hrs, int *mins, int *sec, int *ms);
 /**
@@ -491,7 +454,7 @@ extern Sint64	now(void);
  * \name Threads and Processes
  * \{
  */
-extern int	Proc_SpawnWorker(void (*Fcn)(void*), void *Data);
+extern struct sThread	*Proc_SpawnWorker(void (*Fcn)(void*), void *Data);
 extern int	Proc_Spawn(const char *Path);
 extern int	Proc_SysSpawn(const char *Binary, const char **ArgV, const char **EnvP, int nFD, int *FDs);
 extern int	Proc_Execve(const char *File, const char **ArgV, const char **EnvP, int DataSize);
@@ -499,6 +462,7 @@ extern void	Threads_Exit(int TID, int Status);
 extern void	Threads_Yield(void);
 extern void	Threads_Sleep(void);
 extern int	Threads_WakeTID(tTID Thread);
+extern tPGID	Threads_GetPGID(void);
 extern tPID	Threads_GetPID(void);
 extern tTID	Threads_GetTID(void);
 extern tUID	Threads_GetUID(void);