Merge pull request #246 from retro-wertz/libretro

libretro: Cleanup some #ifdefs
visualboyadvance-m · Jun 6, 2018 · 07bc2ee · 07bc2ee
2 parents 1d4dacc + 1606ea7
commit 07bc2ee
Show file tree

Hide file tree

Showing 16 changed files with 133 additions and 271 deletions.
diff --git a/src/System.h b/src/System.h
@@ -2,15 +2,12 @@
 #define SYSTEM_H
 
 #ifndef __LIBRETRO__
+#include <zlib.h>
 #include "common/cstdint.h"
 #else
 #include <stdint.h>
 #endif
 
-#ifndef __LIBRETRO__
-#include <zlib.h>
-#endif
-
 #define winlog log
 
 class SoundDriver;

diff --git a/src/common/ConfigManager.h b/src/common/ConfigManager.h
@@ -16,22 +16,18 @@
 
 #define MAX_CHEATS 16384
 
-#ifndef __LIBRETRO__
 extern bool cpuIsMultiBoot;
 extern bool mirroringEnable;
 extern bool parseDebug;
 extern bool speedHack;
 extern bool speedup;
-#endif
 extern char *rewindMemory;
 extern const char *aviRecordDir;
 extern const char *biosFileNameGB;
 extern const char *biosFileNameGBA;
 extern const char *biosFileNameGBC;
-#ifndef __LIBRETRO__
 extern const char *loadDotCodeFile;
 extern const char *saveDotCodeFile;
-#endif
 extern const char *linkHostAddr;
 extern const char *movieRecordDir;
 extern const char *romDirGB;
@@ -50,11 +46,9 @@ extern int autoPatch;
 extern int autoSaveLoadCheatList;
 extern int aviRecording;
 extern int captureFormat;
-#ifndef __LIBRETRO__
 extern int cheatsEnabled;
 extern int cpuDisableSfx;
 extern int cpuSaveType;
-#endif
 extern int dinputKeyFocus;
 extern int disableMMX;
 extern int disableStatusMessages;
@@ -80,10 +74,8 @@ extern int glFilter;
 extern int ifbType;
 extern int joypadDefault;
 extern int languageOption;
-#ifndef __LIBRETRO__
 extern int layerEnable;
 extern int layerSettings;
-#endif
 extern int linkAuto;
 extern int linkHacks;
 extern int linkMode;
@@ -101,20 +93,16 @@ extern int optPrintUsage;
 extern int paused;
 extern int pauseWhenInactive;
 extern int recentFreeze;
-#ifndef __LIBRETRO__
 extern int renderedFrames;
-#endif
 extern int rewindCount;
 extern int rewindCounter;
 extern int rewindPos;
 extern int rewindSaveNeeded;
 extern int rewindTimer;
 extern int rewindTopPos;
 // extern int romSize;
-#ifndef __LIBRETRO__
 extern int rtcEnabled;
 extern int saveType;
-#endif
 extern int screenMessage;
 extern int sensorX;
 extern int sensorY;
@@ -123,9 +111,7 @@ extern int showSpeed;
 extern int showSpeedTransparent;
 extern int sizeX;
 extern int sizeY;
-#ifndef __LIBRETRO__
 extern int skipBios;
-#endif
 extern int skipSaveGameBattery;
 extern int skipSaveGameCheats;
 extern int soundRecording;
@@ -135,9 +121,7 @@ extern int surfaceSizeX;
 extern int surfaceSizeY;
 extern int threadPriority;
 extern int tripleBuffering;
-#ifndef __LIBRETRO__
 extern int useBios;
-#endif
 extern int useBiosFileGB;
 extern int useBiosFileGBA;
 extern int useBiosFileGBC;

diff --git a/src/gba/Cheats.h b/src/gba/Cheats.h
@@ -1,11 +1,7 @@
 #ifndef CHEATS_H
 #define CHEATS_H
 
-#ifndef __LIBRETRO__
 #include "../common/ConfigManager.h"
-#else
-#include "../src/libretro/UtilRetro.h"
-#endif
 
 struct CheatsData {
     int code;

diff --git a/src/gba/EEprom.cpp b/src/gba/EEprom.cpp
@@ -72,7 +72,9 @@ void eepromReadGame(const uint8_t*& data, int version)
         eepromSize = 512;
     }
 }
-#else
+
+#else // !__LIBRETRO__
+
 void eepromSaveGame(gzFile gzFile)
 {
     utilWriteData(gzFile, eepromSaveData);

diff --git a/src/gba/EEprom.h b/src/gba/EEprom.h
@@ -12,20 +12,17 @@
 #ifdef __LIBRETRO__
 extern void eepromSaveGame(uint8_t*& data);
 extern void eepromReadGame(const uint8_t*& data, int version);
-#else
+extern uint8_t* eepromData;
+#else // !__LIBRETRO__
 extern void eepromSaveGame(gzFile _gzFile);
 extern void eepromReadGame(gzFile _gzFile, int version);
 extern void eepromReadGameSkip(gzFile _gzFile, int version);
+extern uint8_t eepromData[0x2000];
 #endif
 extern int eepromRead(uint32_t address);
 extern void eepromWrite(uint32_t address, uint8_t value);
 extern void eepromInit();
 extern void eepromReset();
-#ifdef __LIBRETRO__
-extern uint8_t* eepromData;
-#else
-extern uint8_t eepromData[0x2000];
-#endif
 extern bool eepromInUse;
 extern int eepromSize;
 

diff --git a/src/gba/Flash.cpp b/src/gba/Flash.cpp
@@ -82,7 +82,8 @@ void flashReadGame(const uint8_t*& data, int)
 {
     utilReadDataMem(data, flashSaveData3);
 }
-#else
+
+#else // !__LIBRETRO__
 void flashSaveGame(gzFile gzFile)
 {
     utilWriteData(gzFile, flashSaveData3);

diff --git a/src/gba/Flash.h b/src/gba/Flash.h
@@ -3,30 +3,26 @@
 
 #ifndef __LIBRETRO__
 #include "../common/cstdint.h"
+#include <zlib.h>
 #else
 #include <stdint.h>
 #endif
 
-#include <zlib.h>
-
 #define FLASH_128K_SZ 0x20000
 
 #ifdef __LIBRETRO__
 extern void flashSaveGame(uint8_t*& data);
 extern void flashReadGame(const uint8_t*& data, int);
+extern uint8_t* flashSaveMemory;
 #else
 extern void flashSaveGame(gzFile _gzFile);
 extern void flashReadGame(gzFile _gzFile, int version);
 extern void flashReadGameSkip(gzFile _gzFile, int version);
+extern uint8_t flashSaveMemory[FLASH_128K_SZ];
 #endif
 extern uint8_t flashRead(uint32_t address);
 extern void flashWrite(uint32_t address, uint8_t byte);
 extern void flashDelayedWrite(uint32_t address, uint8_t byte);
-#ifdef __LIBRETRO__
-extern uint8_t* flashSaveMemory;
-#else
-extern uint8_t flashSaveMemory[FLASH_128K_SZ];
-#endif
 extern void flashSaveDecide(uint32_t address, uint8_t byte);
 extern void flashReset();
 extern void flashSetSize(int size);

diff --git a/src/gba/GBA-arm.cpp b/src/gba/GBA-arm.cpp
@@ -7,11 +7,7 @@
 #include "../NLS.h"
 #include "../System.h"
 #include "../Util.h"
-#ifndef __LIBRETRO__
 #include "../common/ConfigManager.h"
-#else
-#include "../src/libretro/UtilRetro.h"
-#endif
 #include "Cheats.h"
 #include "EEprom.h"
 #include "Flash.h"

diff --git a/src/gba/GBA-thumb.cpp b/src/gba/GBA-thumb.cpp
@@ -10,11 +10,7 @@
 #include "../NLS.h"
 #include "../System.h"
 #include "../Util.h"
-#ifndef __LIBRETRO__
 #include "../common/ConfigManager.h"
-#else
-#include "../src/libretro/UtilRetro.h"
-#endif
 #include "Cheats.h"
 #include "EEprom.h"
 #include "Flash.h"
@@ -887,7 +883,7 @@ DEFINE_IMM5_INSN(IMM5_ASR, 10)
     static INSN_REGPARM void thumb##BASE##_6(uint32_t opcode) { THREEARG_INSN(OP, 6); } \
     static INSN_REGPARM void thumb##BASE##_7(uint32_t opcode) { THREEARG_INSN(OP, 7); }
 
-#define DEFINE_IMM3_INSN(OP, BASE)                                                          \ 
+#define DEFINE_IMM3_INSN(OP, BASE)                                                          \
     static INSN_REGPARM void thumb##BASE##_0(uint32_t opcode) { THREEARG_INSN(OP##_0, 0); } \
     static INSN_REGPARM void thumb##BASE##_1(uint32_t opcode) { THREEARG_INSN(OP, 1); }     \
     static INSN_REGPARM void thumb##BASE##_2(uint32_t opcode) { THREEARG_INSN(OP, 2); }     \