Many cleanups.

1 files changed, 144 insertions, 146 deletions

diff --git a/source/snes9x.h b/source/snes9x.h
index 4da02bc..de67001 100644
--- a/source/snes9x.h
+++ b/source/snes9x.h
@@ -53,29 +53,29 @@ extern int cprintf(const char* fmt, ...);
  * 64.281us / (1 / 3.546895MHz) -> 228 cycles per scanline.  */
 
 #define SNES_SCANLINE_TIME (63.695e-6)
-#define SNES_CLOCK_SPEED (3579545)
+#define SNES_CLOCK_SPEED   (3579545u)
 
 #define SNES_CLOCK_LEN (1.0 / SNES_CLOCK_SPEED)
 
 #define SNES_CYCLES_PER_SCANLINE ((uint32_t) ((SNES_SCANLINE_TIME / SNES_CLOCK_LEN) * 6 + 0.5))
 
-#define ONE_CYCLE 6
-#define SLOW_ONE_CYCLE 8
-#define TWO_CYCLES 12
+#define ONE_CYCLE      6u
+#define SLOW_ONE_CYCLE 8u
+#define TWO_CYCLES     12u
 
 
-#define SNES_TR_MASK     (1 << 4)
-#define SNES_TL_MASK     (1 << 5)
-#define SNES_X_MASK      (1 << 6)
-#define SNES_A_MASK      (1 << 7)
-#define SNES_RIGHT_MASK     (1 << 8)
-#define SNES_LEFT_MASK      (1 << 9)
-#define SNES_DOWN_MASK      (1 << 10)
-#define SNES_UP_MASK     (1 << 11)
-#define SNES_START_MASK     (1 << 12)
-#define SNES_SELECT_MASK    (1 << 13)
-#define SNES_Y_MASK      (1 << 14)
-#define SNES_B_MASK      (1 << 15)
+#define SNES_TR_MASK     (1u << 4)
+#define SNES_TL_MASK     (1u << 5)
+#define SNES_X_MASK      (1u << 6)
+#define SNES_A_MASK      (1u << 7)
+#define SNES_RIGHT_MASK  (1u << 8)
+#define SNES_LEFT_MASK   (1u << 9)
+#define SNES_DOWN_MASK   (1u << 10)
+#define SNES_UP_MASK     (1u << 11)
+#define SNES_START_MASK  (1u << 12)
+#define SNES_SELECT_MASK (1u << 13)
+#define SNES_Y_MASK      (1u << 14)
+#define SNES_B_MASK      (1u << 15)
 
 enum
 {
@@ -88,179 +88,179 @@ enum
    SNES_MAX_CONTROLLER_OPTIONS
 };
 
-#define DEBUG_MODE_FLAG     (1 << 0)
-#define TRACE_FLAG         (1 << 1)
-#define SINGLE_STEP_FLAG    (1 << 2)
-#define BREAK_FLAG         (1 << 3)
-#define SCAN_KEYS_FLAG      (1 << 4)
-#define SAVE_SNAPSHOT_FLAG  (1 << 5)
-#define DELAYED_NMI_FLAG    (1 << 6)
-#define NMI_FLAG        (1 << 7)
-#define PROCESS_SOUND_FLAG  (1 << 8)
-#define FRAME_ADVANCE_FLAG  (1 << 9)
-#define DELAYED_NMI_FLAG2   (1 << 10)
-#define IRQ_PENDING_FLAG    (1 << 11)
+#define DEBUG_MODE_FLAG    (1u << 0)
+#define TRACE_FLAG         (1u << 1)
+#define SINGLE_STEP_FLAG   (1u << 2)
+#define BREAK_FLAG         (1u << 3)
+#define SCAN_KEYS_FLAG     (1u << 4)
+#define SAVE_SNAPSHOT_FLAG (1u << 5)
+#define DELAYED_NMI_FLAG   (1u << 6)
+#define NMI_FLAG           (1u << 7)
+#define PROCESS_SOUND_FLAG (1u << 8)
+#define FRAME_ADVANCE_FLAG (1u << 9)
+#define DELAYED_NMI_FLAG2  (1u << 10)
+#define IRQ_PENDING_FLAG   (1u << 11)
 
 typedef struct
 {
-   uint32_t  Flags;
-   bool   BranchSkip;
-   bool   NMIActive;
-   uint8_t   IRQActive;
-   bool   WaitingForInterrupt;
-   bool   InDMA;
-   uint8_t   WhichEvent;
-   uint8_t*   PC;
-   uint8_t*   PCBase;
-   uint8_t*   PCAtOpcodeStart;
-   uint8_t*   WaitAddress;
-   uint32_t  WaitCounter;
-   long   Cycles;
-   long   NextEvent;
-   long   V_Counter;
-   long   MemSpeed;
-   long   MemSpeedx2;
-   long   FastROMSpeed;
+   uint32_t Flags;
+   bool     BranchSkip;
+   bool     NMIActive;
+   uint8_t  IRQActive;
+   bool     WaitingForInterrupt;
+   bool     InDMA;
+   uint8_t  WhichEvent;
+   uint8_t* PC;
+   uint8_t* PCBase;
+   uint8_t* PCAtOpcodeStart;
+   uint8_t* WaitAddress;
+   uint32_t WaitCounter;
+   long     Cycles;
+   long     NextEvent;
+   long     V_Counter;
+   long     MemSpeed;
+   long     MemSpeedx2;
+   long     FastROMSpeed;
    uint32_t AutoSaveTimer;
-   bool  SRAMModified;
+   bool     SRAMModified;
    uint32_t NMITriggerPoint;
-   bool  BRKTriggered;
-   bool  TriedInterleavedMode2;
+   bool     BRKTriggered;
+   bool     TriedInterleavedMode2;
    uint32_t NMICycleCount;
    uint32_t IRQCycleCount;
 } SCPUState;
 
-#define HBLANK_START_EVENT 0
-#define HBLANK_END_EVENT 1
-#define HTIMER_BEFORE_EVENT 2
-#define HTIMER_AFTER_EVENT 3
-#define NO_EVENT 4
+#define HBLANK_START_EVENT  0u
+#define HBLANK_END_EVENT    1u
+#define HTIMER_BEFORE_EVENT 2u
+#define HTIMER_AFTER_EVENT  3u
+#define NO_EVENT            4u
 
 typedef struct
 {
    /* CPU options */
-   bool  APUEnabled;
-   bool  Shutdown;
-   uint8_t  SoundSkipMethod;
-   long   H_Max;
-   long   HBlankStart;
-   long   CyclesPercentage;
-   bool  DisableIRQ;
-   bool  Paused;
-   bool  ForcedPause;
-   bool  StopEmulation;
-   bool  FrameAdvance;
+   bool    APUEnabled;
+   bool    Shutdown;
+   uint8_t SoundSkipMethod;
+   long    H_Max;
+   long    HBlankStart;
+   long    CyclesPercentage;
+   bool    DisableIRQ;
+   bool    Paused;
+   bool    ForcedPause;
+   bool    StopEmulation;
+   bool    FrameAdvance;
 
    /* Tracing options */
-   bool  TraceDMA;
-   bool  TraceHDMA;
-   bool  TraceVRAM;
-   bool  TraceUnknownRegisters;
-   bool  TraceDSP;
+   bool TraceDMA;
+   bool TraceHDMA;
+   bool TraceVRAM;
+   bool TraceUnknownRegisters;
+   bool TraceDSP;
 
    /* Joystick options */
-   bool  JoystickEnabled;
+   bool JoystickEnabled;
 
    /* ROM timing options (see also H_Max above) */
-   bool  ForcePAL;
-   bool  ForceNTSC;
-   bool  PAL;
+   bool     ForcePAL;
+   bool     ForceNTSC;
+   bool     PAL;
    uint32_t FrameTimePAL;
    uint32_t FrameTimeNTSC;
    uint32_t FrameTime;
    uint32_t SkipFrames;
 
    /* ROM image options */
-   bool  ForceLoROM;
-   bool  ForceHiROM;
-   bool  ForceHeader;
-   bool  ForceNoHeader;
-   bool  ForceInterleaved;
-   bool  ForceInterleaved2;
-   bool  ForceNotInterleaved;
+   bool ForceLoROM;
+   bool ForceHiROM;
+   bool ForceHeader;
+   bool ForceNoHeader;
+   bool ForceInterleaved;
+   bool ForceInterleaved2;
+   bool ForceNotInterleaved;
 
    /* Peripherial options */
-   bool  ForceSuperFX;
-   bool  ForceNoSuperFX;
-   bool  ForceDSP1;
-   bool  ForceNoDSP1;
-   bool  ForceSA1;
-   bool  ForceNoSA1;
-   bool  ForceC4;
-   bool  ForceNoC4;
-   bool  ForceSDD1;
-   bool  ForceNoSDD1;
-   bool  MultiPlayer5;
-   bool  Mouse;
-   bool  SuperScope;
-   bool  SRTC;
+   bool     ForceSuperFX;
+   bool     ForceNoSuperFX;
+   bool     ForceDSP1;
+   bool     ForceNoDSP1;
+   bool     ForceSA1;
+   bool     ForceNoSA1;
+   bool     ForceC4;
+   bool     ForceNoC4;
+   bool     ForceSDD1;
+   bool     ForceNoSDD1;
+   bool     MultiPlayer5;
+   bool     Mouse;
+   bool     SuperScope;
+   bool     SRTC;
    uint32_t ControllerOption;
 
-   bool  ShutdownMaster;
-   bool  MultiPlayer5Master;
-   bool  SuperScopeMaster;
-   bool  MouseMaster;
-   bool  SuperFX;
-   bool  DSP1Master;
-   bool  SA1;
-   bool  C4;
-   bool  SDD1;
-   bool  SPC7110;
-   bool  SPC7110RTC;
-   bool  OBC1;
+   bool ShutdownMaster;
+   bool MultiPlayer5Master;
+   bool SuperScopeMaster;
+   bool MouseMaster;
+   bool SuperFX;
+   bool DSP1Master;
+   bool SA1;
+   bool C4;
+   bool SDD1;
+   bool SPC7110;
+   bool SPC7110RTC;
+   bool OBC1;
    /* Sound options */
    uint32_t SoundPlaybackRate;
 #ifdef USE_BLARGG_APU
    uint32_t SoundInputRate;
 #endif
-   bool  TraceSoundDSP;
-   bool  EightBitConsoleSound;  // due to caching, this needs S9xSetEightBitConsoleSound()
-   int    SoundBufferSize;
-   int    SoundMixInterval;
-   bool  SoundEnvelopeHeightReading;
-   bool  DisableSoundEcho;
-   bool  DisableMasterVolume;
-   bool  SoundSync;
-   bool  InterpolatedSound;
-   bool  ThreadSound;
-   bool  Mute;
-   bool  NextAPUEnabled;
+   bool TraceSoundDSP;
+   bool EightBitConsoleSound;  // due to caching, this needs S9xSetEightBitConsoleSound()
+   int  SoundBufferSize;
+   int  SoundMixInterval;
+   bool SoundEnvelopeHeightReading;
+   bool DisableSoundEcho;
+   bool DisableMasterVolume;
+   bool SoundSync;
+   bool InterpolatedSound;
+   bool ThreadSound;
+   bool Mute;
+   bool NextAPUEnabled;
 
    /* Graphics options */
-   bool  Transparency;
-   bool  SupportHiRes;
-   bool  Mode7Interpolate;
+   bool Transparency;
+   bool SupportHiRes;
+   bool Mode7Interpolate;
 
    /* SNES graphics options */
-   bool  BGLayering;
-   bool  DisableGraphicWindows;
-   bool  ForceTransparency;
-   bool  ForceNoTransparency;
-   bool  DisableHDMA;
-   bool  DisplayFrameRate;
-   bool  DisableRangeTimeOver; /* XXX: unused */
+   bool BGLayering;
+   bool DisableGraphicWindows;
+   bool ForceTransparency;
+   bool ForceNoTransparency;
+   bool DisableHDMA;
+   bool DisplayFrameRate;
+   bool DisableRangeTimeOver; /* XXX: unused */
 
    /* Others */
-   bool  ApplyCheats;
+   bool ApplyCheats;
 
    /* Fixes for individual games */
-   bool  StarfoxHack;
-   bool  WinterGold;
-   bool  BS; /* Japanese Satellite System games. */
-   bool  DaffyDuck;
+   bool     StarfoxHack;
+   bool     WinterGold;
+   bool     BS; /* Japanese Satellite System games. */
+   bool     DaffyDuck;
    uint8_t  APURAMInitialValue;
-   bool  SampleCatchup;
-   bool  JustifierMaster;
-   bool  Justifier;
-   bool  SecondJustifier;
+   bool     SampleCatchup;
+   bool     JustifierMaster;
+   bool     Justifier;
+   bool     SecondJustifier;
    int8_t   SETA;
-   bool  TakeScreenshot;
+   bool     TakeScreenshot;
    int8_t   StretchScreenshots;
    uint16_t DisplayColor;
-   int    SoundDriver;
-   int    AIDOShmId;
-   bool  NoPatch;
-   bool  ForceInterleaveGD24;
+   int      SoundDriver;
+   int      AIDOShmId;
+   bool     NoPatch;
+   bool     ForceInterleaveGD24;
 } SSettings;
 
 typedef struct
@@ -270,7 +270,7 @@ typedef struct
    uint8_t SoundEnvelopeHeightReading2;
    uint8_t SRAMInitialValue;
    uint8_t Uniracers;
-   bool EchoOnlyOutput;
+   bool    EchoOnlyOutput;
 } SSNESGameFixes;
 
 extern SSettings Settings;
@@ -279,10 +279,8 @@ extern SSNESGameFixes SNESGameFixes;
 extern char String [513];
 
 void S9xMessage(int type, int number, const char* message);
-void S9xLoadSDD1Data();
 
 void S9xSetPause(uint32_t mask);
 void S9xClearPause(uint32_t mask);
 
 #endif
-