git.ucc.asn.au
/
tpg
/
acess2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Kernel - Added assert() macro (same as ASSERT)
[tpg/acess2.git]
/
KernelLand
/
Kernel
/
arch
/
x86_64
/
mm_virt.c
diff --git
a/KernelLand/Kernel/arch/x86_64/mm_virt.c
b/KernelLand/Kernel/arch/x86_64/mm_virt.c
index
de7ae52
..
83e1d1f
100644
(file)
--- a/
KernelLand/Kernel/arch/x86_64/mm_virt.c
+++ b/
KernelLand/Kernel/arch/x86_64/mm_virt.c
@@
-609,7
+609,7
@@
int MM_GetPageEntry(tVAddr Addr, tPAddr *Phys, Uint *Flags)
/**
* \brief Get the physical address of a virtual location
*/
/**
* \brief Get the physical address of a virtual location
*/
-tPAddr MM_GetPhysAddr(const void *Ptr)
+tPAddr MM_GetPhysAddr(
volatile
const void *Ptr)
{
tVAddr Addr = (tVAddr)Ptr;
tPAddr *ptr;
{
tVAddr Addr = (tVAddr)Ptr;
tPAddr *ptr;
@@
-797,7
+797,7
@@
int MM_IsValidBuffer(tVAddr Addr, size_t Size)
/**
* \brief Map a range of hardware pages
*/
/**
* \brief Map a range of hardware pages
*/
-
tVAddr
MM_MapHWPages(tPAddr PAddr, Uint Number)
+
void *
MM_MapHWPages(tPAddr PAddr, Uint Number)
{
tVAddr ret;
int num;
{
tVAddr ret;
int num;
@@
-824,7
+824,7
@@
tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
MM_RefPhys(PAddr);
}
MM_RefPhys(PAddr);
}
- return ret;
+ return
(void*)
ret;
}
Log_Error("MM", "MM_MapHWPages - No space for %i pages", Number);
}
Log_Error("MM", "MM_MapHWPages - No space for %i pages", Number);
@@
-854,10
+854,10
@@
void MM_UnmapHWPages(tVAddr VAddr, Uint Number)
* \param PhysAddr Pointer to the location to place the physical address allocated
* \return Virtual address allocate
*/
* \param PhysAddr Pointer to the location to place the physical address allocated
* \return Virtual address allocate
*/
-
tVAddr
MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
+
void *
MM_AllocDMA(int Pages, int MaxBits, tPAddr *PhysAddr)
{
tPAddr phys;
{
tPAddr phys;
-
tVAddr
ret;
+
void *
ret;
// Sanity Check
if(MaxBits < 12 || !PhysAddr) return 0;
// Sanity Check
if(MaxBits < 12 || !PhysAddr) return 0;
UCC
git Repository :: git.ucc.asn.au