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

Paths: Made a WII_SYSCONF_FILE path for the Wii configuration, and removed an unused variable 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2444 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
John Peterson 2009-02-26 08:12:40 +00:00
parent 0b8f7439cb
commit bd891cfff6
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Common/Src/Paths.h
View File

@ -30,6 +30,7 @@
// Dirs in User // Dirs in User
#define GC_USER_DIR "GC" #define GC_USER_DIR "GC"
#define WII_USER_DIR "Wii" #define WII_USER_DIR "Wii"
#define WII_SYSCONF_DIR "shared2/sys"
#define CONFIG_DIR "Config" #define CONFIG_DIR "Config"
#define GAMECONFIG_DIR "GameConfig" #define GAMECONFIG_DIR "GameConfig"
#define MAPS_DIR "Maps" #define MAPS_DIR "Maps"
@ -72,6 +73,7 @@
#define WII_EUR_SETTING "setting-eur.txt" #define WII_EUR_SETTING "setting-eur.txt"
#define WII_USA_SETTING "setting-usa.txt" #define WII_USA_SETTING "setting-usa.txt"
#define WII_JAP_SETTING "setting-jpn.txt" #define WII_JAP_SETTING "setting-jpn.txt"
#define WII_SYSCONF "SYSCONF"
#define MEMORY_DUMP_FILE "mainram.dump" #define MEMORY_DUMP_FILE "mainram.dump"
@ -130,5 +132,6 @@
#define WII_EUR_SETTING_FILE FULL_WII_SYS_DIR WII_EUR_SETTING #define WII_EUR_SETTING_FILE FULL_WII_SYS_DIR WII_EUR_SETTING
#define WII_USA_SETTING_FILE FULL_WII_SYS_DIR WII_USA_SETTING #define WII_USA_SETTING_FILE FULL_WII_SYS_DIR WII_USA_SETTING
#define WII_JAP_SETTING_FILE FULL_WII_SYS_DIR WII_JAP_SETTING #define WII_JAP_SETTING_FILE FULL_WII_SYS_DIR WII_JAP_SETTING
#define WII_SYSCONF_FILE FULL_WII_USER_DIR WII_SYSCONF_DIR DIR_SEP WII_SYSCONF
#endif // PATHS_H #endif // PATHS_H

13
Source/Core/DolphinWX/Src/BootManager.cpp
View File

@ -141,24 +141,15 @@ bool BootCore(const std::string& _rFilename)
{ {
//bRefreshList = false; //bRefreshList = false;
FILE* pStream; // file handle FILE* pStream; // file handle
u8 m_SYSCONF[0x4000]; // SYSCONF file
u16 IPL_PGS = 0x17CC; // progressive scan u16 IPL_PGS = 0x17CC; // progressive scan
u16 IPL_AR = 0x04D9; // widescreen u16 IPL_AR = 0x04D9; // widescreen
std::string FullSYSCONFPath = FULL_WII_USER_DIR "shared2/sys/SYSCONF";
//wxMessageBox(wxString::Format(": %02x", m_SYSCONF[IPL_AR]));
ini.Get("Wii", "ProgressiveScan", &StartUp.bProgressiveScan, StartUp.bProgressiveScan); ini.Get("Wii", "ProgressiveScan", &StartUp.bProgressiveScan, StartUp.bProgressiveScan);
ini.Get("Wii", "Widescreen", &StartUp.bWidescreen, StartUp.bWidescreen); ini.Get("Wii", "Widescreen", &StartUp.bWidescreen, StartUp.bWidescreen);
m_SYSCONF[IPL_PGS] = StartUp.bProgressiveScan;
m_SYSCONF[IPL_AR] = StartUp.bWidescreen;
//wxMessageBox(wxString::Format(": %02x", m_SYSCONF[IPL_AR]));
// Save the update Wii SYSCONF settings // Save the update Wii SYSCONF settings
pStream = NULL; pStream = NULL;
pStream = fopen(FullSYSCONFPath.c_str(), "r+b"); pStream = fopen(WII_SYSCONF_FILE, "r+b");
if (pStream != NULL) if (pStream != NULL)
{ {
fseek(pStream, IPL_PGS, 0); fseek(pStream, IPL_PGS, 0);
@ -169,7 +160,7 @@ bool BootCore(const std::string& _rFilename)
} }
else else
{ {
PanicAlert("Could not write to %s", FullSYSCONFPath.c_str()); PanicAlert("Could not write to %s", WII_SYSCONF_FILE);
} }
} }
// --------------- // ---------------

9
Source/Core/DolphinWX/Src/ConfigMain.cpp
View File

@ -94,9 +94,8 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
bRefreshList = false; bRefreshList = false;
// Load Wii SYSCONF // Load Wii SYSCONF
FullSYSCONFPath = FULL_WII_USER_DIR "shared2/sys/SYSCONF";
pStream = NULL; pStream = NULL;
pStream = fopen(FullSYSCONFPath.c_str(), "rb"); pStream = fopen(WII_SYSCONF_FILE, "rb");
if (pStream != NULL) if (pStream != NULL)
{ {
fread(m_SYSCONF, 1, 0x4000, pStream); fread(m_SYSCONF, 1, 0x4000, pStream);
@ -105,7 +104,7 @@ CConfigMain::CConfigMain(wxWindow* parent, wxWindowID id, const wxString& title,
} }
else else
{ {
PanicAlert("Could not read %s. Please recover the SYSCONF file to that location.", FullSYSCONFPath.c_str()); PanicAlert("Could not read %s. Please recover the SYSCONF file to that location.", WII_SYSCONF_FILE);
m_bSysconfOK = false; m_bSysconfOK = false;
} }
@ -544,7 +543,7 @@ void CConfigMain::OnClose(wxCloseEvent& WXUNUSED (event))
if(m_bSysconfOK) if(m_bSysconfOK)
{ {
// Save SYSCONF with the new settings // Save SYSCONF with the new settings
pStream = fopen(FullSYSCONFPath.c_str(), "wb"); pStream = fopen(WII_SYSCONF_FILE, "wb");
if (pStream != NULL) if (pStream != NULL)
{ {
fwrite(m_SYSCONF, 1, 0x4000, pStream); fwrite(m_SYSCONF, 1, 0x4000, pStream);
@ -552,7 +551,7 @@ void CConfigMain::OnClose(wxCloseEvent& WXUNUSED (event))
} }
else else
{ {
PanicAlert("Could not write to %s", FullSYSCONFPath.c_str()); PanicAlert("Could not write to %s", WII_SYSCONF_FILE);
} }
} }

1
Source/Core/DolphinWX/Src/ConfigMain.h
View File

@ -105,7 +105,6 @@ class CConfigMain
FILE* pStream; FILE* pStream;
u8 m_SYSCONF[0x4000]; u8 m_SYSCONF[0x4000];
bool m_bSysconfOK; bool m_bSysconfOK;
std::string FullSYSCONFPath;
enum enum
{ {