From b27c451831082179cc9bc3c1b3424ebb0f66dd74 Mon Sep 17 00:00:00 2001
From: twinaphex
Date: Mon, 15 Dec 2014 00:48:14 +0100
Subject: Remove ACCUMULATE_READ_JOYPAD

---
 source/cpuexec.c | 21 ---------------------
 source/display.h |  3 ---
 source/gfx.c     | 16 ----------------
 3 files changed, 40 deletions(-)

diff --git a/source/cpuexec.c b/source/cpuexec.c
index 7b9cdcd..9319255 100644
--- a/source/cpuexec.c
+++ b/source/cpuexec.c
@@ -103,10 +103,6 @@
 #include "sa1.h"
 #include "spc7110.h"
 
-#ifdef ACCUMULATE_JOYPAD
-#include "display.h"
-#endif
-
 extern void S9xProcessSound(unsigned int);
 
 void S9xMainLoop_SA1_SFX(void);
@@ -495,15 +491,6 @@ void S9xDoHBlankProcessing_SFX()
    switch (CPU.WhichEvent)
    {
    case HBLANK_START_EVENT:
-#ifdef ACCUMULATE_JOYPAD
-      /*
-       * This call allows NDSSFC to synchronise the DS controller more often.
-       * If porting a later version of Snes9x into NDSSFC, it is essential to
-       * preserve it.
-       */
-      if ((CPU.V_Counter & 0xF) == 0)
-         NDSSFCAccumulateJoypad();
-#endif
       if (IPPU.HDMA && CPU.V_Counter <= PPU.ScreenHeight)
          IPPU.HDMA = S9xDoHDMA(IPPU.HDMA);
 
@@ -688,14 +675,6 @@ void S9xDoHBlankProcessing_NoSFX()
    switch (CPU.WhichEvent)
    {
    case HBLANK_START_EVENT:
-#ifdef ACCUMULATE_JOYPAD
-      /*
-       * This call allows NDSSFC to synchronise the DS controller more often.
-       * If porting a later version of Snes9x into NDSSFC, it is essential to
-       * preserve it.
-       */
-      NDSSFCAccumulateJoypad();
-#endif
       if (IPPU.HDMA && CPU.V_Counter <= PPU.ScreenHeight)
          IPPU.HDMA = S9xDoHDMA(IPPU.HDMA);
 
diff --git a/source/display.h b/source/display.h
index 8ad5cea..abccc1a 100644
--- a/source/display.h
+++ b/source/display.h
@@ -94,9 +94,6 @@
 void S9xTextMode();
 void S9xGraphicsMode();
 char* S9xParseArgs(char** argv, int argc);
-#ifdef ACCUMULATE_JOYPAD
-void NDSSFCAccumulateJoypad();
-#endif
 uint32_t S9xReadJoypad(int port);
 bool S9xReadMousePosition(int which1_0_to_1, int* x, int* y, uint32_t* buttons);
 bool S9xReadSuperScopePosition(int* x, int* y, uint32_t* buttons);
diff --git a/source/gfx.c b/source/gfx.c
index 9ca3dc5..6c86ba5 100644
--- a/source/gfx.c
+++ b/source/gfx.c
@@ -1059,14 +1059,6 @@ void S9xSetupOBJ()
 
 static void DrawOBJS(bool OnMain, uint8_t D)
 {
-#ifdef ACCUMULATE_JOYPAD
-   /*
-    * This call allows NDSSFC to synchronise the DS controller more often.
-    * If porting a later version of Snes9x into NDSSFC, it is essential to
-    * preserve it.
-    */
-   NDSSFCAccumulateJoypad();
-#endif
 #ifdef MK_DEBUG_RTO
    if (Settings.BGLayering) fprintf(stderr, "Entering DrawOBJS() for %d-%d\n",
                                        GFX.StartY, GFX.EndY);
@@ -2209,14 +2201,6 @@ static void DrawBackgroundMode5(uint32_t bg, uint8_t Z1, uint8_t Z2)
 
 static void DrawBackground(uint32_t BGMode, uint32_t bg, uint8_t Z1, uint8_t Z2)
 {
-#ifdef ACCUMULATE_JOYPAD
-   /*
-    * This call allows NDSSFC to synchronise the DS controller more often.
-    * If porting a later version of Snes9x into NDSSFC, it is essential to
-    * preserve it.
-    */
-   NDSSFCAccumulateJoypad();
-#endif
    GFX.PixSize = 1;
 
    BG.TileSize = BGSizes [PPU.BG[bg].BGSize];
-- 
cgit v1.2.3