added a HW option to logging

author: bunnei 2014-04-04 22:53:34 -0400
committer: bunnei 2014-04-04 22:53:34 -0400
commit: 006bb834dfa48c111e7310b4490ef1eaa55dbe12 (patch)
tree: 5e8384d46f79bf5f45ce6971b1c52632b4e28c16 /src
parent: renamed some functions (diff)
download: yuzu-006bb834dfa48c111e7310b4490ef1eaa55dbe12.tar.gz
yuzu-006bb834dfa48c111e7310b4490ef1eaa55dbe12.tar.xz
yuzu-006bb834dfa48c111e7310b4490ef1eaa55dbe12.zip
2 files changed, 48 insertions, 48 deletions
diff --git a/src/common/src/log.h b/src/common/src/log.h
index 9b2da5016..e1d82d387 100644
--- a/src/common/src/log.h
+++ b/src/common/src/log.h
@@ -59,7 +59,7 @@ enum LOG_TYPE {
    WII_IPC_SSL,
    WII_IPC_SD,
    WII_IPC_STM,
-    WII_IPC_WIIMOTE,
+    HW,
    TIME,
    NETPLAY,
diff --git a/src/common/src/log_manager.cpp b/src/common/src/log_manager.cpp
index 8c8828e8c..6e98cfcce 100644
--- a/src/common/src/log_manager.cpp
+++ b/src/common/src/log_manager.cpp
@@ -29,53 +29,53 @@ LogManager *LogManager::m_logManager = NULL;
 LogManager::LogManager()
 {
    // create log files
-    m_Log[LogTypes::MASTER_LOG]            = new LogContainer("*",                "Master Log");
+    m_Log[LogTypes::MASTER_LOG]         = new LogContainer("*",                 "Master Log");
-    m_Log[LogTypes::BOOT]                = new LogContainer("BOOT",            "Boot");
+    m_Log[LogTypes::BOOT]               = new LogContainer("BOOT",              "Boot");
-    m_Log[LogTypes::COMMON]                = new LogContainer("COMMON",        "Common");
+    m_Log[LogTypes::COMMON]             = new LogContainer("COMMON",            "Common");
-    m_Log[LogTypes::DISCIO]                = new LogContainer("DIO",            "Disc IO");
+    m_Log[LogTypes::DISCIO]             = new LogContainer("DIO",               "Disc IO");
-    m_Log[LogTypes::FILEMON]            = new LogContainer("FileMon",        "File Monitor");
+    m_Log[LogTypes::FILEMON]            = new LogContainer("FileMon",           "File Monitor");
-    m_Log[LogTypes::PAD]                = new LogContainer("PAD",            "Pad");
+    m_Log[LogTypes::PAD]                = new LogContainer("PAD",               "Pad");
-    m_Log[LogTypes::PIXELENGINE]        = new LogContainer("PE",            "PixelEngine");
+    m_Log[LogTypes::PIXELENGINE]        = new LogContainer("PE",                "PixelEngine");
-    m_Log[LogTypes::COMMANDPROCESSOR]    = new LogContainer("CP",            "CommandProc");
+    m_Log[LogTypes::COMMANDPROCESSOR]   = new LogContainer("CP",                "CommandProc");
-    m_Log[LogTypes::VIDEOINTERFACE]        = new LogContainer("VI",            "VideoInt");
+    m_Log[LogTypes::VIDEOINTERFACE]     = new LogContainer("VI",                "VideoInt");
-    m_Log[LogTypes::SERIALINTERFACE]    = new LogContainer("SI",            "SerialInt");
+    m_Log[LogTypes::SERIALINTERFACE]    = new LogContainer("SI",                "SerialInt");
-    m_Log[LogTypes::PROCESSORINTERFACE]    = new LogContainer("PI",            "ProcessorInt");
+    m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI",                "ProcessorInt");
-    m_Log[LogTypes::MEMMAP]                = new LogContainer("MI",            "MI & memmap");
+    m_Log[LogTypes::MEMMAP]             = new LogContainer("MI",                "MI & memmap");
-    m_Log[LogTypes::SP1]                = new LogContainer("SP1",            "Serial Port 1");
+    m_Log[LogTypes::SP1]                = new LogContainer("SP1",               "Serial Port 1");
-    m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream",        "StreamingInt");
+    m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream",            "StreamingInt");
-    m_Log[LogTypes::DSPINTERFACE]        = new LogContainer("DSP",            "DSPInterface");
+    m_Log[LogTypes::DSPINTERFACE]       = new LogContainer("DSP",               "DSPInterface");
-    m_Log[LogTypes::DVDINTERFACE]        = new LogContainer("DVD",            "DVDInterface");
+    m_Log[LogTypes::DVDINTERFACE]       = new LogContainer("DVD",               "DVDInterface");
-    m_Log[LogTypes::GPFIFO]                = new LogContainer("GP",            "GPFifo");
+    m_Log[LogTypes::GPFIFO]             = new LogContainer("GP",                "GPFifo");
-    m_Log[LogTypes::EXPANSIONINTERFACE]    = new LogContainer("EXI",            "ExpansionInt");
+    m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI",               "ExpansionInt");
-    m_Log[LogTypes::GDB_STUB]            = new LogContainer("GDB_STUB",        "GDB Stub");
+    m_Log[LogTypes::GDB_STUB]           = new LogContainer("GDB_STUB",          "GDB Stub");
-    m_Log[LogTypes::AUDIO_INTERFACE]    = new LogContainer("AI",            "AudioInt");
+    m_Log[LogTypes::AUDIO_INTERFACE]    = new LogContainer("AI",                "AudioInt");
-    m_Log[LogTypes::ARM11]                = new LogContainer("ARM11",            "ARM11");
+    m_Log[LogTypes::ARM11]              = new LogContainer("ARM11",             "ARM11");
-    m_Log[LogTypes::OSHLE]                = new LogContainer("HLE",            "HLE");
+    m_Log[LogTypes::OSHLE]              = new LogContainer("HLE",               "HLE");
-    m_Log[LogTypes::DSPHLE]                = new LogContainer("DSPHLE",        "DSP HLE");
+    m_Log[LogTypes::DSPHLE]             = new LogContainer("DSPHLE",            "DSP HLE");
-    m_Log[LogTypes::DSPLLE]                = new LogContainer("DSPLLE",        "DSP LLE");
+    m_Log[LogTypes::DSPLLE]             = new LogContainer("DSPLLE",            "DSP LLE");
-    m_Log[LogTypes::DSP_MAIL]            = new LogContainer("DSPMails",        "DSP Mails");
+    m_Log[LogTypes::DSP_MAIL]           = new LogContainer("DSPMails",          "DSP Mails");
-    m_Log[LogTypes::VIDEO]                = new LogContainer("Video",            "Video Backend");
+    m_Log[LogTypes::VIDEO]              = new LogContainer("Video",             "Video Backend");
-    m_Log[LogTypes::AUDIO]                = new LogContainer("Audio",            "Audio Emulator");
+    m_Log[LogTypes::AUDIO]              = new LogContainer("Audio",             "Audio Emulator");
-    m_Log[LogTypes::DYNA_REC]            = new LogContainer("JIT",            "Dynamic Recompiler");
+    m_Log[LogTypes::DYNA_REC]           = new LogContainer("JIT",               "JIT");
-    m_Log[LogTypes::CONSOLE]            = new LogContainer("CONSOLE",        "Dolphin Console");
+    m_Log[LogTypes::CONSOLE]            = new LogContainer("CONSOLE",           "Dolphin Console");
-    m_Log[LogTypes::OSREPORT]            = new LogContainer("OSREPORT",        "OSReport");
+    m_Log[LogTypes::OSREPORT]           = new LogContainer("OSREPORT",          "OSReport");
-    m_Log[LogTypes::TIME]                = new LogContainer("Time",            "Core Timing");
+    m_Log[LogTypes::TIME]               = new LogContainer("Time",              "Core Timing");
-    m_Log[LogTypes::LOADER]                = new LogContainer("Loader",        "Loader");
+    m_Log[LogTypes::LOADER]             = new LogContainer("Loader",            "Loader");
-    m_Log[LogTypes::FILESYS]            = new LogContainer("FileSys",        "File System");
+    m_Log[LogTypes::FILESYS]            = new LogContainer("FileSys",           "File System");
-    m_Log[LogTypes::WII_IPC_HID]        = new LogContainer("WII_IPC_HID",    "WII IPC HID");
+    m_Log[LogTypes::WII_IPC_HID]        = new LogContainer("WII_IPC_HID",       "WII IPC HID");
-    m_Log[LogTypes::WII_IPC_HLE]        = new LogContainer("WII_IPC_HLE",    "WII IPC HLE");
+    m_Log[LogTypes::WII_IPC_HLE]        = new LogContainer("WII_IPC_HLE",       "WII IPC HLE");
-    m_Log[LogTypes::WII_IPC_DVD]        = new LogContainer("WII_IPC_DVD",    "WII IPC DVD");
+    m_Log[LogTypes::WII_IPC_DVD]        = new LogContainer("WII_IPC_DVD",       "WII IPC DVD");
-    m_Log[LogTypes::WII_IPC_ES]            = new LogContainer("WII_IPC_ES",    "WII IPC ES");
+    m_Log[LogTypes::WII_IPC_ES]         = new LogContainer("WII_IPC_ES",        "WII IPC ES");
-    m_Log[LogTypes::WII_IPC_FILEIO]        = new LogContainer("WII_IPC_FILEIO","WII IPC FILEIO");
+    m_Log[LogTypes::WII_IPC_FILEIO]     = new LogContainer("WII_IPC_FILEIO",    "WII IPC FILEIO");
-    m_Log[LogTypes::WII_IPC_SD]            = new LogContainer("WII_IPC_SD",    "WII IPC SD");
+    m_Log[LogTypes::WII_IPC_SD]         = new LogContainer("WII_IPC_SD",        "WII IPC SD");
-    m_Log[LogTypes::WII_IPC_STM]        = new LogContainer("WII_IPC_STM",    "WII IPC STM");
+    m_Log[LogTypes::WII_IPC_STM]        = new LogContainer("WII_IPC_STM",       "WII IPC STM");
-    m_Log[LogTypes::WII_IPC_NET]        = new LogContainer("WII_IPC_NET",    "WII IPC NET");
+    m_Log[LogTypes::WII_IPC_NET]        = new LogContainer("WII_IPC_NET",       "WII IPC NET");
-    m_Log[LogTypes::WII_IPC_WC24]        = new LogContainer("WII_IPC_WC24",    "WII IPC WC24");
+    m_Log[LogTypes::WII_IPC_WC24]       = new LogContainer("WII_IPC_WC24",      "WII IPC WC24");
-    m_Log[LogTypes::WII_IPC_SSL]        = new LogContainer("WII_IPC_SSL",    "WII IPC SSL");
+    m_Log[LogTypes::WII_IPC_SSL]        = new LogContainer("WII_IPC_SSL",       "WII IPC SSL");
-    m_Log[LogTypes::WII_IPC_WIIMOTE]    = new LogContainer("WII_IPC_WIIMOTE","WII IPC WIIMOTE");
+    m_Log[LogTypes::HW]                 = new LogContainer("HARDWARE",          "HARDWARE");
-    m_Log[LogTypes::ACTIONREPLAY]        = new LogContainer("ActionReplay",    "ActionReplay");
+    m_Log[LogTypes::ACTIONREPLAY]       = new LogContainer("ActionReplay",      "ActionReplay");
-    m_Log[LogTypes::MEMCARD_MANAGER]    = new LogContainer("MemCard Manager", "MemCard Manager");
+    m_Log[LogTypes::MEMCARD_MANAGER]    = new LogContainer("MemCard Manager",   "MemCard Manager");
-    m_Log[LogTypes::NETPLAY]            = new LogContainer("NETPLAY",        "Netplay");
+    m_Log[LogTypes::NETPLAY]            = new LogContainer("NETPLAY",           "Netplay");
    m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX).c_str());
    m_consoleLog = new ConsoleListener();
author	bunnei	2014-04-04 22:53:34 -0400
committer	bunnei	2014-04-04 22:53:34 -0400
commit	006bb834dfa48c111e7310b4490ef1eaa55dbe12 (patch)
tree	5e8384d46f79bf5f45ce6971b1c52632b4e28c16 /src
parent	renamed some functions (diff)
download	yuzu-006bb834dfa48c111e7310b4490ef1eaa55dbe12.tar.gz yuzu-006bb834dfa48c111e7310b4490ef1eaa55dbe12.tar.xz yuzu-006bb834dfa48c111e7310b4490ef1eaa55dbe12.zip

diff --git a/src/common/src/log.h b/src/common/src/log.h index 9b2da5016..e1d82d387 100644 --- a/src/common/src/log.h +++ b/src/common/src/log.h
@@ -59,7 +59,7 @@ enum LOG_TYPE {
59	WII_IPC_SSL,	59	WII_IPC_SSL,
60	WII_IPC_SD,	60	WII_IPC_SD,
61	WII_IPC_STM,	61	WII_IPC_STM,
62	WII_IPC_WIIMOTE,	62	HW,
63	TIME,	63	TIME,
64	NETPLAY,	64	NETPLAY,
65		65


diff --git a/src/common/src/log_manager.cpp b/src/common/src/log_manager.cpp index 8c8828e8c..6e98cfcce 100644 --- a/src/common/src/log_manager.cpp +++ b/src/common/src/log_manager.cpp
@@ -29,53 +29,53 @@ LogManager *LogManager::m_logManager = NULL;
29	LogManager::LogManager()	29	LogManager::LogManager()
30	{	30	{
31	// create log files	31	// create log files
32	m_Log[LogTypes::MASTER_LOG] = new LogContainer("*", "Master Log");	32	m_Log[LogTypes::MASTER_LOG] = new LogContainer("*", "Master Log");
33	m_Log[LogTypes::BOOT] = new LogContainer("BOOT", "Boot");	33	m_Log[LogTypes::BOOT] = new LogContainer("BOOT", "Boot");
34	m_Log[LogTypes::COMMON] = new LogContainer("COMMON", "Common");	34	m_Log[LogTypes::COMMON] = new LogContainer("COMMON", "Common");
35	m_Log[LogTypes::DISCIO] = new LogContainer("DIO", "Disc IO");	35	m_Log[LogTypes::DISCIO] = new LogContainer("DIO", "Disc IO");
36	m_Log[LogTypes::FILEMON] = new LogContainer("FileMon", "File Monitor");	36	m_Log[LogTypes::FILEMON] = new LogContainer("FileMon", "File Monitor");
37	m_Log[LogTypes::PAD] = new LogContainer("PAD", "Pad");	37	m_Log[LogTypes::PAD] = new LogContainer("PAD", "Pad");
38	m_Log[LogTypes::PIXELENGINE] = new LogContainer("PE", "PixelEngine");	38	m_Log[LogTypes::PIXELENGINE] = new LogContainer("PE", "PixelEngine");
39	m_Log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc");	39	m_Log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc");
40	m_Log[LogTypes::VIDEOINTERFACE] = new LogContainer("VI", "VideoInt");	40	m_Log[LogTypes::VIDEOINTERFACE] = new LogContainer("VI", "VideoInt");
41	m_Log[LogTypes::SERIALINTERFACE] = new LogContainer("SI", "SerialInt");	41	m_Log[LogTypes::SERIALINTERFACE] = new LogContainer("SI", "SerialInt");
42	m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI", "ProcessorInt");	42	m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI", "ProcessorInt");
43	m_Log[LogTypes::MEMMAP] = new LogContainer("MI", "MI & memmap");	43	m_Log[LogTypes::MEMMAP] = new LogContainer("MI", "MI & memmap");
44	m_Log[LogTypes::SP1] = new LogContainer("SP1", "Serial Port 1");	44	m_Log[LogTypes::SP1] = new LogContainer("SP1", "Serial Port 1");
45	m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream", "StreamingInt");	45	m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream", "StreamingInt");
46	m_Log[LogTypes::DSPINTERFACE] = new LogContainer("DSP", "DSPInterface");	46	m_Log[LogTypes::DSPINTERFACE] = new LogContainer("DSP", "DSPInterface");
47	m_Log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVDInterface");	47	m_Log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVDInterface");
48	m_Log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo");	48	m_Log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo");
49	m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "ExpansionInt");	49	m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "ExpansionInt");
50	m_Log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub");	50	m_Log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub");
51	m_Log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "AudioInt");	51	m_Log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "AudioInt");
52	m_Log[LogTypes::ARM11] = new LogContainer("ARM11", "ARM11");	52	m_Log[LogTypes::ARM11] = new LogContainer("ARM11", "ARM11");
53	m_Log[LogTypes::OSHLE] = new LogContainer("HLE", "HLE");	53	m_Log[LogTypes::OSHLE] = new LogContainer("HLE", "HLE");
54	m_Log[LogTypes::DSPHLE] = new LogContainer("DSPHLE", "DSP HLE");	54	m_Log[LogTypes::DSPHLE] = new LogContainer("DSPHLE", "DSP HLE");
55	m_Log[LogTypes::DSPLLE] = new LogContainer("DSPLLE", "DSP LLE");	55	m_Log[LogTypes::DSPLLE] = new LogContainer("DSPLLE", "DSP LLE");
56	m_Log[LogTypes::DSP_MAIL] = new LogContainer("DSPMails", "DSP Mails");	56	m_Log[LogTypes::DSP_MAIL] = new LogContainer("DSPMails", "DSP Mails");
57	m_Log[LogTypes::VIDEO] = new LogContainer("Video", "Video Backend");	57	m_Log[LogTypes::VIDEO] = new LogContainer("Video", "Video Backend");
58	m_Log[LogTypes::AUDIO] = new LogContainer("Audio", "Audio Emulator");	58	m_Log[LogTypes::AUDIO] = new LogContainer("Audio", "Audio Emulator");
59	m_Log[LogTypes::DYNA_REC] = new LogContainer("JIT", "Dynamic Recompiler");	59	m_Log[LogTypes::DYNA_REC] = new LogContainer("JIT", "JIT");
60	m_Log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console");	60	m_Log[LogTypes::CONSOLE] = new LogContainer("CONSOLE", "Dolphin Console");
61	m_Log[LogTypes::OSREPORT] = new LogContainer("OSREPORT", "OSReport");	61	m_Log[LogTypes::OSREPORT] = new LogContainer("OSREPORT", "OSReport");
62	m_Log[LogTypes::TIME] = new LogContainer("Time", "Core Timing");	62	m_Log[LogTypes::TIME] = new LogContainer("Time", "Core Timing");
63	m_Log[LogTypes::LOADER] = new LogContainer("Loader", "Loader");	63	m_Log[LogTypes::LOADER] = new LogContainer("Loader", "Loader");
64	m_Log[LogTypes::FILESYS] = new LogContainer("FileSys", "File System");	64	m_Log[LogTypes::FILESYS] = new LogContainer("FileSys", "File System");
65	m_Log[LogTypes::WII_IPC_HID] = new LogContainer("WII_IPC_HID", "WII IPC HID");	65	m_Log[LogTypes::WII_IPC_HID] = new LogContainer("WII_IPC_HID", "WII IPC HID");
66	m_Log[LogTypes::WII_IPC_HLE] = new LogContainer("WII_IPC_HLE", "WII IPC HLE");	66	m_Log[LogTypes::WII_IPC_HLE] = new LogContainer("WII_IPC_HLE", "WII IPC HLE");
67	m_Log[LogTypes::WII_IPC_DVD] = new LogContainer("WII_IPC_DVD", "WII IPC DVD");	67	m_Log[LogTypes::WII_IPC_DVD] = new LogContainer("WII_IPC_DVD", "WII IPC DVD");
68	m_Log[LogTypes::WII_IPC_ES] = new LogContainer("WII_IPC_ES", "WII IPC ES");	68	m_Log[LogTypes::WII_IPC_ES] = new LogContainer("WII_IPC_ES", "WII IPC ES");
69	m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO","WII IPC FILEIO");	69	m_Log[LogTypes::WII_IPC_FILEIO] = new LogContainer("WII_IPC_FILEIO", "WII IPC FILEIO");
70	m_Log[LogTypes::WII_IPC_SD] = new LogContainer("WII_IPC_SD", "WII IPC SD");	70	m_Log[LogTypes::WII_IPC_SD] = new LogContainer("WII_IPC_SD", "WII IPC SD");
71	m_Log[LogTypes::WII_IPC_STM] = new LogContainer("WII_IPC_STM", "WII IPC STM");	71	m_Log[LogTypes::WII_IPC_STM] = new LogContainer("WII_IPC_STM", "WII IPC STM");
72	m_Log[LogTypes::WII_IPC_NET] = new LogContainer("WII_IPC_NET", "WII IPC NET");	72	m_Log[LogTypes::WII_IPC_NET] = new LogContainer("WII_IPC_NET", "WII IPC NET");
73	m_Log[LogTypes::WII_IPC_WC24] = new LogContainer("WII_IPC_WC24", "WII IPC WC24");	73	m_Log[LogTypes::WII_IPC_WC24] = new LogContainer("WII_IPC_WC24", "WII IPC WC24");
74	m_Log[LogTypes::WII_IPC_SSL] = new LogContainer("WII_IPC_SSL", "WII IPC SSL");	74	m_Log[LogTypes::WII_IPC_SSL] = new LogContainer("WII_IPC_SSL", "WII IPC SSL");
75	m_Log[LogTypes::WII_IPC_WIIMOTE] = new LogContainer("WII_IPC_WIIMOTE","WII IPC WIIMOTE");	75	m_Log[LogTypes::HW] = new LogContainer("HARDWARE", "HARDWARE");
76	m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay");	76	m_Log[LogTypes::ACTIONREPLAY] = new LogContainer("ActionReplay", "ActionReplay");
77	m_Log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager");	77	m_Log[LogTypes::MEMCARD_MANAGER] = new LogContainer("MemCard Manager", "MemCard Manager");
78	m_Log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay");	78	m_Log[LogTypes::NETPLAY] = new LogContainer("NETPLAY", "Netplay");
79		79
80	m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX).c_str());	80	m_fileLog = new FileLogListener(File::GetUserPath(F_MAINLOG_IDX).c_str());
81	m_consoleLog = new ConsoleListener();	81	m_consoleLog = new ConsoleListener();