X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Kernel%2Fdrv%2Fiocache.c;h=774c497429dd0d8058df556491695b9e7a5507f4;hb=7e5607004c3221d55c7992148b2f0d958cf28533;hp=743dabc49e78c73e0d1633cc27f5930733da0e65;hpb=7d881c2e5fef91a6570e46ef69a5d4a5cf0e8b4d;p=tpg%2Facess2.git

diff --git a/Kernel/drv/iocache.c b/Kernel/drv/iocache.c
index 743dabc4..774c4974 100644
--- a/Kernel/drv/iocache.c
+++ b/Kernel/drv/iocache.c
@@ -3,6 +3,8 @@
  * - IO Cache
  * 
  * By thePowersGang (John Hodge)
+ * 
+ * TODO: Convert to use spare physical pages instead
  */
 #define DEBUG	0
 #include <acess.h>
@@ -10,6 +12,7 @@
 
 // === TYPES ===
 typedef struct sIOCache_Ent	tIOCache_Ent;
+typedef struct sIOCache_PageInfo	tIOCache_PageInfo;
 
 // === STRUCTURES ===
 struct sIOCache_Ent
@@ -21,6 +24,15 @@ struct sIOCache_Ent
 	Uint8	Data[];
 };
 
+struct sIOCache_PageInfo
+{
+	tIOCache_PageInfo	*GlobalNext;
+	tIOCache_PageInfo	*CacheNext;
+	tIOCache	*Owner;
+	tPAddr	BasePhys;
+	Uint64	BaseOffset;
+};
+
 struct sIOCache
 {
 	tIOCache	*Next;
@@ -38,6 +50,7 @@ struct sIOCache
 tShortSpinlock	glIOCache_Caches;
 tIOCache	*gIOCache_Caches = NULL;
  int	giIOCache_NumCaches = 0;
+tIOCache_PageInfo	*gIOCache_GlobalPages;
 
 // === CODE ===
 /**
@@ -46,7 +59,7 @@ tIOCache	*gIOCache_Caches = NULL;
  */
 tIOCache *IOCache_Create( tIOCache_WriteCallback Write, Uint32 ID, int SectorSize, int CacheSize )
 {
-	tIOCache	*ret = malloc( sizeof(tIOCache) );
+	tIOCache	*ret = calloc( 1, sizeof(tIOCache) );
 	
 	// Sanity Check
 	if(!ret)	return NULL;
@@ -57,8 +70,6 @@ tIOCache *IOCache_Create( tIOCache_WriteCallback Write, Uint32 ID, int SectorSiz
 	ret->ID = ID;
 	ret->Write = Write;
 	ret->CacheSize = CacheSize;
-	ret->CacheUsed = 0;
-	ret->Entries = 0;
 	
 	// Append to list
 	SHORTLOCK( &glIOCache_Caches );
@@ -179,6 +190,10 @@ int IOCache_Add( tIOCache *Cache, Uint64 Sector, void *Buffer )
 				oldestPrev = prev;
 			}
 		}
+		if( !oldest ) {
+			Log_Error("IOCache", "Cache full, but also empty");
+			return -1;
+		}
 		// Remove from list, write back and free
 		oldestPrev->Next = oldest->Next;
 		if(oldest->LastWrite && Cache->Mode != IOCACHE_VIRTUAL)
@@ -307,14 +322,14 @@ void IOCache_Destroy( tIOCache *Cache )
 	// Remove from list
 	SHORTLOCK( &glIOCache_Caches );
 	{
-		tIOCache	*ent;
-		tIOCache	*prev = (tIOCache*)&gIOCache_Caches;
-		for(ent = gIOCache_Caches;
-			ent;
-			prev = ent, ent = ent->Next )
+		tIOCache	*cache;
+		tIOCache	*prev_cache = (tIOCache*)&gIOCache_Caches;
+		for(cache = gIOCache_Caches;
+			cache;
+			prev_cache = cache, cache = cache->Next )
 		{
-			if(ent == Cache) {
-				prev->Next = ent->Next;
+			if(cache == Cache) {
+				prev_cache->Next = cache->Next;
 				break;
 			}
 		}