piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gdbstub' into wii-network

Browse Source 
Conflicts:
	Source/Core/Core/Src/ConfigManager.cpp
This commit is contained in:
Matthew Parlane
2013-01-08 21:21:05 +13:00
parent 5b96fb766f 936b047b12
commit e8624cc0f2
12 changed files with 1066 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/Common/Src/Log.h
View File

@ -44,6 +44,7 @@ enum LOG_TYPE {
DVDINTERFACE,
DYNA_REC,
EXPANSIONINTERFACE,
GDB_STUB,
POWERPC,
GPFIFO,
OSHLE,

1
Source/Core/Common/Src/LogManager.cpp
View File

@ -57,6 +57,7 @@ LogManager::LogManager()
m_Log[LogTypes::DVDINTERFACE] = new LogContainer("DVD", "DVDInterface");
m_Log[LogTypes::GPFIFO] = new LogContainer("GP", "GPFifo");
m_Log[LogTypes::EXPANSIONINTERFACE] = new LogContainer("EXI", "ExpansionInt");
m_Log[LogTypes::GDB_STUB] = new LogContainer("GDB_STUB", "GDB Stub");
m_Log[LogTypes::AUDIO_INTERFACE] = new LogContainer("AI", "AudioInt");
m_Log[LogTypes::POWERPC] = new LogContainer("PowerPC", "IBM CPU");
m_Log[LogTypes::OSHLE] = new LogContainer("HLE", "HLE");