use stdint/stdbool

1 files changed, 17 insertions, 36 deletions

diff --git a/source/fxemu.h b/source/fxemu.h
index f7943ab..7170956 100644
--- a/source/fxemu.h
+++ b/source/fxemu.h
@@ -89,77 +89,58 @@
 #ifndef _FXEMU_H_
 #define _FXEMU_H_ 1
 
-/* Types used by structures and code */
-#ifndef snes9x_types_defined
-#define snes9x_types_defined
-
-typedef unsigned char uint8;
-typedef unsigned short uint16;
-typedef unsigned int uint32;
-typedef unsigned char bool8;
-typedef signed char int8;
-typedef short int16;
-typedef int int32;
-#endif
-
-#ifndef TRUE
-#define TRUE 1
-#endif
-
-#ifndef FALSE
-#define FALSE 0
-#endif
+#include "snes9x.h"
 
 /* The FxInfo_s structure, the link between the FxEmulator and the Snes Emulator */
 struct FxInit_s
 {
-   uint32  vFlags;
-   uint8*  pvRegisters;   /* 768 bytes located in the memory at address 0x3000 */
-   uint32  nRamBanks;  /* Number of 64kb-banks in GSU-RAM/BackupRAM (banks 0x70-0x73) */
-   uint8*  pvRam;      /* Pointer to GSU-RAM */
-   uint32  nRomBanks;  /* Number of 32kb-banks in Cart-ROM */
-   uint8*  pvRom;      /* Pointer to Cart-ROM */
+   uint32_t  vFlags;
+   uint8_t*  pvRegisters;   /* 768 bytes located in the memory at address 0x3000 */
+   uint32_t  nRamBanks;  /* Number of 64kb-banks in GSU-RAM/BackupRAM (banks 0x70-0x73) */
+   uint8_t*  pvRam;      /* Pointer to GSU-RAM */
+   uint32_t  nRomBanks;  /* Number of 32kb-banks in Cart-ROM */
+   uint8_t*  pvRom;      /* Pointer to Cart-ROM */
 };
 
 /* Reset the FxChip */
 extern void FxReset(struct FxInit_s* psFxInfo);
 
 /* Execute until the next stop instruction */
-extern int FxEmulate(uint32 nInstructions);
+extern int FxEmulate(uint32_t nInstructions);
 
 /* Write access to the cache */
-extern void FxCacheWriteAccess(uint16 vAddress);
+extern void FxCacheWriteAccess(uint16_t vAddress);
 extern void
 FxFlushCache();   /* Callled when the G flag in SFR is set to zero */
 
 /* Breakpoint */
-extern void FxBreakPointSet(uint32 vAddress);
+extern void FxBreakPointSet(uint32_t vAddress);
 extern void FxBreakPointClear();
 
 /* Step by step execution */
-extern int FxStepOver(uint32 nInstructions);
+extern int FxStepOver(uint32_t nInstructions);
 
 /* Errors */
 extern int FxGetErrorCode();
 extern int FxGetIllegalAddress();
 
 /* Access to internal registers */
-extern uint32 FxGetColorRegister();
-extern uint32 FxGetPlotOptionRegister();
-extern uint32 FxGetSourceRegisterIndex();
-extern uint32 FxGetDestinationRegisterIndex();
+extern uint32_t FxGetColorRegister();
+extern uint32_t FxGetPlotOptionRegister();
+extern uint32_t FxGetSourceRegisterIndex();
+extern uint32_t FxGetDestinationRegisterIndex();
 
 /* Get string for opcode currently in the pipe */
 extern void FxPipeString(char* pvString);
 
 /* Get the byte currently in the pipe */
-extern uint8 FxPipe();
+extern uint8_t FxPipe();
 
 /* SCBR write seen.  We need to update our cached screen pointers */
 extern void fx_dirtySCBR(void);
 
 /* Update RamBankReg and RAM Bank pointer */
-extern void fx_updateRamBank(uint8 Byte);
+extern void fx_updateRamBank(uint8_t Byte);
 
 /* Option flags */
 #define FX_FLAG_ADDRESS_CHECKING 0x01