diff options
| author | LPFaint99 <lpfaint99@gmail.com> | 2010-09-06 04:36:58 +0000 |
|---|---|---|
| committer | LPFaint99 <lpfaint99@gmail.com> | 2010-09-06 04:36:58 +0000 |
| commit | 3bdeb923ef78eccd1efeae694d774d696a6da5d3 (patch) | |
| tree | 53a924f3d3f0907bf41b213595494e1726334719 /Source/Core/DiscIO | |
| parent | 402b1d83e2e5ea059a8ccd3dba558180b83178e6 (diff) | |
Some work towards launching by titleid rather than content path,
update some var names in WII_IPC_HLE_Device_fs, filter out some spam logs from VolumeCommon
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6182 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/DiscIO')
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.cpp | 9 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/NANDContentLoader.h | 3 | ||||
| -rw-r--r-- | Source/Core/DiscIO/Src/VolumeCommon.cpp | 3 |
3 files changed, 12 insertions, 3 deletions
diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.cpp b/Source/Core/DiscIO/Src/NANDContentLoader.cpp index ae766af813..a67af7646d 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.cpp +++ b/Source/Core/DiscIO/Src/NANDContentLoader.cpp @@ -372,6 +372,13 @@ const INANDContentLoader& CNANDContentManager::GetNANDLoader(const std::string& return *m_Map[_rName]; } +const INANDContentLoader& CNANDContentManager::GetNANDLoader(u64 _titleId) +{ + + std::string _rName = Common::CreateTitleContentPath(_titleId); + return GetNANDLoader(_rName); +} + cUIDsys::cUIDsys() { sprintf(uidSys, "%ssys/uid.sys", File::GetUserPath(D_WIIUSER_IDX)); @@ -401,7 +408,7 @@ cUIDsys::cUIDsys() else { SElement Element; - *(u64*)&(Element.titleID) = Common::swap64(0x0000000100000002ull); + *(u64*)&(Element.titleID) = Common::swap64(TITLEID_SYSMENU); *(u32*)&(Element.UID) = Common::swap32(lastUID++); FILE* pFile = fopen(uidSys, "wb"); diff --git a/Source/Core/DiscIO/Src/NANDContentLoader.h b/Source/Core/DiscIO/Src/NANDContentLoader.h index aae832774b..fce9810791 100644 --- a/Source/Core/DiscIO/Src/NANDContentLoader.h +++ b/Source/Core/DiscIO/Src/NANDContentLoader.h @@ -25,6 +25,7 @@ #include "Common.h" #include "Blob.h" #include "Volume.h" +#include "NandPaths.h" namespace DiscIO { @@ -80,7 +81,7 @@ public: static CNANDContentManager& Access() { return m_Instance; } const INANDContentLoader& GetNANDLoader(const std::string& _rName); - + const INANDContentLoader& GetNANDLoader(u64 _titleId); private: CNANDContentManager() {}; diff --git a/Source/Core/DiscIO/Src/VolumeCommon.cpp b/Source/Core/DiscIO/Src/VolumeCommon.cpp index de8c22334f..fe4f3642ac 100644 --- a/Source/Core/DiscIO/Src/VolumeCommon.cpp +++ b/Source/Core/DiscIO/Src/VolumeCommon.cpp @@ -71,7 +71,8 @@ IVolume::ECountry CountrySwitch(u8 CountryCode) break; default: - WARN_LOG(DISCIO, "Unknown Country Code! %c", CountryCode); + if (CountryCode > 'A') // Silently ignore IOS wads + WARN_LOG(DISCIO, "Unknown Country Code! %c", CountryCode); return IVolume::COUNTRY_UNKNOWN; break; } |