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
This commit is contained in:
LPFaint99
2010-09-06 04:36:58 +00:00
parent 402b1d83e2
commit 3bdeb923ef
15 changed files with 140 additions and 84 deletions

View File

@ -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");

View File

@ -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() {};

View File

@ -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;
}