removing bool8_32 type

[drnoksnes] / memmap.h

diff --git a/memmap.h b/memmap.h
index f0213e5..d5a79c1 100644 (file)
--- a/memmap.h
+++ b/memmap.h
@@ -38,8 +38,8 @@
  * Super NES and Super Nintendo Entertainment System are trademarks of
  * Nintendo Co., Limited and its subsidiary companies.
  */
-#ifndef _memmap_h_
-#define _memmap_h_
+#ifndef _MEMMAP_H_
+#define _MEMMAP_H_
 
 #include "snes9x.h"
 
@@ -79,11 +79,11 @@
 
 class CMemory {
 public:
-    bool8_32 LoadROM (const char *);
-    void  InitROM (bool8_32);
-    bool8_32 LoadSRAM (const char *);
-    bool8_32 SaveSRAM (const char *);
-    bool8_32 Init ();
+    bool LoadROM (const char *);
+    void InitROM (bool Interleaved);
+    bool LoadSRAM (const char *);
+    bool SaveSRAM (const char *);
+    bool Init ();
     void  Deinit ();
     void  FreeSDD1Data ();
     
@@ -100,17 +100,17 @@ public:
     void SufamiTurboLoROMMap ();
     void HiROMMap ();
     void SuperFXROMMap ();
-    void TalesROMMap (bool8_32);
+    void TalesROMMap (bool Interleaved);
     void AlphaROMMap ();
     void SA1ROMMap ();
     void BSHiROMMap ();
-    bool8_32 AllASCII (uint8 *b, int size);
-    int  ScoreHiROM (bool8_32 skip_header);
-    int  ScoreLoROM (bool8_32 skip_header);
+    bool AllASCII (uint8 *b, int size);
+    int  ScoreHiROM (bool skip_header);
+    int  ScoreLoROM (bool skip_header);
     void ApplyROMFixes ();
-    void CheckForIPSPatch (const char *rom_filename, bool8_32 header,
-                          int32 &rom_size);
-    
+    void CheckForIPSPatch (const char *rom_filename, bool header,
+                           int32 &rom_size);
+
     const char *TVStandard ();
     const char *Speed ();
     const char *StaticRAMSize ();
@@ -122,7 +122,7 @@ public:
     const char *ROMID ();
     const char *CompanyID ();
     
-    enum {
+    enum Types {
        MAP_PPU, MAP_CPU, MAP_DSP, MAP_LOROM_SRAM, MAP_HIROM_SRAM,
        MAP_NONE, MAP_DEBUG, MAP_C4, MAP_BWRAM, MAP_BWRAM_BITMAP,
        MAP_BWRAM_BITMAP2, MAP_SA1RAM, MAP_LAST
@@ -136,8 +136,8 @@ public:
     uint8 *BWRAM;
     uint8 *FillRAM;
     uint8 *C4RAM;
-    bool8_32 HiROM;
-    bool8_32 LoROM;
+    bool8 HiROM;
+    bool8 LoROM;
     uint16 SRAMMask;
     uint8 SRAMSize;
     uint8 *Map [MEMMAP_NUM_BLOCKS];
@@ -176,24 +176,20 @@ extern uint8 *SRAM;
 extern uint8 *ROM;
 extern uint8 *RegRAM;
 void S9xDeinterleaveMode2 ();
-void S9xSaveSRAM (void);
+void S9xSaveSRAM(void);
+void S9xAutoSaveSRAM();
 END_EXTERN_C
 
-void S9xAutoSaveSRAM ();
-
 #ifdef NO_INLINE_SET_GET
-uint8 S9xGetByte (uint32 Address, struct SCPUState *);
-uint16 S9xGetWord (uint32 Address, struct SCPUState *);
-void S9xSetByte (uint8 Byte, uint32 Address, struct SCPUState * );
-void S9xSetWord (uint16 Byte, uint32 Address, struct SCPUState *);
-void S9xSetPCBase (uint32 Address, struct SCPUState *);
+uint8 S9xGetByte (uint32 Address);
+uint16 S9xGetWord (uint32 Address);
+void S9xSetByte (uint8 Byte, uint32 Address);
+void S9xSetWord (uint16 Byte, uint32 Address);
+void S9xSetPCBase (uint32 Address);
 uint8 *S9xGetMemPointer (uint32 Address);
 uint8 *GetBasePointer (uint32 Address);
 #else
-#ifndef INLINE
-#define INLINE __inline
-#endif
 #include "getset.h"
-#endif // NO_INLINE_SET_GET
+#endif
 
-#endif // _memmap_h_
+#endif // _MEMMAP_H_