* \fn tPAddr MM_GetPhysAddr(tVAddr Addr)
* \brief Checks if the passed address is accesable
*/
-tPAddr MM_GetPhysAddr(const void *Addr)
+tPAddr MM_GetPhysAddr(volatile const void *Addr)
{
tVAddr addr = (tVAddr)Addr;
if( !(gaPageDir[addr >> 22] & 1) )
* \fn tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
* \brief Allocates a contigous number of pages
*/
-tVAddr MM_MapHWPages(tPAddr PAddr, Uint Number)
+void *MM_MapHWPages(tPAddr PAddr, Uint Number)
{
- int i, j;
+ int j;
PAddr &= ~0xFFF;
-
+
+ if( PAddr < 1024*1024 && (1024*1024-PAddr) >= Number * PAGE_SIZE )
+ {
+ return (void*)(KERNEL_BASE + PAddr);
+ }
+
// Scan List
- for( i = 0; i < NUM_HW_PAGES; i ++ )
+ for( int i = 0; i < NUM_HW_PAGES; i ++ )
{
// Check if addr used
if( gaPageTable[ (HW_MAP_ADDR >> 12) + i ] & 1 )
MM_RefPhys( PAddr + (j<<12) );
gaPageTable[ (HW_MAP_ADDR >> 12) + i + j ] = (PAddr + (j<<12)) | 3;
}
- return HW_MAP_ADDR + (i<<12);
+ return (void*)(HW_MAP_ADDR + (i<<12));
}
}
// If we don't find any, return NULL
* \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;
- tVAddr ret;
+ void *ret;
ENTER("iPages iMaxBits pPhysAddr", Pages, MaxBits, PhysAddr);
MaxBits = PHYS_BITS;
// Sanity Check
- if(MaxBits < 12 || !PhysAddr) {
+ if(MaxBits < 12) {
LEAVE('i', 0);
return 0;
}
if(Pages == 1 && MaxBits >= PHYS_BITS)
{
phys = MM_AllocPhys();
+ if( PhysAddr )
+ *PhysAddr = phys;
if( !phys ) {
- *PhysAddr = 0;
LEAVE_RET('i', 0);
}
- *PhysAddr = phys;
ret = MM_MapHWPages(phys, 1);
if(ret == 0) {
MM_DerefPhys(phys);
return 0;
}
LEAVE('x', ret);
- return ret;
+ return (void*)ret;
}
// Slow Allocate
return 0;
}
- *PhysAddr = phys;
+ if( PhysAddr )
+ *PhysAddr = phys;
LEAVE('x', ret);
- return ret;
+ return (void*)ret;
}
/**
int i, j;
//Log_Debug("VirtMem", "MM_UnmapHWPages: (VAddr=0x%08x, Number=%i)", VAddr, Number);
-
+
+ //
+ if( KERNEL_BASE <= VAddr && VAddr < KERNEL_BASE + 1024*1024 )
+ return ;
+
// Sanity Check
if(VAddr < HW_MAP_ADDR || VAddr+Number*0x1000 > HW_MAP_MAX) return;