summaryrefslogtreecommitdiff
path: root/src/common/log_manager.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2014-05-22 22:57:45 -0400
committerGravatar bunnei2014-05-22 22:57:45 -0400
commit32c314c99290a52f1f870ecf8c677e3792ed09c4 (patch)
tree1cea62bc320d51ebb217e7c361ae10b65b71dd45 /src/common/log_manager.cpp
parentMerge branch 'master' of https://github.com/citra-emu/citra (diff)
parentcore: added Kernel::Reschedule() call to check for thread changes, shortened ... (diff)
downloadyuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.gz
yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.tar.xz
yuzu-32c314c99290a52f1f870ecf8c677e3792ed09c4.zip
Merge branch 'threading'
Diffstat (limited to '')
-rw-r--r--src/common/log_manager.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/log_manager.cpp b/src/common/log_manager.cpp
index 80fd473b9..146472888 100644
--- a/src/common/log_manager.cpp
+++ b/src/common/log_manager.cpp
@@ -60,13 +60,13 @@ LogManager::LogManager()
60 m_Log[LogTypes::LOADER] = new LogContainer("Loader", "Loader"); 60 m_Log[LogTypes::LOADER] = new LogContainer("Loader", "Loader");
61 m_Log[LogTypes::FILESYS] = new LogContainer("FileSys", "File System"); 61 m_Log[LogTypes::FILESYS] = new LogContainer("FileSys", "File System");
62 m_Log[LogTypes::WII_IPC_HID] = new LogContainer("WII_IPC_HID", "WII IPC HID"); 62 m_Log[LogTypes::WII_IPC_HID] = new LogContainer("WII_IPC_HID", "WII IPC HID");
63 m_Log[LogTypes::WII_IPC_HLE] = new LogContainer("WII_IPC_HLE", "WII IPC HLE"); 63 m_Log[LogTypes::KERNEL] = new LogContainer("KERNEL", "KERNEL HLE");
64 m_Log[LogTypes::WII_IPC_DVD] = new LogContainer("WII_IPC_DVD", "WII IPC DVD"); 64 m_Log[LogTypes::WII_IPC_DVD] = new LogContainer("WII_IPC_DVD", "WII IPC DVD");
65 m_Log[LogTypes::WII_IPC_ES] = new LogContainer("WII_IPC_ES", "WII IPC ES"); 65 m_Log[LogTypes::WII_IPC_ES] = new LogContainer("WII_IPC_ES", "WII IPC ES");
66 m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO", "WII IPC FILEIO"); 66 m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO", "WII IPC FILEIO");
67 m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER"); 67 m_Log[LogTypes::RENDER] = new LogContainer("RENDER", "RENDER");
68 m_Log[LogTypes::LCD] = new LogContainer("LCD", "LCD"); 68 m_Log[LogTypes::LCD] = new LogContainer("LCD", "LCD");
69 m_Log[LogTypes::SVC] = new LogContainer("SVC", "Supervisor Call"); 69 m_Log[LogTypes::SVC] = new LogContainer("SVC", "Supervisor Call HLE");
70 m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA"); 70 m_Log[LogTypes::NDMA] = new LogContainer("NDMA", "NDMA");
71 m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation"); 71 m_Log[LogTypes::HLE] = new LogContainer("HLE", "High Level Emulation");
72 m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware"); 72 m_Log[LogTypes::HW] = new LogContainer("HW", "Hardware");