* \brief Acess2 Kernel API Core
*/
+#include <stddef.h>
#include <arch.h>
-//! NULL Pointer
-#define NULL ((void*)0)
//! 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))
-//! Get the offset of a member in a structure
-#define offsetof(st, m) ((Uint)((char *)&((st *)(0))->m - (char *)0 ))
+//!
+#define ALIGN(x) __attribute__((aligned(x)))
/**
* \name Boolean constants
// --- 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 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 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))
+#define MM_IsUser(VAddr) (!(MM_GetFlags((tVAddr)(VAddr))&MM_PFLAG_KERNEL))
/**
* \brief Temporarily map a page into the address space
* \param PAddr Physical addres to map
extern void *MM_MapTemp(tPAddr PAddr);
/**
* \brief Free a temporarily mapped page
- * \param VAddr Allocate virtual addres of page
+ * \param Ptr Pointer to page base
*/
extern void MM_FreeTemp(void *Ptr);
/**
* \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
*/
// --- Strings ---
-/**
- * \name Strings
- * \{
- */
-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);
-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);
-// 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 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);
-extern int atoi(const char *string);
-extern int ParseInt(const char *string, int *Val);
-extern int ReadUTF8(const Uint8 *str, Uint32 *Val);
-extern int WriteUTF8(Uint8 *str, Uint32 Val);
-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 Hex(char *Dest, size_t Size, const Uint8 *SourceData);
-extern int UnHex(Uint8 *Dest, size_t DestSize, const char *SourceString);
-/**
- * \}
- */
+#include <acess_string.h>
#include <ctype.h>