diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-10-06 15:49:20 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-10-06 15:49:20 +0000 |
| commit | 4c22bea4d47f4d0cf1b31b9d4e02178ecb7bccd7 (patch) | |
| tree | b66dd41898197b3be87748402f073a067db0e565 /Source/Core/Common | |
| parent | 19b8e6bc08774ecd292fddbd70b0b80eb26cae60 (diff) | |
Add ability to use Reset (reset button interrupt, still figuring out the other reset modes)
Add support for button combos that are built-in to controllers:
y+x+start for three seconds updates the origin
b+x+start for three seconds resets
Changed CPeripheralInterface to a namespace and renamed to ProcessorInterface
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4366 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/ConsoleListener.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/Log.h | 2 | ||||
| -rw-r--r-- | Source/Core/Common/Src/LogManager.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/Common/Src/ConsoleListener.cpp b/Source/Core/Common/Src/ConsoleListener.cpp index e16afb13f3..87f69c86e9 100644 --- a/Source/Core/Common/Src/ConsoleListener.cpp +++ b/Source/Core/Common/Src/ConsoleListener.cpp @@ -229,7 +229,7 @@ void ConsoleListener::PixelSpace(int Left, int Top, int Width, int Height, bool int BytesWritten = 0; DWORD cAttrWritten = 0; - for (int i = 0; i < Attr.size(); i++) + for (size_t i = 0; i < Attr.size(); i++) { if (!WriteConsoleOutputCharacter(hConsole, Str[i], ReadBufferSize, coordScreen, &cCharsWritten)) SLog += StringFromFormat("WriteConsoleOutputCharacter error"); diff --git a/Source/Core/Common/Src/Log.h b/Source/Core/Common/Src/Log.h index a00b993ed5..ac79e2e24e 100644 --- a/Source/Core/Common/Src/Log.h +++ b/Source/Core/Common/Src/Log.h @@ -52,7 +52,7 @@ enum LOG_TYPE { MEMCARD_MANAGER, OSREPORT, PAD, - PERIPHERALINTERFACE, + PROCESSORINTERFACE, PIXELENGINE, SERIALINTERFACE, SP1, diff --git a/Source/Core/Common/Src/LogManager.cpp b/Source/Core/Common/Src/LogManager.cpp index 66b36d4b6f..8af3d103c6 100644 --- a/Source/Core/Common/Src/LogManager.cpp +++ b/Source/Core/Common/Src/LogManager.cpp @@ -40,7 +40,7 @@ LogManager::LogManager() : logMutex(1) { m_Log[LogTypes::COMMANDPROCESSOR] = new LogContainer("CP", "CommandProc"); m_Log[LogTypes::VIDEOINTERFACE] = new LogContainer("VI", "VideoInt"); m_Log[LogTypes::SERIALINTERFACE] = new LogContainer("SI", "SerialInt"); - m_Log[LogTypes::PERIPHERALINTERFACE]= new LogContainer("PI", "PeripheralInt"); + m_Log[LogTypes::PROCESSORINTERFACE] = new LogContainer("PI", "ProcessorInt"); m_Log[LogTypes::MEMMAP] = new LogContainer("MI", "MI & memmap"); m_Log[LogTypes::SP1] = new LogContainer("SP1", "Serial Port 1"); m_Log[LogTypes::STREAMINGINTERFACE] = new LogContainer("Stream", "StreamingInt"); |