/*
* 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 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"
typedef Uint tUID;
typedef Uint tGID;
typedef Sint64 tTimestamp;
+typedef Sint64 tTime;
+typedef struct sShortSpinlock tShortSpinlock;
// --- Helper Macros ---
/**
* \{
*/
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}
/**
* \}
*/
// === 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 ---
/**
* \name Debugging and Errors
* \{
*/
-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, ...);
-extern void Debug_HexDump(char *Header, void *Data, Uint Length);
+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)
* \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
* \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
* \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
* \brief Allocate a single physical page
* \return Physical address allocated
*/
-extern tPAddr MM_AllocPhys();
+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);
* \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);
/**
* \}
*/
* \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);
/**
* \}
*/
* \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);
/**
* \}
*/
*/
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 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();
+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);
/**
* \}
*/
* \brief Create a timestamp from a time
*/
extern Sint64 timestamp(int sec, int mins, int hrs, int day, int month, int year);
-extern Sint64 now();
-extern int Time_CreateTimer(int Delta, void *Callback, void *Argument);
+/**
+ * \brief Gets the current timestamp (miliseconds since Midnight 1st January 1970)
+ */
+extern Sint64 now(void);
+/**
+ * \brief Timer callback function
+ */
+typedef void (tTimerCallback)(void *);
+/**
+ * \brief Creates a one-shot timer
+ * \param Delta Period of the timer
+ * \param Callback Function to call each time
+ * \param Argument Argument to pass to the callback
+ */
+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);
/**
* \}
* \name Threads and Processes
* \{
*/
-extern int Proc_SpawnWorker();
+extern int Proc_SpawnWorker(void);
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 void Threads_Exit(int TID, int Status);
+extern void Threads_Yield(void);
+extern void Threads_Sleep(void);
+extern int Threads_WakeTID(tTID Thread);
+extern tPID Threads_GetPID(void);
+extern tTID Threads_GetTID(void);
+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);
/**
* \}
*/
#include <binary_ext.h>
#include <vfs_ext.h>
#include <adt.h>
+#include <mutex.h>
#endif
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au