X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Farch%2Farmv7%2Fmm_virt.c;h=b6d022df7aca17480653d9e84deb7167b2dde41e;hb=6a6f4fdb0cce6558bac6b30ce312555bb48a2c0a;hp=0fc426d4842ca12b28cdb67a66c6423dfad1db5b;hpb=f9c581641afeb556188e84428febd4011e61edc2;p=tpg%2Facess2.git

diff --git a/Kernel/arch/armv7/mm_virt.c b/Kernel/arch/armv7/mm_virt.c
index 0fc426d4..b6d022df 100644
--- a/Kernel/arch/armv7/mm_virt.c
+++ b/Kernel/arch/armv7/mm_virt.c
@@ -195,8 +195,6 @@ int MM_int_SetPageInfo(tVAddr VAddr, tMM_PageInfo *pi)
 	return 1;
 }
 
-extern tShortSpinlock	glDebug_Lock;
-
 int MM_int_GetPageInfo(tVAddr VAddr, tMM_PageInfo *pi)
 {
 	Uint32	*table0, *table1;
@@ -383,13 +381,73 @@ tPAddr MM_ClearUser(void)
 
 tVAddr MM_MapTemp(tPAddr PAddr)
 {
-	// TODO: Implement MapTemp
+	tVAddr	ret;
+	tMM_PageInfo	pi;
+	
+	for( ret = MM_TMPMAP_BASE; ret < MM_TMPMAP_END - PAGE_SIZE; ret += PAGE_SIZE )
+	{
+		if( MM_int_GetPageInfo(ret, &pi) == 0 )
+			continue;
+	
+		MM_Map(ret, PAddr);
+		
+		return ret;
+	}
+	Log_Warning("MMVirt", "MM_MapTemp: All slots taken");
 	return 0;
 }
 
 void MM_FreeTemp(tVAddr VAddr)
 {
 	// TODO: Implement FreeTemp
+	if( VAddr < MM_TMPMAP_BASE || VAddr >= MM_TMPMAP_END ) {
+		Log_Warning("MMVirt", "MM_FreeTemp: Passed an addr not from MM_MapTemp (%p)", VAddr);
+		return ;
+	}
+	
+	MM_Deallocate(VAddr);
+}
+
+tVAddr MM_MapHWPages(tPAddr PAddr, Uint NPages)
+{
+	tVAddr	ret;
+	 int	i;
+	tMM_PageInfo	pi;
+
+	// Scan for a location
+	for( ret = MM_HWMAP_BASE; ret < MM_HWMAP_END - NPages * PAGE_SIZE; ret += PAGE_SIZE )
+	{
+		// Check if there is `NPages` free pages
+		for( i = 0; i < NPages; i ++ )
+		{
+			if( MM_int_GetPageInfo(ret + i*PAGE_SIZE, &pi) == 0 )
+				break;
+		}
+		// Nope, jump to after the used page found and try again
+		if( i != NPages ) {
+			ret += i * PAGE_SIZE;
+			continue ;
+		}
+	
+		// Map the pages	
+		for( i = 0; i < NPages; i ++ )
+			MM_Map(ret+i*PAGE_SIZE, PAddr+i*PAddr);
+		// and return
+		return ret;
+	}
+	Log_Warning("MMVirt", "MM_MapHWPages: No space for a %i page block", NPages);
+	return 0;
+}
+
+tVAddr MM_AllocDMA(int Pages, int MaxBits, tPAddr *PAddr)
+{
+	Log_Error("MMVirt", "TODO: Implement MM_AllocDMA");
+	return 0;
+}
+
+void MM_UnmapHWPages(tVAddr Vaddr, Uint Number)
+{
+	Log_Error("MMVirt", "TODO: Implement MM_UnmapHWPages");
 }
 
 tVAddr MM_NewKStack(int bShared)
@@ -421,7 +479,8 @@ tVAddr MM_NewKStack(int bShared)
 	// 1 guard page
 	for( ofs = PAGE_SIZE; ofs < MM_KSTACK_SIZE; ofs += PAGE_SIZE )
 	{
-		if( MM_Allocate(addr + ofs) == 0 ) {
+		if( MM_Allocate(addr + ofs) == 0 )
+		{
 			while(ofs)
 			{
 				ofs -= PAGE_SIZE;