Cleanups

3 files changed, 1 insertions, 34 deletions

diff --git a/src/dma.c b/src/dma.c
index e3c2af7..27325bd 100644
--- a/src/dma.c
+++ b/src/dma.c
@@ -357,7 +357,6 @@ void S9xDoDMA(uint8 Channel)
                Work = *(base + p);

                REGISTER_2104(Work);

                p += inc;

-               CHECK_SOUND();

             }

             while (--count > 0);

             break;

@@ -370,7 +369,6 @@ void S9xDoDMA(uint8 Channel)
                   Work = *(base + p);

                   REGISTER_2118_linear(Work);

                   p += inc;

-                  CHECK_SOUND();

                }

                while (--count > 0);

             }

@@ -381,7 +379,6 @@ void S9xDoDMA(uint8 Channel)
                   Work = *(base + p);

                   REGISTER_2118_tile(Work);

                   p += inc;

-                  CHECK_SOUND();

                }

                while (--count > 0);

             }

@@ -395,7 +392,6 @@ void S9xDoDMA(uint8 Channel)
                   Work = *(base + p);

                   REGISTER_2119_linear(Work);

                   p += inc;

-                  CHECK_SOUND();

                }

                while (--count > 0);

             }

@@ -406,7 +402,6 @@ void S9xDoDMA(uint8 Channel)
                   Work = *(base + p);

                   REGISTER_2119_tile(Work);

                   p += inc;

-                  CHECK_SOUND();

                }

                while (--count > 0);

             }

@@ -417,7 +412,6 @@ void S9xDoDMA(uint8 Channel)
                Work = *(base + p);

                REGISTER_2122(Work);

                p += inc;

-               CHECK_SOUND();

             }

             while (--count > 0);

             break;

@@ -427,7 +421,6 @@ void S9xDoDMA(uint8 Channel)
                Work = *(base + p);

                REGISTER_2180(Work);

                p += inc;

-               CHECK_SOUND();

             }

             while (--count > 0);

             break;

@@ -437,7 +430,6 @@ void S9xDoDMA(uint8 Channel)
                Work = *(base + p);

                S9xSetPPU(Work, 0x2100 + d->BAddress);

                p += inc;

-               CHECK_SOUND();

             }

             while (--count > 0);

             break;

@@ -460,7 +452,6 @@ void S9xDoDMA(uint8 Channel)
                   Work = *(base + p);

                   REGISTER_2119_linear(Work);

                   p += inc;

-                  CHECK_SOUND();

                   count -= 2;

                }

                if (count == 1)

@@ -481,7 +472,6 @@ void S9xDoDMA(uint8 Channel)
                   Work = *(base + p);

                   REGISTER_2119_tile(Work);

                   p += inc;

-                  CHECK_SOUND();

                   count -= 2;

                }

                if (count == 1)

@@ -504,7 +494,6 @@ void S9xDoDMA(uint8 Channel)
                Work = *(base + p);

                S9xSetPPU(Work, 0x2101 + d->BAddress);

                p += inc;

-               CHECK_SOUND();

                count -= 2;

             }

             if (count == 1)

@@ -540,7 +529,6 @@ void S9xDoDMA(uint8 Channel)
             Work = *(base + p);

             S9xSetPPU(Work, 0x2101 + d->BAddress);

             p += inc;

-            CHECK_SOUND();

             count -= 4;

          }

          while (count > 0);

@@ -570,7 +558,6 @@ void S9xDoDMA(uint8 Channel)
             Work = *(base + p);

             S9xSetPPU(Work, 0x2103 + d->BAddress);

             p += inc;

-            CHECK_SOUND();

             count -= 4;

          }

          while (count > 0);

@@ -670,7 +657,6 @@ void S9xDoDMA(uint8 Channel)
             count = 0;

             break;

          }

-         CHECK_SOUND();

       }

       while (count);

    }

diff --git a/src/gfx.c b/src/gfx.c
index 156f0c2..f9d8df5 100644
--- a/src/gfx.c
+++ b/src/gfx.c
@@ -809,8 +809,6 @@ void DrawOBJS(bool8_32 OnMain, uint8 D)
    uint32 O;
    uint32 BaseTile, Tile;
 
-   CHECK_SOUND();
-
    BG.BitShift = 4;
    BG.TileShift = 5;
    BG.TileAddress = PPU.OBJNameBase;
@@ -957,8 +955,6 @@ void DrawOBJS(bool8_32 OnMain, uint8 D)
 
 void DrawBackgroundMosaic(uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2)
 {
-   CHECK_SOUND();
-
    uint32 Tile;
    uint16* SC0;
    uint16* SC1;
@@ -1183,8 +1179,6 @@ void DrawBackgroundMosaic(uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2)
 
 void DrawBackgroundOffset(uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2)
 {
-   CHECK_SOUND();
-
    uint32 Tile;
    uint16* SC0;
    uint16* SC1;
@@ -1459,8 +1453,6 @@ void DrawBackgroundOffset(uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2)
 
 void DrawBackgroundMode5(uint32 BGMODE, uint32 bg, uint8 Z1, uint8 Z2)
 {
-   CHECK_SOUND();
-
    uint8 depths [2] = {Z1, Z2};
 
    uint32 Tile;
@@ -2111,7 +2103,6 @@ static inline void DrawBackground(uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2)
       DrawBackgroundMode5(BGMode, bg, Z1, Z2);
       return;
    }
-   CHECK_SOUND();
 
    if (BGMode == 0)
       BG.StartPalette = bg << 5;
@@ -2126,8 +2117,6 @@ static inline void DrawBackground(uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2)
 }
 
 #define RENDER_BACKGROUND_MODE7(FUNC) \
-    CHECK_SOUND(); \
-\
     uint8 *VRAM1 = Memory.VRAM + 1; \
     if (GFX.r2130 & 1) \
     { \
@@ -2263,8 +2252,6 @@ static inline void DrawBackground(uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2)
     }
 
 #define RENDER_BACKGROUND_MODE7ADDSUB(DEPTH, FUNC) \
-    CHECK_SOUND(); \
-\
     uint8 *VRAM1 = Memory.VRAM + 1; \
     if (GFX.r2130 & 1) \
     { \
@@ -2405,8 +2392,6 @@ static inline void DrawBackground(uint32 BGMode, uint32 bg, uint8 Z1, uint8 Z2)
     }
 
 #define RENDER_BACKGROUND_MODE7PRIO(FUNC) \
-    CHECK_SOUND(); \
-\
     uint8 *VRAM1 = Memory.VRAM + 1; \
     if (GFX.r2130 & 1) \
     { \
diff --git a/src/port.h b/src/port.h
index 6f2180c..0f12e7a 100644
--- a/src/port.h
+++ b/src/port.h
@@ -53,10 +53,7 @@ I can't take it anymore, it's too convoluted.  So I've commented out the entire
    with a single define-block for each target platform.
 */
 
-//Title
-#define TITLE "Snes9x"
-
-//Required Includes
+/* Required Includes */
 #include "pixform.h"
 #include <stdint.h>
 #include <limits.h>
@@ -117,7 +114,6 @@ typedef short        int16_32;
 #define STATIC static
 #define FASTCALL
 #define PIXEL_FORMAT RGB565
-#define CHECK_SOUND()
 #define CPU_SHUTDOWN
 #define ZeroMemory(a,b) memset((a),0,(b))
 #define PACKING __attribute__ ((packed))