From a9eb20c05d5f2b0bf4877852ffb61dd276442819 Mon Sep 17 00:00:00 2001
From: wntrmute <wntrmute@258c5a1a-4f63-435d-9564-e8f6d34ab52c>
Date: Tue, 11 Jan 2011 12:11:09 +0000
Subject: [PATCH] revert cache bypass

git-svn-id: https://devkitpro.svn.sourceforge.net/svnroot/devkitpro/trunk/libfat@4490 258c5a1a-4f63-435d-9564-e8f6d34ab52c
---
 source/cache.c | 45 +--------------------------------------------
 1 file changed, 1 insertion(+), 44 deletions(-)

diff --git a/source/cache.c b/source/cache.c
index 2b12b70..164d340 100644
--- a/source/cache.c
+++ b/source/cache.c
@@ -264,34 +264,6 @@ bool _FAT_cache_eraseWritePartialSector (CACHE* cache, const void* buffer, sec_t
 	return true;
 }
 
-#ifndef GEKKO
-static CACHE_ENTRY* _FAT_cache_findPage(CACHE *cache, sec_t sector, sec_t count) {
-
-	unsigned int i;
-	CACHE_ENTRY* cacheEntries = cache->cacheEntries;
-	unsigned int numberOfPages = cache->numberOfPages;
-	CACHE_ENTRY *entry = NULL;
-	sec_t	lowest = UINT_MAX;
-
-	for(i=0;i<numberOfPages;i++) {
-		if (cacheEntries[i].sector != CACHE_FREE) {
-			bool intersect;
-			if (sector > cacheEntries[i].sector) {
-				intersect = sector - cacheEntries[i].sector < cacheEntries[i].count;
-			} else {
-				intersect = cacheEntries[i].sector - sector < count;
-			}
-
-			if ( intersect && (cacheEntries[i].sector < lowest)) {
-				lowest = cacheEntries[i].sector;
-				entry = &cacheEntries[i];
-			}
-		}
-	}
-
-	return entry;
-}
-#endif
 
 bool _FAT_cache_writeSectors (CACHE* cache, sec_t sector, sec_t numSectors, const void* buffer) 
 {
@@ -302,24 +274,9 @@ bool _FAT_cache_writeSectors (CACHE* cache, sec_t sector, sec_t numSectors, cons
 
 	while(numSectors>0)
 	{
-#ifdef GEKKO
 		entry = _FAT_cache_getPage(cache,sector);
 		if(entry==NULL) return false;
-#else
-		entry = _FAT_cache_findPage(cache,sector,numSectors);
-
-		if(entry==NULL)
-			return _FAT_disc_writeSectors(cache->disc,sector,numSectors,src);
-
-		if ( entry->sector > sector) {
-			secs_to_write = entry->sector - sector;
-				
-			_FAT_disc_writeSectors(cache->disc,sector,secs_to_write,src);
-			src += (secs_to_write*BYTES_PER_READ);
-			sector += secs_to_write;
-			numSectors -= secs_to_write;
-		}
-#endif
+
 		sec = sector - entry->sector;
 		secs_to_write = entry->count - sec;
 		if(secs_to_write>numSectors) secs_to_write = numSectors;
-- 
2.11.4.GIT