#define NULL ((void*)0)
#define PACKED __attribute__((packed))
+#define NORETURN __attribute__((noreturn))
#define UNUSED(x) UNUSED_##x __attribute__((unused))
#define offsetof(st, m) ((Uint)((char *)&((st *)(0))->m - (char *)0 ))
+#define TRUE 1
+#define FALSE 0
+
#include <arch.h>
#include <stdarg.h>
#include "errno.h"
typedef Sint64 tTimestamp;
typedef Sint64 tTime;
typedef struct sShortSpinlock tShortSpinlock;
+typedef int bool;
// --- Helper Macros ---
/**
#define STR(x) #x
#define EXPAND_STR(x) STR(x)
+extern char __buildnum[];
+#define BUILD_NUM ((int)(Uint)&__buildnum)
+extern const char gsGitHash[];
+
#define VER2(major,minor) ((((major)&0xFF)<<8)|((minor)&0xFF))
/**
* \}
// === FUNCTIONS ===
// --- IRQs ---
-extern int IRQ_AddHandler(int Num, void (*Callback)(int));
+extern int IRQ_AddHandler(int Num, void (*Callback)(int, void*), void *Ptr);
extern void IRQ_RemHandler(int Handle);
// --- Logging ---
*/
// --- IO ---
+#if NO_IO_BUS
+#define inb(a) (Log_Panic("Arch", "ARMv7 does not support in*/out* (%s:%i)", __FILE__, __LINE__),0)
+#define inw(a) inb(a)
+#define ind(a) inb(a)
+#define inq(a) inb(a)
+#define outb(a,b) inb(a)
+#define outw(a,b) inb(a)
+#define outd(a,b) inb(a)
+#define outq(a,b) inb(a)
+#else
/**
* \name I/O Memory Access
* \{
/**
* \}
*/
-
+#endif
// --- Memory Management ---
/**
* \name Memory Management
extern tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr);
/**
* \brief Unmaps an allocated hardware range
- * \param VAddr Virtual address allocate by ::MM_MapHWPage or ::MM_AllocDMA
+ * \param VAddr Virtual address allocate by ::MM_MapHWPages or ::MM_AllocDMA
* \param Number Number of pages to free
*/
extern void MM_UnmapHWPages(tVAddr VAddr, Uint Number);
*/
extern int MM_GetRefCount(tPAddr PAddr);
/**
- * \brief Set the node/offset associated with a page
+ * \brief Set the node associated with a page
* \param PAddr Physical address of page
* \param Node Node pointer (tVFS_Node)
- * \param Offset File offset
* \return Boolean failure
* \retval 0 Success
* \retval 1 Page not allocated
*/
-extern int MM_SetPageInfo(tPAddr PAddr, void *Node, Uint64 Offset);
+extern int MM_SetPageNode(tPAddr PAddr, void *Node);
/**
- * \brief Get the node/offset associated with a page
+ * \brief Get the node associated with a page
* \param PAddr Physical address of page
* \param Node Node pointer (tVFS_Node) destination
- * \param Offset File offset destination (pointer)
* \return Boolean failure
* \retval 0 Success
* \retval 1 Page not allocated
*/
-extern int MM_GetPageInfo(tPAddr PAddr, void **Node, Uint64 *Offset);
+extern int MM_GetPageNode(tPAddr PAddr, void **Node);
/**
* \}
*/
* \{
*/
extern int memcmp(const void *m1, const void *m2, size_t count);
-extern void *memcpy(void *dest, const void *src, size_t count);
-extern void *memcpyd(void *dest, const void *src, size_t count);
-extern void *memset(void *dest, int val, size_t count);
-extern void *memsetd(void *dest, Uint32 val, size_t count);
+extern void *memcpy(void *dest, const void *src, size_t count);
+extern void *memcpyd(void *dest, const void *src, size_t count);
+extern void *memmove(void *dest, const void *src, size_t len);
+extern void *memset(void *dest, int val, size_t count);
+extern void *memsetd(void *dest, Uint32 val, size_t count);
/**
* \}
*/
* \name Threads and Processes
* \{
*/
-extern int Proc_SpawnWorker(void);
-extern int Proc_Spawn(char *Path);
+extern int Proc_SpawnWorker(void (*Fcn)(void*), void *Data);
+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);
// --- Simple Math ---
extern int DivUp(int num, int dem);
+extern Uint64 DivMod64U(Uint64 Num, Uint64 Den, Uint64 *Rem);
#include <binary_ext.h>
#include <vfs_ext.h>
-#include <adt.h>
#include <mutex.h>
#endif