diff --git a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp index e4c81e4a7a..8e954f8988 100644 --- a/Source/Core/Core/Src/DSP/DSPHWInterface.cpp +++ b/Source/Core/Core/Src/DSP/DSPHWInterface.cpp @@ -318,11 +318,11 @@ static void gdsp_do_dma() if (len > 0x4000) { - ERROR_LOG(DSPLLE, "DMA ERROR pc: %04x ctl: %04x addr: %08x da: %04x size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len); + ERROR_LOG(DSPLLE, "DMA ERROR: PC: %04x, Control: %04x, Address: %08x, DSP Address: %04x, Size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len); exit(0); } #if defined(_DEBUG) || defined(DEBUGFAST) - DEBUG_LOG(DSPLLE, "DMA pc: %04x ctl: %04x addr: %08x da: %04x size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len); + DEBUG_LOG(DSPLLE, "DMA pc: %04x, Control: %04x, Address: %08x, DSP Address: %04x, Size: %04x", g_dsp.pc, ctl, addr, dsp_addr, len); #endif switch (ctl & 0x3) { diff --git a/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp b/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp index 1cbced0713..7a56c2618f 100644 --- a/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp +++ b/Source/Core/Core/Src/DSP/DSPMemoryMap.cpp @@ -52,7 +52,7 @@ u16 dsp_dmem_read(u16 addr) return g_dsp.dram[addr & DSP_DRAM_MASK]; case 0x1: // 1xxx COEF - DEBUG_LOG(DSPLLE, "%04x : Coef Read @ %04x", g_dsp.pc, addr); + DEBUG_LOG(DSPLLE, "%04x : Coefficient Read @ %04x", g_dsp.pc, addr); return g_dsp.coef[addr & DSP_COEF_MASK]; case 0xf: // Fxxx HW regs diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp index 81ef7c6482..0983591988 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp @@ -243,7 +243,7 @@ void CUCode_AX::HandleCommandList() } default: - ERROR_LOG(DSPHLE, "Unknown command in AX cmdlist: %04x", cmd); + ERROR_LOG(DSPHLE, "Unknown command in AX command list: %04x", cmd); end = true; break; } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp index f4effbba6d..377c044054 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp @@ -173,7 +173,7 @@ bool CUCode_AXWii::AXTask(u32& _uMail) { u16 iCommand = HLEMemory_Read_U16(uAddress); uAddress += 2; - //NOTICE_LOG(DSPHLE,"AXWII - AXLIST CMD %X",iCommand); + //NOTICE_LOG(DSPHLE,"AXWII - AXLIST Command %X",iCommand); switch (iCommand) { @@ -245,7 +245,7 @@ bool CUCode_AXWii::AXTask(u32& _uMail) break; default: - INFO_LOG(DSPHLE,"DSPHLE - AXwii - AXLIST - Unknown CMD: %x",iCommand); + INFO_LOG(DSPHLE,"DSPHLE - AXwii - AXLIST - Unknown Command: %x",iCommand); // unknown command so stop the execution of this TaskList bExecuteList = false; break; diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp index dcd4e24e3f..c29cf9e536 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_CARD.cpp @@ -48,11 +48,11 @@ void CUCode_CARD::HandleMail(u32 _uMail) { if (_uMail == 0xFF000000) // unlock card { - // m_Mails.push(0x00000001); // ACK (actualy anything != 0) + // m_Mails.push(0x00000001); // ACK (actually anything != 0) } else { - DEBUG_LOG(DSPHLE, "CUCode_CARD - unknown cmd: %x", _uMail); + DEBUG_LOG(DSPHLE, "CUCode_CARD - unknown command: %x", _uMail); } m_rMailHandler.PushMail(DSP_DONE); diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp index 42bc18ff49..00fef067ff 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_GBA.cpp @@ -122,8 +122,8 @@ void CUCode_GBA::HandleMail(u32 _uMail) *(u32*)HLEMemory_Get_Pointer(sec_params.dest_addr+4) = Common::swap32((x22 << 16) | x23); // Done! - DEBUG_LOG(DSPHLE, "\n%08x -> key %08x len %08x dest_addr %08x unk1 %08x unk2 %08x" - " 22 %04x 23 %04x", + DEBUG_LOG(DSPHLE, "\n%08x -> key: %08x, len: %08x, dest_addr: %08x, unk1: %08x, unk2: %08x" + " 22: %04x, 23: %04x", mramaddr, *(u32*)sec_params.key, sec_params.length, sec_params.dest_addr, *(u32*)sec_params.unk1, *(u32*)sec_params.unk2, @@ -143,12 +143,12 @@ void CUCode_GBA::HandleMail(u32 _uMail) m_DSPHLE->SetUCode(UCODE_ROM); break; default: - DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown 0xcdd1 cmd: %08x", _uMail); + DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown 0xcdd1 command: %08x", _uMail); break; } } else { - DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown cmd: %08x", _uMail); + DEBUG_LOG(DSPHLE, "CUCode_GBA - unknown command: %08x", _uMail); } } diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp index 89d0d6dcb2..dc2f20dda1 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda.cpp @@ -445,7 +445,7 @@ void CUCode_Zelda::ExecuteList() Sync = CmdMail >> 16; DEBUG_LOG(DSPHLE, "=============================================================================="); - DEBUG_LOG(DSPHLE, "Zelda UCode - execute dlist (cmd: 0x%04x : sync: 0x%04x)", Command, Sync); + DEBUG_LOG(DSPHLE, "Zelda UCode - execute dlist (command: 0x%04x : sync: 0x%04x)", Command, Sync); switch (Command) { @@ -545,7 +545,7 @@ void CUCode_Zelda::ExecuteList() // default ... zelda ww jumps to 0x0043 default: - PanicAlert("Zelda UCode - unknown cmd: %x (size %i)", Command, m_numSteps); + PanicAlert("Zelda UCode - unknown command: %x (size %i)", Command, m_numSteps); break; } diff --git a/Source/Core/Core/Src/HW/EXI_Channel.cpp b/Source/Core/Core/Src/HW/EXI_Channel.cpp index f31fc59b3f..e3f4562f73 100644 --- a/Source/Core/Core/Src/HW/EXI_Channel.cpp +++ b/Source/Core/Core/Src/HW/EXI_Channel.cpp @@ -180,13 +180,13 @@ void CEXIChannel::Read32(u32& _uReturnValue, const u32 _iRegister) _uReturnValue = 0xDEADBEEF; } - DEBUG_LOG(EXPANSIONINTERFACE, "(r32) 0x%08x channel: %i reg: %s", + DEBUG_LOG(EXPANSIONINTERFACE, "(r32) 0x%08x channel: %i register: %s", _uReturnValue, m_ChannelId, Debug_GetRegisterName(_iRegister)); } void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister) { - DEBUG_LOG(EXPANSIONINTERFACE, "(w32) 0x%08x channel: %i reg: %s", + DEBUG_LOG(EXPANSIONINTERFACE, "(w32) 0x%08x channel: %i register: %s", _iValue, m_ChannelId, Debug_GetRegisterName(_iRegister)); switch (_iRegister) @@ -222,17 +222,17 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister) break; case EXI_DMAADDR: - INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAAddr, chan %i", m_ChannelId); + INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAAddr, channel %i", m_ChannelId); m_DMAMemoryAddress = _iValue; break; case EXI_DMALENGTH: - INFO_LOG(EXPANSIONINTERFACE, "Wrote DMALength, chan %i", m_ChannelId); + INFO_LOG(EXPANSIONINTERFACE, "Wrote DMALength, channel %i", m_ChannelId); m_DMALength = _iValue; break; case EXI_DMACONTROL: - INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAControl, chan %i", m_ChannelId); + INFO_LOG(EXPANSIONINTERFACE, "Wrote DMAControl, channel %i", m_ChannelId); m_Control.Hex = _iValue; if (m_Control.TSTART) @@ -274,7 +274,7 @@ void CEXIChannel::Write32(const u32 _iValue, const u32 _iRegister) break; case EXI_IMMDATA: - INFO_LOG(EXPANSIONINTERFACE, "Wrote IMMData, chan %i", m_ChannelId); + INFO_LOG(EXPANSIONINTERFACE, "Wrote IMMData, channel %i", m_ChannelId); m_ImmData = _iValue; break; } diff --git a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp index 762c87a7d4..4318379e04 100644 --- a/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/Src/HW/EXI_DeviceAMBaseboard.cpp @@ -111,7 +111,7 @@ void CEXIAMBaseboard::TransferByte(u8& _byte) _byte = m_have_irq ? 0xFF : 0; break; default: - _dbg_assert_msg_(SP1, 0, "Unknown AM-BB cmd"); + _dbg_assert_msg_(SP1, 0, "Unknown AM-BB command"); break; } } diff --git a/Source/Core/Core/Src/HW/ProcessorInterface.cpp b/Source/Core/Core/Src/HW/ProcessorInterface.cpp index affc4b7e79..a419f2e8a2 100644 --- a/Source/Core/Core/Src/HW/ProcessorInterface.cpp +++ b/Source/Core/Core/Src/HW/ProcessorInterface.cpp @@ -202,7 +202,7 @@ void Write32(const u32 _uValue, const u32 _iAddress) break; case PI_FLIPPER_UNK: - DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to unknown PI reg %08x", _uValue, _iAddress); + DEBUG_LOG(PROCESSORINTERFACE, "Write %08x to unknown PI register %08x", _uValue, _iAddress); break; default: diff --git a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp index 89ccacb93a..ec8a41e56e 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp @@ -143,7 +143,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) { case 0x10: { - DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 10, %02x (READ STATUS&SWITCHES)", ptr(1)); + DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 10, %02x (READ STATUS&SWITCHES)", ptr(1)); SPADStatus PadStatus; memset(&PadStatus, 0 ,sizeof(PadStatus)); Pad::GetStatus(ISIDevice::m_iDeviceNumber, &PadStatus); @@ -161,13 +161,13 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) break; } case 0x12: - ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 12, %02x %02x", ptr(1), ptr(2)); + ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 12, %02x %02x", ptr(1), ptr(2)); res[resp++] = 0x12; res[resp++] = 0x00; break; case 0x11: { - ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 11, %02x (READ SERIAL NR)", ptr(1)); + ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 11, %02x (READ SERIAL NR)", ptr(1)); char string[] = "AADE-01A14964511"; res[resp++] = 0x11; res[resp++] = 0x10; @@ -183,7 +183,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) res[resp++] = 0x29; // FIRM VERSION break; case 0x16: - ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 16, %02x (READ FPGA VERSION)", ptr(1)); + ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 16, %02x (READ FPGA VERSION)", ptr(1)); res[resp++] = 0x16; res[resp++] = 0x02; res[resp++] = 0x07; @@ -196,7 +196,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) break; case 0x1f: { - ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 1f, %02x %02x %02x %02x %02x (REGION)", ptr(1), ptr(2), ptr(3), ptr(4), ptr(5)); + ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 1f, %02x %02x %02x %02x %02x (REGION)", ptr(1), ptr(2), ptr(3), ptr(4), ptr(5)); unsigned char string[] = "\x00\x00\x30\x00" //"\x01\xfe\x00\x00" // JAPAN @@ -211,14 +211,14 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) break; } case 0x31: - ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 31 (UNKNOWN)"); + ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 31 (UNKNOWN)"); res[resp++] = 0x31; res[resp++] = 0x02; res[resp++] = 0x00; res[resp++] = 0x00; break; case 0x32: - ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 32 (UNKNOWN)"); + ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 32 (UNKNOWN)"); res[resp++] = 0x32; res[resp++] = 0x02; res[resp++] = 0x00; @@ -241,7 +241,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) case 0x4e: case 0x4f: { - DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD %02x, %02x %02x %02x %02x %02x %02x %02x (JVS IO)", + DEBUG_LOG(AMBASEBOARDDEBUG, "GC-AM: Command %02x, %02x %02x %02x %02x %02x %02x %02x (JVS IO)", ptr(0), ptr(1), ptr(2), ptr(3), ptr(4), ptr(5), ptr(6), ptr(7)); int pptr = 2; JVSIOMessage msg; @@ -262,7 +262,7 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) { int cmd = *jvs_io++; - DEBUG_LOG(AMBASEBOARDDEBUG, "JVS IO, node=%d, cmd=%02x", node, cmd); + DEBUG_LOG(AMBASEBOARDDEBUG, "JVS IO, node=%d, command=%02x", node, cmd); switch (cmd) { @@ -391,10 +391,10 @@ int CSIDevice_AMBaseboard::RunBuffer(u8* _pBuffer, int _iLength) break; } case 0x60: - ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD 60, %02x %02x %02x", ptr(1), ptr(2), ptr(3)); + ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command 60, %02x %02x %02x", ptr(1), ptr(2), ptr(3)); break; default: - ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: CMD %02x (unknown) %02x %02x %02x %02x %02x", ptr(0), ptr(1), ptr(2), ptr(3), ptr(4), ptr(5)); + ERROR_LOG(AMBASEBOARDDEBUG, "GC-AM: Command %02x (unknown) %02x %02x %02x %02x %02x", ptr(0), ptr(1), ptr(2), ptr(3), ptr(4), ptr(5)); break; } p += ptr(1) + 2; diff --git a/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp b/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp index 3818c5bd12..7a9a9a3484 100644 --- a/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp +++ b/Source/Core/Core/Src/HW/SI_DeviceGBA.cpp @@ -107,7 +107,7 @@ void GBASockServer::Transfer(char* si_buffer) else client.Send(current_data, 1); - DEBUG_LOG(SERIALINTERFACE, "> cmd %02x %02x%02x%02x%02x", + DEBUG_LOG(SERIALINTERFACE, "> command %02x %02x%02x%02x%02x", (u8)current_data[0], (u8)current_data[1], (u8)current_data[2], (u8)current_data[3], (u8)current_data[4]); diff --git a/Source/Core/Core/Src/HW/VideoInterface.cpp b/Source/Core/Core/Src/HW/VideoInterface.cpp index 25d37629e9..fc4b888549 100644 --- a/Source/Core/Core/Src/HW/VideoInterface.cpp +++ b/Source/Core/Core/Src/HW/VideoInterface.cpp @@ -407,11 +407,11 @@ void Read16(u16& _uReturnValue, const u32 _iAddress) case VI_UNK_AA_REG_HI: _uReturnValue = (m_UnkAARegister & 0xffff0000) >> 16; - WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA reg, not sure what it does :)"); + WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA register, not sure what it does :)"); break; case VI_UNK_AA_REG_LO: _uReturnValue = m_UnkAARegister & 0x0000ffff; - WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA reg, not sure what it does :)"); + WARN_LOG(VIDEOINTERFACE, "(r16) unknown AA register, not sure what it does :)"); break; case VI_CLOCK: @@ -659,11 +659,11 @@ void Write16(const u16 _iValue, const u32 _iAddress) case VI_UNK_AA_REG_HI: m_UnkAARegister = (m_UnkAARegister & 0x0000ffff) | (u32)(_iValue << 16); - WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA reg, not sure what it does :)"); + WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA register, not sure what it does :)"); break; case VI_UNK_AA_REG_LO: m_UnkAARegister = (m_UnkAARegister & 0xffff0000) | _iValue; - WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA reg, not sure what it does :)"); + WARN_LOG(VIDEOINTERFACE, "(w16) to unknown AA register, not sure what it does :)"); break; case VI_CLOCK: @@ -686,7 +686,7 @@ void Write16(const u16 _iValue, const u32 _iAddress) break; default: - ERROR_LOG(VIDEOINTERFACE, "(w16) %04x to unknown reg %x", _iValue, _iAddress & 0xfff); + ERROR_LOG(VIDEOINTERFACE, "(w16) %04x to unknown register %x", _iValue, _iAddress & 0xfff); break; } } @@ -812,7 +812,7 @@ static void BeginField(FieldType field) static const char* const fieldTypeNames[] = { "Progressive", "Upper", "Lower" }; - DEBUG_LOG(VIDEOINTERFACE, "(VI->BeginField): addr: %.08X | FieldSteps %u | FbSteps %u | ACV %u | Field %s", + DEBUG_LOG(VIDEOINTERFACE, "(VI->BeginField): Address: %.08X | FieldSteps %u | FbSteps %u | ACV %u | Field %s", xfbAddr, m_HorizontalStepping.FieldSteps, m_HorizontalStepping.FbSteps, m_VerticalTimingRegister.ACV, fieldTypeNames[field] ); diff --git a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp index 5710fd4f25..f9df271248 100644 --- a/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp +++ b/Source/Core/Core/Src/HW/WiimoteEmu/EmuSubroutines.cpp @@ -360,7 +360,7 @@ void Wiimote::WriteData(const wm_write_data* const wd) /* TODO? if (region_ptr == &m_reg_speaker) { - ERROR_LOG(WIIMOTE, "Write to speaker reg %x %s", address, + ERROR_LOG(WIIMOTE, "Write to speaker register %x %s", address, ArrayToString(wd->data, wd->size, 100, false).c_str()); } */ @@ -511,7 +511,7 @@ void Wiimote::ReadData(const wm_read_data* const rd) break; default : - PanicAlert("WmReadData: unimplemented parameters (size: %i, addr: 0x%x)!", size, rd->space); + PanicAlert("WmReadData: unimplemented parameters (size: %i, address: 0x%x)!", size, rd->space); break; } diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp index d4a9e2436c..a4007a4b4c 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_DI.cpp @@ -223,7 +223,7 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 } else { - INFO_LOG(WII_IPC_DVD, "DVDLowRead: file unkw - (DVDAddr: 0x%llx, Size: 0x%x)", + INFO_LOG(WII_IPC_DVD, "DVDLowRead: file unknown - (DVDAddr: 0x%llx, Size: 0x%x)", DVDAddress, Size); } } @@ -360,7 +360,7 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 } else { - INFO_LOG(WII_IPC_DVD, "DVDLowSeek: file unkw - (DVDAddr: 0x%llx)", + INFO_LOG(WII_IPC_DVD, "DVDLowSeek: file unknown - (DVDAddr: 0x%llx)", DVDAddress); } } @@ -446,15 +446,15 @@ u32 CWII_IPC_HLE_Device_di::ExecuteCommand(u32 _BufferIn, u32 _BufferInSize, u32 // but it seems we don't need to implement anything case 0x95: case 0x96: - WARN_LOG(WII_IPC_DVD, "Unimplemented cmd 0x%08x (Buffer 0x%08x, 0x%x)", + WARN_LOG(WII_IPC_DVD, "Unimplemented command 0x%08x (Buffer 0x%08x, 0x%x)", Command, _BufferOut, _BufferOutSize); break; default: - ERROR_LOG(WII_IPC_DVD, "Unknown cmd 0x%08x (Buffer 0x%08x, 0x%x)", + ERROR_LOG(WII_IPC_DVD, "Unknown command 0x%08x (Buffer 0x%08x, 0x%x)", Command, _BufferOut, _BufferOutSize); - PanicAlertT("Unknown cmd 0x%08x", Command); + PanicAlertT("Unknown command 0x%08x", Command); break; } @@ -497,7 +497,7 @@ int CWII_IPC_HLE_Device_di::GetCmdDelay(u32 _CommandAddress) // case DVDLowReset: // case DVDLowClosePartition: default: - // ranom numbers here! + // random numbers here! // More than ~1/2000th of a second hangs DKCR with DSP HLE, maybe. return SystemTimers::GetTicksPerSecond() / 15000; break; diff --git a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp index f539cecde7..39a6c28873 100644 --- a/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp +++ b/Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp @@ -314,7 +314,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) } } - INFO_LOG(WII_IPC_ES, "IOCTL_ES_READCONTENT: CFD %x, Addr 0x%x, Size %i -> stream pos %i (Index %i)", CFD, Addr, Size, rContent.m_Position, rContent.m_pContent->m_Index); + INFO_LOG(WII_IPC_ES, "IOCTL_ES_READCONTENT: CFD %x, Address 0x%x, Size %i -> stream pos %i (Index %i)", CFD, Addr, Size, rContent.m_Position, rContent.m_pContent->m_Index); Memory::Write_U32(Size, _CommandAddress + 0x4); return true; @@ -365,7 +365,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) break; } - INFO_LOG(WII_IPC_ES, "IOCTL_ES_SEEKCONTENT: CFD %x, Addr 0x%x, Mode %i -> Pos %i", CFD, Addr, Mode, rContent.m_Position); + INFO_LOG(WII_IPC_ES, "IOCTL_ES_SEEKCONTENT: CFD %x, Address 0x%x, Mode %i -> Pos %i", CFD, Addr, Mode, rContent.m_Position); Memory::Write_U32(rContent.m_Position, _CommandAddress + 0x4); return true; @@ -575,7 +575,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID); - INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x buffersize: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount); + INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETTMDVIEWCNT: title: %08x/%08x buffer size: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount); if (Loader.IsValid()) { @@ -682,7 +682,7 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress) const DiscIO::INANDContentLoader& Loader = AccessContentDevice(TitleID); - INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMD: title: %08x/%08x buffersize: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount); + INFO_LOG(WII_IPC_ES, "IOCTL_ES_GETSTOREDTMD: title: %08x/%08x buffer size: %i", (u32)(TitleID >> 32), (u32)TitleID, MaxCount); if (Loader.IsValid() && Buffer.NumberPayloadBuffer) {