From c2e0540fecb7ce6ac11362cc77cf12aa60656516 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 8 Aug 2016 03:49:24 +0200 Subject: Remove obsolete define STORM --- source/cpuexec.c | 12 ------------ source/dma.c | 14 -------------- source/gfx.c | 11 ----------- source/port.h | 40 ---------------------------------------- 4 files changed, 77 deletions(-) diff --git a/source/cpuexec.c b/source/cpuexec.c index 9319255..468fbf5 100644 --- a/source/cpuexec.c +++ b/source/cpuexec.c @@ -155,8 +155,6 @@ void S9xMainLoop_SA1_SFX(void) } } - CHECK_SOUND(); - if (CPU.Flags & IRQ_PENDING_FLAG) { if (CPU.IRQCycleCount == 0) @@ -241,8 +239,6 @@ void S9xMainLoop_SA1_NoSFX(void) } } - CHECK_SOUND(); - if (CPU.Flags & IRQ_PENDING_FLAG) { if (CPU.IRQCycleCount == 0) @@ -318,8 +314,6 @@ void S9xMainLoop_NoSA1_SFX(void) } } - CHECK_SOUND(); - if (CPU.Flags & IRQ_PENDING_FLAG) { if (CPU.IRQCycleCount == 0) @@ -402,8 +396,6 @@ void S9xMainLoop_NoSA1_NoSFX(void) } } - CHECK_SOUND(); - if (CPU.Flags & IRQ_PENDING_FLAG) { if (CPU.IRQCycleCount == 0) @@ -500,10 +492,8 @@ void S9xDoHBlankProcessing_SFX() S9xSuperFXExec(); #ifndef USE_BLARGG_APU -#ifndef STORM if (Settings.SoundSync) S9xGenerateSound(); -#endif CPU.Cycles -= Settings.H_Max; if (IAPU.APUExecuting) @@ -683,10 +673,8 @@ void S9xDoHBlankProcessing_NoSFX() case HBLANK_END_EVENT: #ifndef USE_BLARGG_APU -#ifndef STORM if (Settings.SoundSync) S9xGenerateSound(); -#endif CPU.Cycles -= Settings.H_Max; if (IAPU.APUExecuting) diff --git a/source/dma.c b/source/dma.c index 9ba746c..01b2a85 100644 --- a/source/dma.c +++ b/source/dma.c @@ -398,7 +398,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2104(Work); p += inc; - CHECK_SOUND(); } while (--count > 0); break; @@ -413,7 +412,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2118_linear(Work); p += inc; - CHECK_SOUND(); } while (--count > 0); } @@ -424,7 +422,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2118_tile(Work); p += inc; - CHECK_SOUND(); } while (--count > 0); } @@ -440,7 +437,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2119_linear(Work); p += inc; - CHECK_SOUND(); } while (--count > 0); } @@ -451,7 +447,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2119_tile(Work); p += inc; - CHECK_SOUND(); } while (--count > 0); } @@ -462,7 +457,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2122(Work); p += inc; - CHECK_SOUND(); } while (--count > 0); break; @@ -472,7 +466,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2180(Work); p += inc; - CHECK_SOUND(); } while (--count > 0); break; @@ -482,7 +475,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); S9xSetPPU(Work, 0x2100 + d->BAddress); p += inc; - CHECK_SOUND(); } while (--count > 0); break; @@ -507,7 +499,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2119_linear(Work); p += inc; - CHECK_SOUND(); count -= 2; } if (count == 1) @@ -528,7 +519,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); REGISTER_2119_tile(Work); p += inc; - CHECK_SOUND(); count -= 2; } if (count == 1) @@ -551,7 +541,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); S9xSetPPU(Work, 0x2101 + d->BAddress); p += inc; - CHECK_SOUND(); count -= 2; } if (count == 1) @@ -587,7 +576,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); S9xSetPPU(Work, 0x2101 + d->BAddress); p += inc; - CHECK_SOUND(); count -= 4; } while (count > 0); @@ -617,7 +605,6 @@ void S9xDoDMA(uint8_t Channel) Work = *(base + p); S9xSetPPU(Work, 0x2103 + d->BAddress); p += inc; - CHECK_SOUND(); count -= 4; } while (count > 0); @@ -712,7 +699,6 @@ void S9xDoDMA(uint8_t Channel) count = 0; break; } - CHECK_SOUND(); } while (count); } diff --git a/source/gfx.c b/source/gfx.c index d55ae09..2bdedfa 100644 --- a/source/gfx.c +++ b/source/gfx.c @@ -1059,7 +1059,6 @@ static void DrawOBJS(bool OnMain, uint8_t D) if (Settings.BGLayering) fprintf(stderr, "Entering DrawOBJS() for %d-%d\n", GFX.StartY, GFX.EndY); #endif - CHECK_SOUND(); BG.BitShift = 4; BG.TileShift = 5; @@ -1296,8 +1295,6 @@ static void DrawOBJS(bool OnMain, uint8_t D) static void DrawBackgroundMosaic(uint32_t BGMode, uint32_t bg, uint8_t Z1, uint8_t Z2) { - CHECK_SOUND(); - uint32_t Tile; uint16_t* SC0; uint16_t* SC1; @@ -1527,8 +1524,6 @@ static void DrawBackgroundMosaic(uint32_t BGMode, uint32_t bg, uint8_t Z1, uint8 static void DrawBackgroundOffset(uint32_t BGMode, uint32_t bg, uint8_t Z1, uint8_t Z2) { - CHECK_SOUND(); - uint32_t Tile; uint16_t* SC0; uint16_t* SC1; @@ -1864,8 +1859,6 @@ static void DrawBackgroundOffset(uint32_t BGMode, uint32_t bg, uint8_t Z1, uint8 static void DrawBackgroundMode5(uint32_t bg, uint8_t Z1, uint8_t Z2) { - CHECK_SOUND(); - if (IPPU.Interlace) { GFX.Pitch = GFX.RealPitch; @@ -2235,7 +2228,6 @@ static void DrawBackground(uint32_t BGMode, uint32_t bg, uint8_t Z1, uint8_t Z2) // } break; } - CHECK_SOUND(); uint32_t Tile; uint16_t* SC0; @@ -2562,7 +2554,6 @@ static void DrawBackground(uint32_t BGMode, uint32_t bg, uint8_t Z1, uint8_t Z2) #define RENDER_BACKGROUND_MODE7(TYPE,FUNC) \ uint16_t *ScreenColors = IPPU.ScreenColors; \ (void)ScreenColors; \ - CHECK_SOUND(); \ \ uint8_t *VRAM1 = Memory.VRAM + 1; \ if (GFX.r2130 & 1) \ @@ -2753,8 +2744,6 @@ static void DrawBGMode7Background16Sub1_2(uint8_t* Screen, int bg) #define RENDER_BACKGROUND_MODE7_i(TYPE,FUNC,COLORFUNC) \ uint16_t *ScreenColors; \ - CHECK_SOUND(); \ -\ uint8_t *VRAM1 = Memory.VRAM + 1; \ if (GFX.r2130 & 1) \ { \ diff --git a/source/port.h b/source/port.h index b39fcb8..cf03cee 100644 --- a/source/port.h +++ b/source/port.h @@ -92,13 +92,7 @@ #include -#ifndef STORM -//#include #include -#else -#include -#include -#endif #ifndef ACCEPT_SIZE_T #ifdef __WIN32__ @@ -129,7 +123,6 @@ #define CPU_SHUTDOWN #define SPC700_SHUTDOWN #define PIXEL_FORMAT RGB555 -#define CHECK_SOUND() #define M_PI 3.14159265359 #undef _MAX_PATH @@ -166,15 +159,6 @@ void _splitpath(const char* path, char* drive, char* dir, char* fname, void S9xGenerateSound(); -#ifdef STORM -int soundsignal; -void MixSound(void); -/* Yes, CHECK_SOUND is getting defined correctly! */ -#define CHECK_SOUND if (Settings.APUEnabled) if(SetSignalPPC(0L, soundsignal) & soundsignal) MixSound -#else -#define CHECK_SOUND() -#endif - #ifdef __DJGPP #define SLASH_STR "/" #define SLASH_CHAR '/' @@ -183,13 +167,6 @@ void MixSound(void); #define SLASH_CHAR '/' #endif -/* Taken care of in signal.h on Linux. - * #ifdef __linux - * typedef void (*SignalHandler)(int); - * #define SIG_PF SignalHandler - * #endif - */ - /* If including signal.h, do it before snes9.h and port.h to avoid clashes. */ #ifndef SIG_PF #define SIG_PF void(*)(int) @@ -207,24 +184,7 @@ void MixSound(void); //#define FAST_LSB_WORD_ACCESS #endif -#ifdef __sun -#define TITLE "Snes9X: Solaris" -#endif - -#ifdef __linux -#define TITLE "Snes9X: Linux" -#endif - -#ifndef TITLE -#define TITLE "Snes9x" -#endif - -#ifdef STORM -#define STATIC -#define strncasecmp strnicmp -#else #define STATIC static -#endif #include -- cgit v1.2.3