[Desmume-cvs] SF.net SVN: desmume:[3554] trunk/desmume/src/MMU.cpp

[<lu...@us...>]

Revision: 3554
          http://desmume.svn.sourceforge.net/desmume/?rev=3554&view=rev
Author:   luigi__
Date:     2010-04-20 19:52:04 +0000 (Tue, 20 Apr 2010)

Log Message:
-----------
MMU: wifi registers/RAM are only in range 04800000-0480FFFF, not 04800000-04FFFFFF.

Modified Paths:
--------------
    trunk/desmume/src/MMU.cpp

Modified: trunk/desmume/src/MMU.cpp
===================================================================
--- trunk/desmume/src/MMU.cpp	2010-04-20 19:33:41 UTC (rev 3553)
+++ trunk/desmume/src/MMU.cpp	2010-04-20 19:52:04 UTC (rev 3554)
@@ -3642,7 +3642,7 @@
 		return;
     }
 
-	if ((adr & 0xFF800000) == 0x04800000)
+	if ((adr & 0xFFFF0000) == 0x04800000)
 	{
 		/* is wifi hardware, dont intermix with regular hardware registers */
 		// 8-bit writes to wifi I/O and RAM are ignored
@@ -3721,7 +3721,7 @@
 	}
 
 	//wifi mac access
-	if ((adr>=0x04800000)&&(adr<0x05000000))
+	if ((adr & 0xFFFF0000) == 0x04800000)
 	{
 		WIFI_write16(adr,val);
 		T1WriteWord(MMU.MMU_MEM[ARMCPU_ARM7][0x48], adr&MMU.MMU_MASK[ARMCPU_ARM7][0x48], val);
@@ -4026,10 +4026,8 @@
 		return;
 	}
 
-	if ((adr & 0xFF800000) == 0x04800000) 
+	if ((adr & 0xFFFF0000) == 0x04800000)
 	{
-		// access to non regular hw registers
-		// return to not overwrite valid data
 		WIFI_write16(adr, val & 0xFFFF);
 		WIFI_write16(adr+2, val >> 16);
 		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM7][0x48], adr&MMU.MMU_MASK[ARMCPU_ARM7][0x48], val);
@@ -4125,7 +4123,7 @@
 	}
 
 	// wifi mac access 
-	if ((adr>=0x04800000)&&(adr<0x05000000))
+	if ((adr & 0xFFFF0000) == 0x04800000)
 	{
 		if (adr & 1)
 			return (WIFI_read16(adr-1) >> 8) & 0xFF;
@@ -4174,7 +4172,7 @@
 	}
 
 	//wifi mac access
-	if ((adr>=0x04800000)&&(adr<0x05000000))
+	if ((adr & 0xFFFF0000) == 0x04800000)
 		return WIFI_read16(adr) ;
 
 	if ( (adr >= 0x08000000) && (adr < 0x0A010000) )
@@ -4267,7 +4265,7 @@
 	}
 
 	//wifi mac access
-	if ((adr>=0x04800000)&&(adr<0x05000000))
+	if ((adr & 0xFFFF0000) == 0x04800000)
 		return (WIFI_read16(adr) | (WIFI_read16(adr+2) << 16));
 
 	if ( (adr >= 0x08000000) && (adr < 0x0A010000) )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.