#include <stddef.h>
#include <arch.h>
+#ifndef HALT_CPU
+# define HALT_CPU() for(;;);
+#endif
+
//! Pack a structure
#define PACKED __attribute__((packed))
//! Mark a function as not returning
#define DEPRECATED __attribute__((deprecated))
//! Mark a parameter as unused
#define UNUSED(x) UNUSED_##x __attribute__((unused))
+//!
+#define ALIGN(x) __attribute__((aligned(x)))
/**
* \name Boolean constants
typedef struct sShortSpinlock tShortSpinlock; //!< Opaque (kinda) spinlock
typedef int bool; //!< Boolean type
typedef Uint64 off_t; //!< VFS Offset
+typedef struct { char _[PAGE_SIZE];} tPage; // Representation of a page for pointer arithmatic
// --- Helper Macros ---
/**
// --- IO ---
#if NO_IO_BUS
-#define inb(a) (Log_Panic("Arch", STR(ARCHDIR)" does not support in*/out* (%s:%i)", __FILE__, __LINE__),0)
+#define inb(a) (Log_Panic("Arch", STR(ARCHDIR)" does not support in* (%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)
+#define outb(a,b) (Log_Panic("Arch", STR(ARCHDIR)" does not support out* (%s:%i)", __FILE__, __LINE__),(void)(b))
+#define outw(a,b) outb(a,b)
+#define outd(a,b) outb(a,b)
+#define outq(a,b) outb(a,b)
#else
/**
* \name I/O Memory Access
* \param VAddr Virtual Address to allocate at
* \return Physical address allocated
*/
-extern tPAddr MM_Allocate(tVAddr VAddr) __attribute__ ((warn_unused_result));
+extern tPAddr MM_Allocate(volatile void *VAddr) __attribute__ ((warn_unused_result));
+/**
+ * \breif Allocate a zeroed COW page to \a VAddr
+ * \param VAddr Virtual address to allocate at
+ * \return Physical address allocated (don't cache)
+ */
+extern void MM_AllocateZero(volatile void *VAddr);
/**
* \brief Deallocate a page
* \param VAddr Virtual address to unmap
*/
-extern void MM_Deallocate(tVAddr VAddr);
+extern void MM_Deallocate(volatile void *VAddr);
/**
* \brief Map a physical page at \a PAddr to \a VAddr
* \param VAddr Target virtual address
* \param PAddr Physical address to map
* \return Boolean Success
*/
-extern int MM_Map(tVAddr VAddr, tPAddr PAddr);
+extern int MM_Map(volatile void * VAddr, tPAddr PAddr);
/**
* \brief Get the physical address of \a Addr
* \param Addr Address of the page to get the physical address of
* \return Physical page mapped at \a Addr
*/
-extern tPAddr MM_GetPhysAddr(const void *Addr);
+extern tPAddr MM_GetPhysAddr(volatile const void *Addr);
/**
* \brief Set the access flags on a page
* \param VAddr Virtual address of the page
* \param Flags New flags value
* \param Mask Flags to set
*/
-extern void MM_SetFlags(tVAddr VAddr, Uint Flags, Uint Mask);
+extern void MM_SetFlags(volatile void *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);
+extern Uint MM_GetFlags(volatile const void *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((tVAddr)(VAddr))&MM_PFLAG_KERNEL))
+#define MM_IsUser(VAddr) (!(MM_GetFlags((const void*)(VAddr))&MM_PFLAG_KERNEL))
/**
* \brief Temporarily map a page into the address space
* \param PAddr Physical addres to map
* \param PAddr Physical address to map in
* \param Number Number of pages to map
*/
-extern tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number);
+extern void *MM_MapHWPages(tPAddr PAddr, Uint Number);
/**
* \brief Allocates DMA physical memory
* \param Pages Number of pages required
* \param PhysAddr Pointer to the location to place the physical address allocated
* \return Virtual address allocate
*/
-extern tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr);
+extern void *MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr);
/**
* \brief Unmaps an allocated hardware range
* \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 void MM_UnmapHWPages(volatile void *VAddr, Uint Number);
/**
* \brief Allocate a single physical page
* \return Physical address allocated