diff --git a/Source/Core/Core/Src/HW/PixelEngine.cpp b/Source/Core/Core/Src/HW/PixelEngine.cpp index 8aab4cd5f8..f44de2e504 100644 --- a/Source/Core/Core/Src/HW/PixelEngine.cpp +++ b/Source/Core/Core/Src/HW/PixelEngine.cpp @@ -179,7 +179,7 @@ void SetToken_OnMainThread(u64 userdata, int cyclesLate) //{ g_bSignalTokenInterrupt = true; //_dbg_assert_msg_(PIXELENGINE, (CommandProcessor::fifo.PEToken == (userdata&0xFFFF)), "WTF? BPMEM_PE_TOKEN_INT_ID's token != BPMEM_PE_TOKEN_ID's token" ); - WARN_LOG(PIXELENGINE, "VIDEO Plugin raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", CommandProcessor::fifo.PEToken); + INFO_LOG(PIXELENGINE, "VIDEO Plugin raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", CommandProcessor::fifo.PEToken); UpdateInterrupts(); //} //else diff --git a/Source/Core/Core/Src/HW/WII_IOB.cpp b/Source/Core/Core/Src/HW/WII_IOB.cpp index aae05b533a..49964e6369 100644 --- a/Source/Core/Core/Src/HW/WII_IOB.cpp +++ b/Source/Core/Core/Src/HW/WII_IOB.cpp @@ -34,7 +34,7 @@ void Read16(u16& _rReturnValue, const u32 _Address) void Read32(u32& _rReturnValue, const u32 _Address) { - switch(_Address & 0xFFFF) + switch (_Address & 0xFFFF) { // NAND Loader ... no idea case 0x018: diff --git a/Source/Core/Core/Src/HW/WII_IPC.cpp b/Source/Core/Core/Src/HW/WII_IPC.cpp index 1d5df7dc73..9d5a2f940b 100644 --- a/Source/Core/Core/Src/HW/WII_IPC.cpp +++ b/Source/Core/Core/Src/HW/WII_IPC.cpp @@ -126,9 +126,7 @@ void Read32(u32& _rReturnValue, const u32 _Address) switch(_Address & 0xFFFF) { case IPC_CONTROL_REGISTER: - _rReturnValue = g_IPC_Control.Hex; - INFO_LOG(WII_IPC, "IOP: Read32 from IPC_CONTROL_REGISTER(0x04) = 0x%08x", _rReturnValue); // if ((REASON_REG & 0x14) == 0x14) CALL IPCReplayHanlder @@ -159,13 +157,13 @@ void Write32(const u32 _Value, const u32 _Address) case IPC_COMMAND_REGISTER: // __ios_Ipc2 ... a value from __responses is loaded { g_Address = _Value; - WARN_LOG(WII_IPC, "IOP: Write32 to IPC_ADDRESS_REGISTER(0x00) = 0x%08x", g_Address); + INFO_LOG(WII_IPC, "IOP: Write32 to IPC_ADDRESS_REGISTER(0x00) = 0x%08x", g_Address); } break; case IPC_CONTROL_REGISTER: { - WARN_LOG(WII_IPC, "IOP: Write32 to IPC_CONTROL_REGISTER(0x04) = 0x%08x (old: 0x%08x)", _Value, g_IPC_Control.Hex); + INFO_LOG(WII_IPC, "IOP: Write32 to IPC_CONTROL_REGISTER(0x04) = 0x%08x (old: 0x%08x)", _Value, g_IPC_Control.Hex); UIPC_Control TempControl(_Value); _dbg_assert_msg_(WII_IPC, TempControl.pad == 0, "IOP: Write to UIPC_Control.pad", _Address); @@ -178,6 +176,7 @@ void Write32(const u32 _Value, const u32 _Address) g_IPC_Control.unk5 = TempControl.unk5; g_IPC_Control.unk6 = TempControl.unk6; g_IPC_Control.pad = TempControl.pad; + if (TempControl.ExecuteCmd) { WII_IPC_HLE_Interface::AckCommand(g_Address); @@ -190,7 +189,7 @@ void Write32(const u32 _Value, const u32 _Address) UIPC_Status NewStatus(_Value); if (NewStatus.INTERRUPT) g_IPC_Status.INTERRUPT = 0; // clear interrupt - WARN_LOG(WII_IPC, "IOP: Write32 to IPC_STATUS_REGISTER(0x30) = 0x%08x", _Value); + INFO_LOG(WII_IPC, "IOP: Write32 to IPC_STATUS_REGISTER(0x30) = 0x%08x", _Value); } break; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp index c50723f0c8..8e86dd9cb5 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp @@ -83,20 +83,20 @@ std::string g_DefaultContentFile; // General IPC functions void Init() { - _dbg_assert_msg_(WII_IPC, g_DeviceMap.empty(), "DeviceMap isnt empty on init"); + _dbg_assert_msg_(WII_IPC, g_DeviceMap.empty(), "DeviceMap isnt empty on init"); } void Reset() { TDeviceMap::const_iterator itr = g_DeviceMap.begin(); - while(itr != g_DeviceMap.end()) + while (itr != g_DeviceMap.end()) { delete itr->second; ++itr; } g_DeviceMap.clear(); - while(!g_ReplyQueue.empty()) + while (!g_ReplyQueue.empty()) { g_ReplyQueue.pop(); } @@ -459,7 +459,7 @@ void ExecuteCommand(u32 _Address) // Write reply, this will later be executed in Update() g_ReplyQueue.push(std::pair(_Address, pDevice->GetDeviceName())); } else { - WARN_LOG(WII_IPC_HLE, "IOP: Reply to unknown device ID (DeviceID=%i)", DeviceID); + ERROR_LOG(WII_IPC_HLE, "IOP: Reply to unknown device ID (DeviceID=%i)", DeviceID); g_ReplyQueue.push(std::pair(_Address, "unknown")); } @@ -513,9 +513,9 @@ void Update() { u32 _Address = g_Ack.front(); g_Ack.pop_front(); - WARN_LOG(WII_IPC_HLE, "-- Exeute Ack (0x%08x)", _Address); + DEBUG_LOG(WII_IPC_HLE, "-- Execute Ack (0x%08x)", _Address); ExecuteCommand(_Address); - WARN_LOG(WII_IPC_HLE, "-- End of ExecuteAck (0x%08x)", _Address); + DEBUG_LOG(WII_IPC_HLE, "-- End of ExecuteAck (0x%08x)", _Address); // Go back to WII_IPC.cpp and generate an acknowledgement WII_IPCInterface::GenerateAck(_Address);