diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h index ee190e858b..c2dd70937e 100644 --- a/Source/Core/Common/Logging/Log.h +++ b/Source/Core/Common/Logging/Log.h @@ -31,7 +31,6 @@ enum LOG_TYPE IOS, IOS_DI, IOS_ES, - IOS_FILEIO, IOS_FS, IOS_NET, IOS_SD, diff --git a/Source/Core/Common/Logging/LogManager.cpp b/Source/Core/Common/Logging/LogManager.cpp index 0a3493a264..7d910b3a8b 100644 --- a/Source/Core/Common/Logging/LogManager.cpp +++ b/Source/Core/Common/Logging/LogManager.cpp @@ -99,7 +99,6 @@ LogManager::LogManager() m_log[LogTypes::IOS] = {"IOS", "IOS"}; m_log[LogTypes::IOS_DI] = {"IOS_DI", "IOS - Drive Interface"}; m_log[LogTypes::IOS_ES] = {"IOS_ES", "IOS - ETicket Services"}; - m_log[LogTypes::IOS_FILEIO] = {"IOS_FILEIO", "IOS - FileIO"}; m_log[LogTypes::IOS_FS] = {"IOS_FS", "IOS - Filesystem Services"}; m_log[LogTypes::IOS_SD] = {"IOS_SD", "IOS - SDIO"}; m_log[LogTypes::IOS_SSL] = {"IOS_SSL", "IOS - SSL"}; diff --git a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp index 0a69e1acc0..7efb461a75 100644 --- a/Source/Core/Core/IOS/FS/HostBackend/FS.cpp +++ b/Source/Core/Core/IOS/FS/HostBackend/FS.cpp @@ -173,7 +173,7 @@ ResultCode HostFileSystem::CreateFile(Uid, Gid, const std::string& path, FileAtt // check if the file already exist if (File::Exists(file_name)) { - INFO_LOG(IOS_FILEIO, "\tresult = FS_EEXIST"); + INFO_LOG(IOS_FS, "\tresult = FS_EEXIST"); return ResultCode::AlreadyExists; } @@ -181,11 +181,11 @@ ResultCode HostFileSystem::CreateFile(Uid, Gid, const std::string& path, FileAtt File::CreateFullPath(file_name); // just to be sure if (!File::CreateEmptyFile(file_name)) { - ERROR_LOG(IOS_FILEIO, "couldn't create new file"); + ERROR_LOG(IOS_FS, "couldn't create new file"); return ResultCode::Invalid; } - INFO_LOG(IOS_FILEIO, "\tresult = IPC_SUCCESS"); + INFO_LOG(IOS_FS, "\tresult = IPC_SUCCESS"); return ResultCode::Success; } @@ -195,7 +195,7 @@ ResultCode HostFileSystem::CreateDirectory(Uid, Gid, const std::string& path, { if (!IsValidWiiPath(path)) { - WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); + WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str()); return ResultCode::Invalid; } @@ -203,7 +203,7 @@ ResultCode HostFileSystem::CreateDirectory(Uid, Gid, const std::string& path, name += "/"; File::CreateFullPath(name); - DEBUG_ASSERT_MSG(IOS_FILEIO, File::IsDirectory(name), "CREATE_DIR %s failed", name.c_str()); + DEBUG_ASSERT_MSG(IOS_FS, File::IsDirectory(name), "CREATE_DIR %s failed", name.c_str()); return ResultCode::Success; } @@ -212,17 +212,17 @@ ResultCode HostFileSystem::Delete(Uid, Gid, const std::string& path) { if (!IsValidWiiPath(path)) { - WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); + WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str()); return ResultCode::Invalid; } const std::string file_name = BuildFilename(path); if (File::Delete(file_name)) - INFO_LOG(IOS_FILEIO, "DeleteFile %s", file_name.c_str()); + INFO_LOG(IOS_FS, "DeleteFile %s", file_name.c_str()); else if (File::DeleteDirRecursively(file_name)) - INFO_LOG(IOS_FILEIO, "DeleteDir %s", file_name.c_str()); + INFO_LOG(IOS_FS, "DeleteDir %s", file_name.c_str()); else - WARN_LOG(IOS_FILEIO, "DeleteFile %s - failed!!!", file_name.c_str()); + WARN_LOG(IOS_FS, "DeleteFile %s - failed!!!", file_name.c_str()); return ResultCode::Success; } @@ -232,14 +232,14 @@ ResultCode HostFileSystem::Rename(Uid, Gid, const std::string& old_path, { if (!IsValidWiiPath(old_path)) { - WARN_LOG(IOS_FILEIO, "Not a valid path: %s", old_path.c_str()); + WARN_LOG(IOS_FS, "Not a valid path: %s", old_path.c_str()); return ResultCode::Invalid; } std::string old_name = BuildFilename(old_path); if (!IsValidWiiPath(new_path)) { - WARN_LOG(IOS_FILEIO, "Not a valid path: %s", new_path.c_str()); + WARN_LOG(IOS_FS, "Not a valid path: %s", new_path.c_str()); return ResultCode::Invalid; } @@ -257,11 +257,11 @@ ResultCode HostFileSystem::Rename(Uid, Gid, const std::string& old_path, // finally try to rename the file if (File::Rename(old_name, new_name)) { - INFO_LOG(IOS_FILEIO, "Rename %s to %s", old_name.c_str(), new_name.c_str()); + INFO_LOG(IOS_FS, "Rename %s to %s", old_name.c_str(), new_name.c_str()); } else { - ERROR_LOG(IOS_FILEIO, "Rename %s to %s - failed", old_name.c_str(), new_name.c_str()); + ERROR_LOG(IOS_FS, "Rename %s to %s - failed", old_name.c_str(), new_name.c_str()); return ResultCode::NotFound; } @@ -272,20 +272,20 @@ Result> HostFileSystem::ReadDirectory(Uid, Gid, const s { if (!IsValidWiiPath(path)) { - WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); + WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str()); return ResultCode::Invalid; } // the Wii uses this function to define the type (dir or file) const std::string dir_name(BuildFilename(path)); - INFO_LOG(IOS_FILEIO, "IOCTL_READ_DIR %s", dir_name.c_str()); + INFO_LOG(IOS_FS, "IOCTL_READ_DIR %s", dir_name.c_str()); const File::FileInfo file_info(dir_name); if (!file_info.Exists()) { - WARN_LOG(IOS_FILEIO, "Search not found: %s", dir_name.c_str()); + WARN_LOG(IOS_FS, "Search not found: %s", dir_name.c_str()); return ResultCode::NotFound; } @@ -294,7 +294,7 @@ Result> HostFileSystem::ReadDirectory(Uid, Gid, const s // It's not a directory, so error. // Games don't usually seem to care WHICH error they get, as long as it's < // Well the system menu CARES! - WARN_LOG(IOS_FILEIO, "\tNot a directory - return FS_EINVAL"); + WARN_LOG(IOS_FS, "\tNot a directory - return FS_EINVAL"); return ResultCode::Invalid; } @@ -318,7 +318,7 @@ Result> HostFileSystem::ReadDirectory(Uid, Gid, const s for (File::FSTEntry& child : entry.children) { output.emplace_back(child.virtualName); - INFO_LOG(IOS_FILEIO, "\tFound: %s", child.virtualName.c_str()); + INFO_LOG(IOS_FS, "\tFound: %s", child.virtualName.c_str()); } return output; } @@ -332,7 +332,7 @@ Result HostFileSystem::GetMetadata(Uid, Gid, const std::string& path) if (!IsValidWiiPath(path)) { - WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); + WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str()); return ResultCode::Invalid; } @@ -357,17 +357,17 @@ Result HostFileSystem::GetMetadata(Uid, Gid, const std::string& path) metadata.size = info.GetSize(); if (info.IsDirectory()) { - INFO_LOG(IOS_FILEIO, "GET_ATTR Directory %s - all permission flags are set", file_name.c_str()); + INFO_LOG(IOS_FS, "GET_ATTR Directory %s - all permission flags are set", file_name.c_str()); } else { if (info.Exists()) { - INFO_LOG(IOS_FILEIO, "GET_ATTR %s - all permission flags are set", file_name.c_str()); + INFO_LOG(IOS_FS, "GET_ATTR %s - all permission flags are set", file_name.c_str()); } else { - INFO_LOG(IOS_FILEIO, "GET_ATTR unknown %s", file_name.c_str()); + INFO_LOG(IOS_FS, "GET_ATTR unknown %s", file_name.c_str()); return ResultCode::NotFound; } } @@ -380,7 +380,7 @@ ResultCode HostFileSystem::SetMetadata(Uid caller_uid, const std::string& path, { if (!IsValidWiiPath(path)) { - WARN_LOG(IOS_FILEIO, "Not a valid path: %s", path.c_str()); + WARN_LOG(IOS_FS, "Not a valid path: %s", path.c_str()); return ResultCode::Invalid; } return ResultCode::Success; @@ -388,7 +388,7 @@ ResultCode HostFileSystem::SetMetadata(Uid caller_uid, const std::string& path, Result HostFileSystem::GetNandStats() { - WARN_LOG(IOS_FILEIO, "GET STATS - returning static values for now"); + WARN_LOG(IOS_FS, "GET STATS - returning static values for now"); // TODO: scrape the real amounts from somewhere... NandStats stats{}; @@ -407,13 +407,13 @@ Result HostFileSystem::GetDirectoryStats(const std::string& wii_ { if (!IsValidWiiPath(wii_path)) { - WARN_LOG(IOS_FILEIO, "Not a valid path: %s", wii_path.c_str()); + WARN_LOG(IOS_FS, "Not a valid path: %s", wii_path.c_str()); return ResultCode::Invalid; } DirectoryStats stats{}; std::string path(BuildFilename(wii_path)); - INFO_LOG(IOS_FILEIO, "IOCTL_GETUSAGE %s", path.c_str()); + INFO_LOG(IOS_FS, "IOCTL_GETUSAGE %s", path.c_str()); if (File::IsDirectory(path)) { File::FSTEntry parent_dir = File::ScanDirectoryTree(path, true); @@ -424,11 +424,11 @@ Result HostFileSystem::GetDirectoryStats(const std::string& wii_ stats.used_clusters = (u32)(total_size / (16 * 1024)); // one block is 16kb - INFO_LOG(IOS_FILEIO, "fsBlock: %i, inodes: %i", stats.used_clusters, stats.used_inodes); + INFO_LOG(IOS_FS, "fsBlock: %i, inodes: %i", stats.used_clusters, stats.used_inodes); } else { - WARN_LOG(IOS_FILEIO, "fsBlock failed, cannot find directory: %s", path.c_str()); + WARN_LOG(IOS_FS, "fsBlock failed, cannot find directory: %s", path.c_str()); } return stats; } diff --git a/Source/Core/Core/WiiRoot.cpp b/Source/Core/Core/WiiRoot.cpp index 7a2f5104b3..f6d696a435 100644 --- a/Source/Core/Core/WiiRoot.cpp +++ b/Source/Core/Core/WiiRoot.cpp @@ -57,12 +57,11 @@ void InitializeWiiRoot(bool use_temporary) s_temp_wii_root = File::CreateTempDir(); if (s_temp_wii_root.empty()) { - ERROR_LOG(IOS_FILEIO, "Could not create temporary directory"); + ERROR_LOG(IOS_FS, "Could not create temporary directory"); return; } File::CopyDir(File::GetSysDirectory() + WII_USER_DIR, s_temp_wii_root); - WARN_LOG(IOS_FILEIO, "Using temporary directory %s for minimal Wii FS", - s_temp_wii_root.c_str()); + WARN_LOG(IOS_FS, "Using temporary directory %s for minimal Wii FS", s_temp_wii_root.c_str()); File::SetUserPath(D_SESSION_WIIROOT_IDX, s_temp_wii_root); // Generate a SYSCONF with default settings for the temporary Wii NAND. SysConf sysconf{Common::FromWhichRoot::FROM_SESSION_ROOT};