From fb5ad7bbb34ca1246deb2481aed665aee31d2ce9 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Thu, 5 Nov 2015 16:05:33 +0100
Subject: Cleanups

---
 src/apumem.h     | 174 ++++++++++++++++++++++++++++---------------------------
 src/ppu_getppu.h | 124 +++++++++++++++++++--------------------
 src/ppu_setppu.h |   2 -
 3 files changed, 149 insertions(+), 151 deletions(-)

(limited to 'src')

diff --git a/src/apumem.h b/src/apumem.h
index 5288941..2abe3d9 100644
--- a/src/apumem.h
+++ b/src/apumem.h
@@ -49,103 +49,107 @@ END_EXTERN_C
 
 INLINE uint8 S9xAPUGetByteZ (uint8 Address)
 {
-    if (Address >= 0xf0 && IAPU.DirectPage == IAPU.RAM)
-    {
-	if (Address >= 0xfd) {
-	    uint8 t = IAPU.RAM [Address];
-	    IAPU.RAM [Address] = 0;
-	    return (t);
-	} else if (Address == 0xf3) return (S9xGetAPUDSP ());
+   if (Address >= 0xf0 && IAPU.DirectPage == IAPU.RAM)
+   {
+      if (Address >= 0xfd)
+      {
+         uint8 t = IAPU.RAM [Address];
+         IAPU.RAM [Address] = 0;
+         return (t);
+      }
+      else if (Address == 0xf3)
+         return (S9xGetAPUDSP ());
 
-	return (IAPU.RAM [Address]);
-    }
-    else
-	return (IAPU.DirectPage [Address]);
+      return (IAPU.RAM [Address]);
+   }
+   return (IAPU.DirectPage [Address]);
 }
 
 INLINE void S9xAPUSetByteZ (uint8 val, uint8 Address)
 {
-    if (Address >= 0xf0 && IAPU.DirectPage == IAPU.RAM)
-    {
-	if (Address == 0xf3)
-	    S9xSetAPUDSP (val);
-	else
-	if (Address >= 0xf4 && Address <= 0xf7)
-	    APU.OutPorts [Address - 0xf4] = val;
-	else
-	if (Address == 0xf1)
-	    S9xSetAPUControl (val);
-	else
-	if (Address < 0xfd)
-	{
-	    IAPU.RAM [Address] = val;
-	    if (Address >= 0xfa)
-	    {
-		if (val == 0)
-		    APU.TimerTarget [Address - 0xfa] = 0x100;
-		else
-		    APU.TimerTarget [Address - 0xfa] = val;
-	    }
-	}
-    }
-    else
-	IAPU.DirectPage [Address] = val;
+   if (Address >= 0xf0 && IAPU.DirectPage == IAPU.RAM)
+   {
+      if (Address == 0xf3)
+         S9xSetAPUDSP (val);
+      else
+         if (Address >= 0xf4 && Address <= 0xf7)
+            APU.OutPorts [Address - 0xf4] = val;
+         else
+            if (Address == 0xf1)
+               S9xSetAPUControl (val);
+            else
+               if (Address < 0xfd)
+               {
+                  IAPU.RAM [Address] = val;
+                  if (Address >= 0xfa)
+                  {
+                     if (val == 0)
+                        APU.TimerTarget [Address - 0xfa] = 0x100;
+                     else
+                        APU.TimerTarget [Address - 0xfa] = val;
+                  }
+               }
+   }
+   else
+      IAPU.DirectPage [Address] = val;
 }
 
 INLINE uint8 S9xAPUGetByte (uint32 Address)
 {
-    Address &= 0xffff;
-    
-    if (Address <= 0xff && Address >= 0xf3)
-    {
-	if (Address == 0xf3) return (S9xGetAPUDSP ());
-	if (Address >= 0xfd) {
-	    uint8 t = IAPU.RAM [Address];
-	    IAPU.RAM [Address] = 0;
-	    return (t);
-	}
-	return (IAPU.RAM [Address]);
-    }
-    return (IAPU.RAM [Address]);
+   Address &= 0xffff;
+
+   if (Address <= 0xff && Address >= 0xf3)
+   {
+      if (Address == 0xf3)
+         return (S9xGetAPUDSP ());
+      if (Address >= 0xfd)
+      {
+         uint8 t = IAPU.RAM [Address];
+         IAPU.RAM [Address] = 0;
+         return (t);
+      }
+      return (IAPU.RAM [Address]);
+   }
+   return (IAPU.RAM [Address]);
 }
 
 INLINE void S9xAPUSetByte (uint8 val, uint32 Address)
 {
-    Address &= 0xffff;
-    
-    if (Address <= 0xff && Address >= 0xf0)
-    {
-	if (Address == 0xf3)
-	    S9xSetAPUDSP (val);
-	else
-	if (Address >= 0xf4 && Address <= 0xf7)
-	    APU.OutPorts [Address - 0xf4] = val;
-	else
-	if (Address == 0xf1)
-	    S9xSetAPUControl (val);
-	else
-	if (Address < 0xfd)
-	{
-	    IAPU.RAM [Address] = val;
-	    if (Address >= 0xfa)
-	    {
-		if (val == 0)
-		    APU.TimerTarget [Address - 0xfa] = 0x100;
-		else
-		    APU.TimerTarget [Address - 0xfa] = val;
-	    }
-	}
-    }
-    else
-    {
-	if (Address < 0xffc0)
-	    IAPU.RAM [Address] = val;
-	else
-	{
-	    APU.ExtraRAM [Address - 0xffc0] = val;
-	    if (!APU.ShowROM)
-		IAPU.RAM [Address] = val;
-	}
-    }
+   Address &= 0xffff;
+
+   if (Address <= 0xff && Address >= 0xf0)
+   {
+      if (Address == 0xf3)
+         S9xSetAPUDSP (val);
+      else
+         if (Address >= 0xf4 && Address <= 0xf7)
+            APU.OutPorts [Address - 0xf4] = val;
+         else
+            if (Address == 0xf1)
+               S9xSetAPUControl (val);
+            else
+               if (Address < 0xfd)
+               {
+                  IAPU.RAM [Address] = val;
+                  if (Address >= 0xfa)
+                  {
+                     if (val == 0)
+                        APU.TimerTarget [Address - 0xfa] = 0x100;
+                     else
+                        APU.TimerTarget [Address - 0xfa] = val;
+                  }
+               }
+   }
+   else
+   {
+      if (Address < 0xffc0)
+         IAPU.RAM [Address] = val;
+      else
+      {
+         APU.ExtraRAM [Address - 0xffc0] = val;
+         if (!APU.ShowROM)
+            IAPU.RAM [Address] = val;
+      }
+   }
 }
 #endif
diff --git a/src/ppu_getppu.h b/src/ppu_getppu.h
index eb4eb62..1fd14ce 100644
--- a/src/ppu_getppu.h
+++ b/src/ppu_getppu.h
@@ -282,8 +282,7 @@ static uint8 GetPPU_APUR (uint16 Address)
 		{
 			if (r & 4)
 				return ((Address & 3) == 1 ? 0xaa : 0xbb);
-			else
-				return ((r >> 3) & 0xff);
+         return ((r >> 3) & 0xff);
 		}
 	}
 	else
@@ -342,66 +341,63 @@ uint8 (*GetPPU[])(uint16 Address) = {
 
 uint8 S9xGetPPU (uint16 Address)
 {
-	uint8 byte = 0;
-	if(Address<0x2100)//not a real PPU reg
-		return 0; //treat as unmapped memory returning last byte on the bus
-    if (Address <= 0x2190){
-		return GetPPU[Address - 0x2100](Address);
-    } else
-	{
-	#ifdef USE_SA1
-		if (Settings.SA1)
-			return (S9xGetSA1(Address));
-	#endif
-		if (Address <= 0x2fff || Address >= 0x3000 + 768)
-		{
-			switch (Address)
-			{
-				case 0x21c2 :
-					return (0x20);
-				case 0x21c3 :
-					return (0);
-				case 0x2800 :
-					// For Dai Kaijyu Monogatari II
-					if (Settings.SRTC)
-						return (S9xGetSRTC(Address));
-					/*FALL*/
-	
-				default :
-	#ifdef DEBUGGER
-					missing.unknownppu_read = Address;
-					if (Settings.TraceUnknownRegisters)
-					{
-						sprintf(String, "Unknown register read: $%04X\n", Address);
-						S9xMessage(S9X_TRACE, S9X_PPU_TRACE, String);
-					}
-	#endif
-					// XXX:
-					return (0); //Memory.FillRAM[Address]);
-			}
-		}
-	
-		if (!Settings.SuperFX)
-			return (0x30);
-			byte = Memory.FillRAM[Address];
-	
-		//if (Address != 0x3030 && Address != 0x3031)
-		//printf ("%04x\n", Address);
-	#ifdef CPU_SHUTDOWN
-		if (Address == 0x3030)
-		{
-			CPU.WaitAddress = CPU.PCAtOpcodeStart;
-			#ifdef ASMCPU
-			CPU.rstatus |= (1<<(24-3));
-			#endif
-		}
-		else
-	#endif
-		if (Address == 0x3031)
-		{
-			CLEAR_IRQ_SOURCE(GSU_IRQ_SOURCE);
-			Memory.FillRAM[0x3031] = byte & 0x7f;
-		}
-		return (byte);
-	}
+   uint8 byte = 0;
+   if(Address<0x2100)//not a real PPU reg
+      return 0; //treat as unmapped memory returning last byte on the bus
+   if (Address <= 0x2190)
+      return GetPPU[Address - 0x2100](Address);
+#ifdef USE_SA1
+   if (Settings.SA1)
+      return (S9xGetSA1(Address));
+#endif
+   if (Address <= 0x2fff || Address >= 0x3000 + 768)
+   {
+      switch (Address)
+      {
+         case 0x21c2 :
+            return (0x20);
+         case 0x21c3 :
+            return (0);
+         case 0x2800 :
+            // For Dai Kaijyu Monogatari II
+            if (Settings.SRTC)
+               return (S9xGetSRTC(Address));
+            /*FALL*/
+
+         default :
+#ifdef DEBUGGER
+            missing.unknownppu_read = Address;
+            if (Settings.TraceUnknownRegisters)
+            {
+               sprintf(String, "Unknown register read: $%04X\n", Address);
+               S9xMessage(S9X_TRACE, S9X_PPU_TRACE, String);
+            }
+#endif
+            // XXX:
+            return (0); //Memory.FillRAM[Address]);
+      }
+   }
+
+   if (!Settings.SuperFX)
+      return (0x30);
+   byte = Memory.FillRAM[Address];
+
+   //if (Address != 0x3030 && Address != 0x3031)
+   //printf ("%04x\n", Address);
+#ifdef CPU_SHUTDOWN
+   if (Address == 0x3030)
+   {
+      CPU.WaitAddress = CPU.PCAtOpcodeStart;
+#ifdef ASMCPU
+      CPU.rstatus |= (1<<(24-3));
+#endif
+   }
+   else
+#endif
+      if (Address == 0x3031)
+      {
+         CLEAR_IRQ_SOURCE(GSU_IRQ_SOURCE);
+         Memory.FillRAM[0x3031] = byte & 0x7f;
+      }
+   return (byte);
 }
diff --git a/src/ppu_setppu.h b/src/ppu_setppu.h
index 160f209..0b9ed86 100644
--- a/src/ppu_setppu.h
+++ b/src/ppu_setppu.h
@@ -1534,9 +1534,7 @@ void S9xSetPPU (uint8 Byte, uint16 Address)
 						default :
 							Memory.FillRAM[Address] = Byte;
 							if (Address >= 0x3100)
-							{
 								FxCacheWriteAccess(Address);
-							}
 							break;
 					}
 					return;
-- 
cgit v1.2.3