ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV9: Rename config struct to avoid conflicting with USB Config struct

This commit is contained in:
TheLastRar 2021-02-08 01:03:27 +00:00 committed by refractionpcsx2
parent bac0930591
commit ca3b857f22
6 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/DEV9/DEV9.cpp
View File

@ -1075,7 +1075,7 @@ void DEV9setLogDir(const char* dir)
s_strLogPath = (dir == NULL) ? "logs" : dir; s_strLogPath = (dir == NULL) ? "logs" : dir;
} }
void ApplyConfigIfRunning(Config oldConfig) void ApplyConfigIfRunning(ConfigDEV9 oldConfig)
{ {
if (!isRunning) if (!isRunning)
return; return;

7
pcsx2/DEV9/DEV9.h
View File

@ -55,7 +55,7 @@ bool rx_fifo_can_rx();
#define HDD_MIN_GB 40 #define HDD_MIN_GB 40
#define HDD_MAX_GB 120 #define HDD_MAX_GB 120
struct Config struct ConfigDEV9
{ {
char Eth[256]; char Eth[256];
NetApi EthApi; NetApi EthApi;
@ -80,7 +80,8 @@ struct Config
int ethEnable; int ethEnable;
}; };
EXTERN Config config;
EXTERN ConfigDEV9 config;
typedef struct typedef struct
{ {
@ -736,7 +737,7 @@ u32 DEV9read32(u32 addr);
void DEV9write8(u32 addr, u8 value); void DEV9write8(u32 addr, u8 value);
void DEV9write16(u32 addr, u16 value); void DEV9write16(u32 addr, u16 value);
void DEV9write32(u32 addr, u32 value); void DEV9write32(u32 addr, u32 value);
void ApplyConfigIfRunning(Config oldConfig); void ApplyConfigIfRunning(ConfigDEV9 oldConfig);
#ifdef _WIN32 #ifdef _WIN32
#pragma warning(error : 4013) #pragma warning(error : 4013)

2
pcsx2/DEV9/Linux/Linux.cpp
View File

@ -297,7 +297,7 @@ void OnOk()
void DEV9configure() void DEV9configure()
{ {
ScopedCoreThreadPause paused_core; ScopedCoreThreadPause paused_core;
Config oldConfig = config; ConfigDEV9 oldConfig = config;
gtk_init(NULL, NULL); gtk_init(NULL, NULL);
GError* error = NULL; GError* error = NULL;

2
pcsx2/DEV9/Win32/Win32.cpp
View File

@ -499,7 +499,7 @@ BOOL CALLBACK ConfigureDlgProc(HWND hW, UINT uMsg, WPARAM wParam, LPARAM lParam)
void DEV9configure() void DEV9configure()
{ {
ScopedCoreThreadPause paused_core; ScopedCoreThreadPause paused_core;
Config oldConfig = config; ConfigDEV9 oldConfig = config;
DialogBox(hInst, DialogBox(hInst,
MAKEINTRESOURCE(IDD_CONFIG), MAKEINTRESOURCE(IDD_CONFIG),

2
pcsx2/DEV9/net.cpp
View File

@ -122,7 +122,7 @@ void InitNet()
#endif #endif
} }
void ReconfigureLiveNet(Config* oldConfig) void ReconfigureLiveNet(ConfigDEV9* oldConfig)
{ {
//Eth //Eth
if (config.ethEnable) if (config.ethEnable)

4
pcsx2/DEV9/net.h
View File

@ -34,7 +34,7 @@
#include "PacketReader/IP/IP_Address.h" #include "PacketReader/IP/IP_Address.h"
#include "InternalServers/DHCP_Server.h" #include "InternalServers/DHCP_Server.h"
struct Config; struct ConfigDEV9;
// first three recognized by Xlink as Sony PS2 // first three recognized by Xlink as Sony PS2
const u8 defaultMAC[6] = {0x00, 0x04, 0x1F, 0x82, 0x30, 0x31}; const u8 defaultMAC[6] = {0x00, 0x04, 0x1F, 0x82, 0x30, 0x31};
@ -128,7 +128,7 @@ private:
void tx_put(NetPacket* ptr); void tx_put(NetPacket* ptr);
void InitNet(); void InitNet();
void ReconfigureLiveNet(Config* oldConfig); void ReconfigureLiveNet(ConfigDEV9* oldConfig);
void TermNet(); void TermNet();
const char* NetApiToString(NetApi api); const char* NetApiToString(NetApi api);