- Add an extra check.

- Synchronize FAT cache changes.
emukidid · Mar 20, 2024 · 40fa265 · 40fa265
1 parent 34a0ce9
commit 40fa265
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/cube/swiss/source/devices/ff_cache.c b/cube/swiss/source/devices/ff_cache.c
@@ -215,7 +215,7 @@ bool _FAT_cache_readSectors(CACHE *cache,sec_t sector,sec_t numSectors,void *buf
 	uint8_t *dest = (uint8_t *)buffer;
 
 	while(numSectors>0) {
-		if(((uintptr_t)dest%32)==0 && (sector%cache->sectorsPerPage)==0) {
+		if(SYS_IsDMAAddress(dest) && (sector%cache->sectorsPerPage)==0) {
 			entry = _FAT_cache_findPage(cache,sector,numSectors);
 			if(entry==NULL) {
 				secs_to_read = (numSectors/cache->sectorsPerPage)*cache->sectorsPerPage;
@@ -347,7 +347,7 @@ bool _FAT_cache_writeSectors (CACHE* cache, sec_t sector, sec_t numSectors, cons
 	const uint8_t *src = (const uint8_t *)buffer;
 
 	while(numSectors>0) {
-		if(((uintptr_t)src%32)==0 && (sector%cache->sectorsPerPage)==0) {
+		if(SYS_IsDMAAddress(src) && (sector%cache->sectorsPerPage)==0) {
 			entry = _FAT_cache_findPage(cache,sector,numSectors);
 			if(entry==NULL) {
 				secs_to_write = (numSectors/cache->sectorsPerPage)*cache->sectorsPerPage;

diff --git a/cube/swiss/source/devices/gcloader/deviceHandler-gcloader.c b/cube/swiss/source/devices/gcloader/deviceHandler-gcloader.c
@@ -316,8 +316,9 @@ bool deviceHandler_GCLoader_test() {
 			__device_gcloader.hwName = "GC Loader compatible";
 
 			if (DVD_PrepareStreamAbs(&commandBlock, 32*1024, 0) == DVD_ERROR_OK &&
-				DVD_GetStreamErrorStatus(&commandBlock) == TRUE &&
-				DVD_CancelStream(&commandBlock) == DVD_ERROR_OK)
+				(u8)DVD_GetStreamErrorStatus(&commandBlock) == TRUE &&
+				DVD_CancelStream(&commandBlock) == DVD_ERROR_OK &&
+				(u8)DVD_GetStreamErrorStatus(&commandBlock) == FALSE)
 				__device_gcloader.features |=  FEAT_AUDIO_STREAMING;
 			else
 				__device_gcloader.features &= ~FEAT_AUDIO_STREAMING;