32 changes: 16 additions & 16 deletions Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
View file
Expand Up @@ -163,7 +163,7 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const
}

// Disallow games from turning off all of the LEDs.
// It makes wiimote connection status confusing.
// It makes Wiimote connection status confusing.
if (rpt.first[1] == WM_LEDS)
{
auto& leds_rpt = *reinterpret_cast<wm_leds*>(&rpt.first[2]);
Expand Down Expand Up @@ -195,7 +195,7 @@ bool Wiimote::Read()

if (0 == rpt.second)
{
WARN_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting wiimote %d.", index + 1);
WARN_LOG(WIIMOTE, "Wiimote::IORead failed. Disconnecting Wiimote %d.", index + 1);
Disconnect();
}

Expand Down Expand Up @@ -308,12 +308,12 @@ void Wiimote::EmuStop()

DisableDataReporting();

NOTICE_LOG(WIIMOTE, "Stopping wiimote data reporting");
NOTICE_LOG(WIIMOTE, "Stopping Wiimote data reporting.");
}

unsigned int CalculateWantedWiimotes()
{
// Figure out how many real wiimotes are required
// Figure out how many real Wiimotes are required
unsigned int wanted_wiimotes = 0;
for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] && !g_wiimotes[i])
Expand Down Expand Up @@ -358,13 +358,13 @@ void WiimoteScanner::ThreadFunc()
{
Common::SetCurrentThreadName("Wiimote Scanning Thread");

NOTICE_LOG(WIIMOTE, "Wiimote scanning has started");
NOTICE_LOG(WIIMOTE, "Wiimote scanning has started.");

while (m_run_thread)
{
std::vector<Wiimote*> found_wiimotes;

//NOTICE_LOG(WIIMOTE, "in loop");
//NOTICE_LOG(WIIMOTE, "In loop");

if (m_want_wiimotes)
found_wiimotes = FindWiimotes();
Expand All @@ -374,7 +374,7 @@ void WiimoteScanner::ThreadFunc()
Update();
}

//NOTICE_LOG(WIIMOTE, "after update");
//NOTICE_LOG(WIIMOTE, "After update");

// TODO: this is a fairly lame place for this
CheckForDisconnectedWiimotes();
Expand All @@ -385,7 +385,7 @@ void WiimoteScanner::ThreadFunc()
Common::SleepCurrentThread(500);
}

NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped");
NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped.");
}

void Wiimote::StartThread()
Expand Down Expand Up @@ -485,7 +485,7 @@ void ChangeWiimoteSource(unsigned int index, int source)
DoneWithWiimote(index);
}

// reconnect to emu
// reconnect to the emulator
Host_ConnectWiimote(index, false);
if (WIIMOTE_SRC_EMU & source)
Host_ConnectWiimote(index, true);
Expand All @@ -502,7 +502,7 @@ void TryToConnectWiimote(Wiimote* wm)
{
if (wm->Connect() && wm->Prepare(i))
{
NOTICE_LOG(WIIMOTE, "Connected to wiimote %i.", i + 1);
NOTICE_LOG(WIIMOTE, "Connected to Wiimote %i.", i + 1);

std::swap(g_wiimotes[i], wm);
g_wiimotes[i]->StartThread();
Expand All @@ -528,7 +528,7 @@ void DoneWithWiimote(int index)
{
g_wiimotes[index]->StopThread();

// First see if we can use this real wiimote in another slot.
// First see if we can use this real Wiimote in another slot.
for (unsigned int i = 0; i != MAX_WIIMOTES; ++i)
{
if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]
Expand All @@ -546,7 +546,7 @@ void DoneWithWiimote(int index)
}
}

// else, just disconnect the wiimote
// else, just disconnect the Wiimote
HandleWiimoteDisconnect(index);
}

Expand All @@ -563,7 +563,7 @@ void HandleWiimoteDisconnect(int index)
if (wm)
{
delete wm;
NOTICE_LOG(WIIMOTE, "Disconnected wiimote %i.", index + 1);
NOTICE_LOG(WIIMOTE, "Disconnected Wiimote %i.", index + 1);
}
}

Expand All @@ -583,15 +583,15 @@ void Refresh()

if (0 != CalculateWantedWiimotes())
{
// Don't hang dolphin when searching
// Don't hang Dolphin when searching
lk.unlock();
found_wiimotes = g_wiimote_scanner.FindWiimotes();
lk.lock();
}

CheckForDisconnectedWiimotes();

// Brief rumble for already connected wiimotes.
// Brief rumble for already connected Wiimotes.
for (int i = 0; i != MAX_WIIMOTES; ++i)
{
if (g_wiimotes[i])
Expand Down Expand Up @@ -633,7 +633,7 @@ void Update(int _WiimoteNumber)
if (g_wiimotes[_WiimoteNumber])
g_wiimotes[_WiimoteNumber]->Update();

// Wiimote::Update() may remove the wiimote if it was disconnected.
// Wiimote::Update() may remove the Wiimote if it was disconnected.
if (!g_wiimotes[_WiimoteNumber])
{
Host_ConnectWiimote(_WiimoteNumber, false);
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
View file
Expand Up @@ -523,7 +523,7 @@ void ExecuteCommand(u32 _Address)
if (CmdSuccess)
{
// Ensure replies happen in order, fairly ugly
// Without this, tons of games fail now that DI commads have different reply delays
// Without this, tons of games fail now that DI commands have different reply delays
int reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0;

const s64 ticks_til_last_reply = last_reply_time - CoreTiming::GetTicks();
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
View file
Expand Up @@ -186,7 +186,7 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
{
if (m_Mode == ISFS_OPEN_WRITE)
{
WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to read 0x%x bytes to 0x%08x on write-only file %s", Size, Address, m_Name.c_str());
WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to read 0x%x bytes to 0x%08x on a write-only file %s", Size, Address, m_Name.c_str());
}
else
{
Expand Down Expand Up @@ -225,7 +225,7 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress)
{
if (m_Mode == ISFS_OPEN_READ)
{
WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to write 0x%x bytes from 0x%08x to read-only file %s", Size, Address, m_Name.c_str());
WARN_LOG(WII_IPC_FILEIO, "FileIO: Attempted to write 0x%x bytes from 0x%08x to a read-only file %s", Size, Address, m_Name.c_str());
}
else
{
Expand Down
14 changes: 7 additions & 7 deletions Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
View file
Expand Up @@ -112,7 +112,7 @@ bool CWII_IPC_HLE_Device_es::Open(u32 _CommandAddress, u32 _Mode)

Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
if (m_Active)
INFO_LOG(WII_IPC_ES, "Device was ReOpened");
INFO_LOG(WII_IPC_ES, "Device was re-opened.");
m_Active = true;
return true;
}
Expand Down Expand Up @@ -777,14 +777,14 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
{
//TODO: fixme
// The following is obviously a hack
// Lie to mem about loading a different ios
// Lie to mem about loading a different IOS
// someone with an affected game should test
IOSv = TitleID & 0xffff;
}
if (!bSuccess && IOSv >= 30 && IOSv != 0xffff)
{
PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload ios or a title that is not available in your nand dump\n"
"TitleID %016llx.\n Dolphin will likely hang now", TitleID);
PanicAlertT("IOCTL_ES_LAUNCH: Game tried to reload an IOS or a title that is not available in your NAND dump\n"
"TitleID %016llx.\n Dolphin will likely hang now.", TitleID);
}
else
{
Expand Down Expand Up @@ -835,8 +835,8 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)

case IOCTL_ES_CHECKKOREAREGION: //note by DacoTaco : name is unknown, i just tried to name it SOMETHING
//IOS70 has this to let system menu 4.2 check if the console is region changed. it returns -1017
//if the IOS didn't find the korean keys and 0 if it does. 0 leads to a error 003
WARN_LOG(WII_IPC_ES,"IOCTL_ES_CHECKKOREAREGION: Title Checked for korean Keys");
//if the IOS didn't find the Korean keys and 0 if it does. 0 leads to a error 003
WARN_LOG(WII_IPC_ES,"IOCTL_ES_CHECKKOREAREGION: Title checked for Korean keys.");
Memory::Write_U32(ES_PARAMTER_SIZE_OR_ALIGNMENT , _CommandAddress + 0x4);
return true;

Expand Down Expand Up @@ -952,7 +952,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
{
File::IOFile _pTMDFile(tmdPath, "wb");
if (!_pTMDFile.WriteBytes(_pTMD, _sz))
ERROR_LOG(WII_IPC_ES, "DIVerify failed to write disc tmd to nand");
ERROR_LOG(WII_IPC_ES, "DIVerify failed to write disc TMD to NAND.");
}
DiscIO::cUIDsys::AccessInstance().AddTitle(tmdTitleID);
return 0;
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View file
Expand Up @@ -136,7 +136,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
if ((CommandBuffer.InBuffer.size() == 1) && (CommandBuffer.PayloadBuffer.size() == 1))
{
size_t numFile = FileSearch.GetFileNames().size();
INFO_LOG(WII_IPC_FILEIO, "\t%lu Files found", (unsigned long)numFile);
INFO_LOG(WII_IPC_FILEIO, "\t%lu files found", (unsigned long)numFile);

Memory::Write_U32((u32)numFile, CommandBuffer.PayloadBuffer[0].m_Address);
}
Expand Down Expand Up @@ -227,7 +227,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
fsBlocks = 0;
iNodes = 0;
ReturnValue = FS_RESULT_OK;
WARN_LOG(WII_IPC_FILEIO, "FS: fsBlock failed, cannot find directoy: %s", path.c_str());
WARN_LOG(WII_IPC_FILEIO, "FS: fsBlock failed, cannot find directory: %s", path.c_str());
}

Memory::Write_U32(fsBlocks, CommandBuffer.PayloadBuffer[0].m_Address);
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
View file
Expand Up @@ -158,7 +158,7 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress)
break;

case IOCTL_SENDCMD:
INFO_LOG(WII_IPC_SD, "IOCTL_SENDCMD %x ipc:%08x",
INFO_LOG(WII_IPC_SD, "IOCTL_SENDCMD %x IPC:%08x",
Memory::Read_U32(BufferIn), _CommandAddress);
ReturnValue = ExecuteCommand(BufferIn, BufferInSize, 0, 0, BufferOut, BufferOutSize);
break;
Expand Down Expand Up @@ -242,7 +242,7 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtlV(u32 _CommandAddress)
break;

default:
ERROR_LOG(WII_IPC_SD, "unknown SD IOCtlV command 0x%08x", CommandBuffer.Parameter);
ERROR_LOG(WII_IPC_SD, "Unknown SD IOCtlV command 0x%08x", CommandBuffer.Parameter);
break;
}

Expand Down
12 changes: 6 additions & 6 deletions Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View file
Expand Up @@ -422,7 +422,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::AddEventToQueue(const SQueuedEvent& _e
else
{
DEBUG_LOG(WII_IPC_WIIMOTE, "HCI endpoint not currently valid, "
"queueing(%lu)...", (unsigned long)m_EventQueue.size());
"queuing(%lu)...", (unsigned long)m_EventQueue.size());
m_EventQueue.push_back(_event);
}
}
Expand All @@ -431,7 +431,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
{
bool packet_transferred = false;

// check hci queue
// check HCI queue
if (!m_EventQueue.empty() && m_HCIEndpoint.IsValid())
{
// an endpoint has become available, and we have a stored response.
Expand All @@ -450,7 +450,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
packet_transferred = true;
}

// check acl queue
// check ACL queue
if (!m_acl_pool.IsEmpty() && m_ACLEndpoint.IsValid() && m_EventQueue.empty())
{
m_acl_pool.WriteToEndpoint(m_ACLEndpoint);
Expand Down Expand Up @@ -517,7 +517,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::Store(const u8* data, const u
}

_dbg_assert_msg_(WII_IPC_WIIMOTE,
size < m_acl_pkt_size, "acl packet too large for pool");
size < m_acl_pkt_size, "ACL packet too large for pool");

m_queue.push_back(Packet());
auto& packet = m_queue.back();
Expand Down Expand Up @@ -602,7 +602,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryResponse()
pResponse->page_scan_mode = 0;
pResponse->clock_offset = 0x3818;

INFO_LOG(WII_IPC_WIIMOTE, "Event: Send Fake Inquriy of one controller");
INFO_LOG(WII_IPC_WIIMOTE, "Event: Send Fake Inquiry of one controller");
INFO_LOG(WII_IPC_WIIMOTE, " bd: %02x:%02x:%02x:%02x:%02x:%02x",
pResponse->bdaddr.b[0], pResponse->bdaddr.b[1], pResponse->bdaddr.b[2],
pResponse->bdaddr.b[3], pResponse->bdaddr.b[4], pResponse->bdaddr.b[5]);
Expand Down Expand Up @@ -1778,7 +1778,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadBufferSize(u8* _Input)
hci_read_buffer_size_rp Reply;
Reply.status = 0x00;
Reply.max_acl_size = m_acl_pkt_size;
// Due to how the widcomm stack which nintendo uses is coded, we must never
// Due to how the widcomm stack which Nintendo uses is coded, we must never
// let the stack think the controller is buffering more than 10 data packets
// - it will cause a u8 underflow and royally screw things up.
Reply.num_acl_pkts = m_acl_pkts_num;
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
View file
Expand Up @@ -227,7 +227,7 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesQWERTY[256] = {
0x55, // Multiply
0x57, // Add
0x00, // Separator
0x56, // Substract
0x56, // Subtract
0x63, // Decimal
0x54, // Divide
// F1 -> F12
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
View file
Expand Up @@ -306,7 +306,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction _inst)
DisassembleGekko(Memory::ReadUnchecked_U32(last_pc), last_pc, disasm, 256);
NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm);
Dolphin_Debugger::PrintCallstack();
_dbg_assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instr %08x at PC = %08x last_PC = %08x LR = %08x\n", _inst.hex, PC, last_pc, LR);
_dbg_assert_msg_(POWERPC, 0, "\nIntCPU: Unknown instruction %08x at PC = %08x last_PC = %08x LR = %08x\n", _inst.hex, PC, last_pc, LR);
}

}
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
View file
Expand Up @@ -679,7 +679,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
{
char ppcInst[256];
DisassembleGekko(ops[i].inst.hex, em_address, ppcInst, 256);
NOTICE_LOG(DYNA_REC, "Unflushed reg: %s", ppcInst);
NOTICE_LOG(DYNA_REC, "Unflushed register: %s", ppcInst);
}
#endif
if (js.skipnext) {
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
View file
Expand Up @@ -171,14 +171,14 @@ void cInterfaceWGL::Shutdown()
NOTICE_LOG(VIDEO, "Could not release drawing context.");

if (!wglDeleteContext(hRC))
ERROR_LOG(VIDEO, "Release Rendering Context Failed.");
ERROR_LOG(VIDEO, "Attempt to release rendering context failed.");

hRC = NULL;
}

if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC))
{
ERROR_LOG(VIDEO, "Release Device Context Failed.");
ERROR_LOG(VIDEO, "Attempt to release device context failed.");
hDC = NULL;
}
}
Expand Down
4 changes: 2 additions & 2 deletions Source/Core/DolphinWX/Src/Main.cpp
View file
Expand Up @@ -218,7 +218,7 @@ bool DolphinApp::OnInit()
RegisterMsgAlertHandler(&wxMsgAlert);
RegisterStringTranslator(&wxStringTranslator);

// "ExtendedTrace" looks freakin dangerous!!!
// "ExtendedTrace" looks freakin' dangerous!!!
#ifdef _WIN32
EXTENDEDTRACEINITIALIZE(".");
SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter);
Expand All @@ -239,7 +239,7 @@ bool DolphinApp::OnInit()
#ifdef __APPLE__
if (floor(NSAppKitVersionNumber) < NSAppKitVersionNumber10_7)
{
PanicAlertT("Hi,\n\nDolphin requires OS X 10.7 or greater.\n"
PanicAlertT("Hi,\n\nDolphin requires Mac OS X 10.7 or greater.\n"
"Unfortunately you're running an old version of OS X.\n"
"The last Dolphin version to support OS X 10.6 is Dolphin 3.5\n"
"Please upgrade to 10.7 or greater to use the newest Dolphin version.\n\n"
Expand Down
2 changes: 1 addition & 1 deletion Source/Core/VideoCommon/Src/XFStructs.cpp
View file
Expand Up @@ -212,7 +212,7 @@ void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
// do not allow writes past registers
if (baseAddress + transferSize > 0x1058)
{
INFO_LOG(VIDEO, "xf load exceeds address space: %x %d bytes\n", baseAddress, transferSize);
INFO_LOG(VIDEO, "XF load exceeds address space: %x %d bytes\n", baseAddress, transferSize);

if (baseAddress >= 0x1058)
transferSize = 0;
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
View file
Expand Up @@ -234,7 +234,7 @@ void VertexManager::vFlush()
PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
}
else
ERROR_LOG(VIDEO, "error loading texture");
ERROR_LOG(VIDEO, "Error loading texture");
}
}

Expand Down