Global data may not be in the header files

ee_core/include/ee_core.h

@@ -51,13 +51,13 @@ enum ETH_OP_MODES {
 };
 
 #define IPCONFIG_MAX_LEN 64
-char g_ipconfig[IPCONFIG_MAX_LEN];
-int g_ipconfig_len;
-char g_ps2_ip[16];
-char g_ps2_netmask[16];
-char g_ps2_gateway[16];
-unsigned char g_ps2_ETHOpMode;
-u32 g_compat_mask;
+extern char g_ipconfig[IPCONFIG_MAX_LEN];
+extern int g_ipconfig_len;
+extern char g_ps2_ip[16];
+extern char g_ps2_netmask[16];
+extern char g_ps2_gateway[16];
+extern unsigned char g_ps2_ETHOpMode;
+extern u32 g_compat_mask;
 
 #define COMPAT_MODE_1 0x01
 #define COMPAT_MODE_2 0x02
@@ -68,24 +68,24 @@ u32 g_compat_mask;
 #define COMPAT_MODE_7 0x40
 #define COMPAT_MODE_8 0x80
 
-char GameID[16];
-int GameMode;
+extern char GameID[16];
+extern int GameMode;
 #define USB_MODE 0
 #define ETH_MODE 1
 #define HDD_MODE 2
 
-char ExitPath[32];
-int HDDSpindown;
-int EnableGSMOp;
-int EnableCheatOp;
+extern char ExitPath[32];
+extern int HDDSpindown;
+extern int EnableGSMOp;
+extern int EnableCheatOp;
 #ifdef PADEMU
-int EnablePadEmuOp;
-int PadEmuSettings;
+extern int EnablePadEmuOp;
+extern int PadEmuSettings;
 #endif
 
-int DisableDebug;
+extern int DisableDebug;
 #define GS_BGCOLOUR *((volatile unsigned long int *)0x120000E0)
 
-int *gCheatList; //Store hooks/codes addr+val pairs
+extern int *gCheatList; //Store hooks/codes addr+val pairs
 
 #endif

ee_core/include/syshook.h

@@ -15,11 +15,11 @@
 void Install_Kernel_Hooks(void);
 void Remove_Kernel_Hooks(void);
 
-u32 (*Old_SifSetDma)(SifDmaTransfer_t *sdd, s32 len);
-int (*Old_SifSetReg)(u32 register_num, int register_value);
-int (*Old_ExecPS2)(void *entry, void *gp, int num_args, char *args[]);
-int (*Old_CreateThread)(ee_thread_t *thread_param);
-void (*Old_Exit)(s32 exit_code);
+extern u32 (*Old_SifSetDma)(SifDmaTransfer_t *sdd, s32 len);
+extern int (*Old_SifSetReg)(u32 register_num, int register_value);
+extern int (*Old_ExecPS2)(void *entry, void *gp, int num_args, char *args[]);
+extern int (*Old_CreateThread)(ee_thread_t *thread_param);
+extern void (*Old_Exit)(s32 exit_code);
 
 void sysLoadElf(char *filename, int argc, char **argv);
 void sysExit(s32 exit_code);

ee_core/src/main.c

@@ -19,6 +19,27 @@ void *eeloadCopy, *initUserMemory;
 
 int isInit = 0;
 
+// Global data
+char g_ipconfig[IPCONFIG_MAX_LEN];
+int g_ipconfig_len;
+char g_ps2_ip[16];
+char g_ps2_netmask[16];
+char g_ps2_gateway[16];
+unsigned char g_ps2_ETHOpMode;
+u32 g_compat_mask;
+char GameID[16];
+int GameMode;
+char ExitPath[32];
+int HDDSpindown;
+int EnableGSMOp;
+int EnableCheatOp;
+#ifdef PADEMU
+int EnablePadEmuOp;
+int PadEmuSettings;
+#endif
+int DisableDebug;
+int *gCheatList; //Store hooks/codes addr+val pairs
+
 static int eecoreInit(int argc, char **argv)
 {
     SifInitRpc(0);

ee_core/src/syshook.c

@@ -31,6 +31,13 @@ extern void *ModStorageStart, *ModStorageEnd;
 extern void *eeloadCopy, *initUserMemory;
 extern void *_end;
 
+// Global data
+u32 (*Old_SifSetDma)(SifDmaTransfer_t *sdd, s32 len);
+int (*Old_SifSetReg)(u32 register_num, int register_value);
+int (*Old_ExecPS2)(void *entry, void *gp, int num_args, char *args[]);
+int (*Old_CreateThread)(ee_thread_t *thread_param);
+void (*Old_Exit)(s32 exit_code);
+
 /*----------------------------------------------------------------------------------------*/
 /* This function is called when SifSetDma catches a reboot request.                       */
 /*----------------------------------------------------------------------------------------*/

include/gui.h

@@ -50,8 +50,8 @@ struct gui_update_t
 
 typedef void (*gui_callback_t)(void);
 
-int guiInactiveFrames;
-int guiFrameId;
+extern int guiInactiveFrames;
+extern int guiFrameId;
 
 #define GUI_SCREEN_MAIN 0
 #define GUI_SCREEN_MENU 1

include/opl.h

@@ -84,7 +84,7 @@ void moduleUpdateMenu(int mode, int themeChanged, int langChanged);
 void handleHdlSrv();
 void deinit(int exception, int modeSelected);
 
-char *gBaseMCDir;
+extern char *gBaseMCDir;
 
 enum ETH_OP_MODES {
     ETH_OP_MODE_AUTO = 0,
@@ -96,54 +96,54 @@ enum ETH_OP_MODES {
     ETH_OP_MODE_COUNT
 };
 
-int ps2_ip_use_dhcp;
-int ps2_ip[4];
-int ps2_netmask[4];
-int ps2_gateway[4];
-int ps2_dns[4];
-int gETHOpMode; //See ETH_OP_MODES.
-int gPCShareAddressIsNetBIOS;
-int pc_ip[4];
-int gPCPort;
+extern int ps2_ip_use_dhcp;
+extern int ps2_ip[4];
+extern int ps2_netmask[4];
+extern int ps2_gateway[4];
+extern int ps2_dns[4];
+extern int gETHOpMode; //See ETH_OP_MODES.
+extern int gPCShareAddressIsNetBIOS;
+extern int pc_ip[4];
+extern int gPCPort;
 //Please keep these string lengths in-sync with the limits within CDVDMAN.
-char gPCShareNBAddress[17];
-char gPCShareName[32];
-char gPCUserName[32];
-char gPCPassword[32];
+extern char gPCShareNBAddress[17];
+extern char gPCShareName[32];
+extern char gPCUserName[32];
+extern char gPCPassword[32];
 
 //// Settings
 
 // describes what is happening in the network startup thread (>0 means loading, <0 means error)...
-int gNetworkStartup;
-int gHDDSpindown;
+extern int gNetworkStartup;
+extern int gHDDSpindown;
 /// Refer to enum START_MODE within iosupport.h
-int gUSBStartMode;
-int gHDDStartMode;
-int gETHStartMode;
-int gAPPStartMode;
-
-int gAutosort;
-int gAutoRefresh;
-int gEnableNotifications;
-int gEnableArt;
-int gWideScreen;
-int gVMode; // 0 - Auto, 1 - PAL, 2 - NTSC
-int gXOff;
-int gYOff;
-int gOverscan;
-int gSelectButton;
-int gHDDGameListCache;
-
-int gEnableSFX;
-int gEnableBootSND;
-int gSFXVolume;
-int gBootSndVolume;
-
-int gCheatSource;
-int gGSMSource;
-int gPadEmuSource;
-
-int showCfgPopup;
+extern int gUSBStartMode;
+extern int gHDDStartMode;
+extern int gETHStartMode;
+extern int gAPPStartMode;
+
+extern int gAutosort;
+extern int gAutoRefresh;
+extern int gEnableNotifications;
+extern int gEnableArt;
+extern int gWideScreen;
+extern int gVMode; // 0 - Auto, 1 - PAL, 2 - NTSC
+extern int gXOff;
+extern int gYOff;
+extern int gOverscan;
+extern int gSelectButton;
+extern int gHDDGameListCache;
+
+extern int gEnableSFX;
+extern int gEnableBootSND;
+extern int gSFXVolume;
+extern int gBootSndVolume;
+
+extern int gCheatSource;
+extern int gGSMSource;
+extern int gPadEmuSource;
+
+extern int showCfgPopup;
 
 #ifdef IGS
 #define IGS_VERSION "0.1"
@@ -152,43 +152,43 @@ int showCfgPopup;
 // ------------------------------------------------------------------------------------------------------------------------
 
 #ifdef PADEMU
-int gEnablePadEmu;
-int gPadEmuSettings;
+extern int gEnablePadEmu;
+extern int gPadEmuSettings;
 #endif
 
 // ------------------------------------------------------------------------------------------------------------------------
 
 // 0,1,2 scrolling speed
-int gScrollSpeed;
+extern int gScrollSpeed;
 // Exit path
-char gExitPath[32];
+extern char gExitPath[32];
 // Disable Debug Colors
-int gDisableDebug;
+extern int gDisableDebug;
 
-int gPS2Logo;
+extern int gPS2Logo;
 
 // Default device
-int gDefaultDevice;
+extern int gDefaultDevice;
 
-int gEnableWrite;
+extern int gEnableWrite;
 
-int gCheckUSBFragmentation;
+extern int gCheckUSBFragmentation;
 //These prefixes are relative to the device's name (meaning that they do not include the device name).
-char gUSBPrefix[32];
-char gETHPrefix[32];
+extern char gUSBPrefix[32];
+extern char gETHPrefix[32];
 
-int gRememberLastPlayed;
+extern int gRememberLastPlayed;
 
 // Last Played Auto Start
-int KeyPressedOnce;
-int gAutoStartLastPlayed;
-int RemainSecs, DisableCron;
-clock_t CronStart;
-
-unsigned char gDefaultBgColor[3];
-unsigned char gDefaultTextColor[3];
-unsigned char gDefaultSelTextColor[3];
-unsigned char gDefaultUITextColor[3];
+extern int KeyPressedOnce;
+extern int gAutoStartLastPlayed;
+extern int RemainSecs, DisableCron;
+extern clock_t CronStart;
+
+extern unsigned char gDefaultBgColor[3];
+extern unsigned char gDefaultTextColor[3];
+extern unsigned char gDefaultSelTextColor[3];
+extern unsigned char gDefaultUITextColor[3];
 
 void setDefaultColors(void);
 

include/renderman.h

@@ -57,12 +57,12 @@ typedef struct
 } rm_quad_t;
 
 // Some convenience globals
-const u64 gColWhite;
-const u64 gColBlack;
-const u64 gColDarker;
-const u64 gColFocus;
-const u64 gDefaultCol;
-const u64 gDefaultAlpha;
+extern const u64 gColWhite;
+extern const u64 gColBlack;
+extern const u64 gColDarker;
+extern const u64 gColFocus;
+extern const u64 gDefaultCol;
+extern const u64 gDefaultAlpha;
 
 enum rm_aratio {
     RM_ARATIO_4_3 = 0,

include/themes.h

@@ -121,7 +121,7 @@ typedef struct theme
     int fonts[THM_MAX_FONTS]; //!< Storage of font handles for removal once not needed
 } theme_t;
 
-theme_t *gTheme;
+extern theme_t *gTheme;
 
 void thmInit(void);
 void thmReinit(const char *path);

src/gui.c

@@ -62,6 +62,10 @@ static float fps = 0.0f;
 extern GSGLOBAL *gsGlobal;
 #endif
 
+// Global data
+int guiInactiveFrames;
+int guiFrameId;
+
 struct gui_update_list_t
 {
     struct gui_update_t *item;