ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some more logging typos and clarifications. Missed these in my last commit. 

This commit mainly elaborates on some messages a little more. Also fixes some typos that slipped through the last commit.

A large change in text can be seen in EXI_DeviceMemoryCard.cpp. I added more info as to why a write to a memory card may fail. (This actually was a reason I was unable to write to a memcard recently).

Elaborations can be seen in WGL.cpp

I did change some comments in some files that I was correcting logging messages in, however this is only if I spot a typo or if an abbreviation is lower-cased. Even in that case, the amount of changes done to comments is very minimal.
This commit is contained in:
Lioncash 2013-04-01 00:10:54 -04:00
parent 5ae8bec2fd
commit 58159a1693
20 changed files with 78 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/AudioCommon/Src/Mixer.h
View File

@ -76,7 +76,7 @@ public:
g_wave_writer.SetSkipSilence(false); g_wave_writer.SetSkipSilence(false);
NOTICE_LOG(DSPHLE, "Starting Audio logging"); NOTICE_LOG(DSPHLE, "Starting Audio logging");
} else { } else {
WARN_LOG(DSPHLE, "Audio logging already started"); WARN_LOG(DSPHLE, "Audio logging has already been started");
} }
} }
@ -86,7 +86,7 @@ public:
g_wave_writer.Stop(); g_wave_writer.Stop();
NOTICE_LOG(DSPHLE, "Stopping Audio logging"); NOTICE_LOG(DSPHLE, "Stopping Audio logging");
} else { } else {
WARN_LOG(DSPHLE, "Audio logging already stopped"); WARN_LOG(DSPHLE, "Audio logging has already been stopped");
} }
} }

8
Source/Core/Common/Src/FileUtil.cpp
View File

@ -124,7 +124,7 @@ bool Delete(const std::string &filename)
// being there, not the actual delete. // being there, not the actual delete.
if (!Exists(filename)) if (!Exists(filename))
{ {
WARN_LOG(COMMON, "Delete: %s does not exists", filename.c_str()); WARN_LOG(COMMON, "Delete: %s does not exist", filename.c_str());
return true; return true;
} }
@ -216,7 +216,7 @@ bool CreateFullPath(const std::string &fullPath)
panicCounter--; panicCounter--;
if (panicCounter <= 0) if (panicCounter <= 0)
{ {
ERROR_LOG(COMMON, "CreateFullPath: directory structure too deep"); ERROR_LOG(COMMON, "CreateFullPath: directory structure is too deep");
return false; return false;
} }
position++; position++;
@ -324,7 +324,7 @@ bool Copy(const std::string &srcFilename, const std::string &destFilename)
goto bail; goto bail;
} }
} }
// close flushs // close files
fclose(input); fclose(input);
fclose(output); fclose(output);
return true; return true;
@ -727,7 +727,7 @@ std::string &GetUserPath(const unsigned int DirIDX, const std::string &newPath)
if (!File::IsDirectory(newPath)) if (!File::IsDirectory(newPath))
{ {
WARN_LOG(COMMON, "Invalid path specified %s, wii user path will be set to default", newPath.c_str()); WARN_LOG(COMMON, "Invalid path specified %s, Wii user path will be set to default", newPath.c_str());
paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR; paths[D_WIIROOT_IDX] = paths[D_USER_IDX] + WII_USER_DIR;
} }
else else

2
Source/Core/Core/Src/HW/DSPLLE/DSPSymbols.cpp
View File

@ -269,7 +269,7 @@ void AutoDisassembly(u16 start_addr, u16 end_addr)
break; break;
} }
//NOTICE_LOG(DSPLLE, "added %04x %i %s", addr, line_counter, buf.c_str()); //NOTICE_LOG(DSPLLE, "Added %04x %i %s", addr, line_counter, buf.c_str());
lines.push_back(buf); lines.push_back(buf);
line_counter++; line_counter++;
} }

24
Source/Core/Core/Src/HW/EXI_DeviceEthernet.cpp
View File

@ -113,7 +113,7 @@ CEXIETHERNET::CEXIETHERNET()
memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, 6); memcpy(&mBbaMem[BBA_NAFR_PAR0], mac_addr, 6);
} }
// hax .. fully established 100BASE-T link // HACK: .. fully established 100BASE-T link
mBbaMem[BBA_NWAYS] = NWAYS_LS100 | NWAYS_LPNWAY | NWAYS_100TXF | NWAYS_ANCLPT; mBbaMem[BBA_NWAYS] = NWAYS_LS100 | NWAYS_LPNWAY | NWAYS_100TXF | NWAYS_ANCLPT;
#if defined(_WIN32) #if defined(_WIN32)
@ -175,7 +175,7 @@ void CEXIETHERNET::ImmWrite(u32 data, u32 size)
if (transfer.address == BBA_IOB && transfer.region == transfer.MX) if (transfer.address == BBA_IOB && transfer.region == transfer.MX)
{ {
ERROR_LOG(SP1, "Usage of BBA_IOB indicates that the rx packet descriptor has been corrupted, killing dolphin..."); ERROR_LOG(SP1, "Usage of BBA_IOB indicates that the rx packet descriptor has been corrupted. Killing Dolphin...");
exit(0); exit(0);
} }
@ -248,7 +248,7 @@ u32 CEXIETHERNET::ImmRead(u32 size)
void CEXIETHERNET::DMAWrite(u32 addr, u32 size) void CEXIETHERNET::DMAWrite(u32 addr, u32 size)
{ {
DEBUG_LOG(SP1, "dma w: %08x %x", addr, size); DEBUG_LOG(SP1, "DMA write: %08x %x", addr, size);
if (transfer.region == transfer.MX && if (transfer.region == transfer.MX &&
transfer.direction == transfer.WRITE && transfer.direction == transfer.WRITE &&
@ -258,7 +258,7 @@ void CEXIETHERNET::DMAWrite(u32 addr, u32 size)
} }
else else
{ {
ERROR_LOG(SP1, "dma w in %s %s mode - not implemented", ERROR_LOG(SP1, "DMA write in %s %s mode - not implemented",
transfer.region == transfer.EXI ? "exi" : "mx", transfer.region == transfer.EXI ? "exi" : "mx",
transfer.direction == transfer.READ ? "read" : "write"); transfer.direction == transfer.READ ? "read" : "write");
} }
@ -266,7 +266,7 @@ void CEXIETHERNET::DMAWrite(u32 addr, u32 size)
void CEXIETHERNET::DMARead(u32 addr, u32 size) void CEXIETHERNET::DMARead(u32 addr, u32 size)
{ {
DEBUG_LOG(SP1, "dma r: %08x %x", addr, size); DEBUG_LOG(SP1, "DMA read: %08x %x", addr, size);
memcpy(Memory::GetPointer(addr), &mBbaMem[transfer.address], size); memcpy(Memory::GetPointer(addr), &mBbaMem[transfer.address], size);
@ -400,16 +400,16 @@ void CEXIETHERNET::MXCommandHandler(u32 data, u32 size)
// Only start transfer if there isn't one currently running // Only start transfer if there isn't one currently running
if (!(mBbaMem[BBA_NCRA] & (NCRA_ST0 | NCRA_ST1))) if (!(mBbaMem[BBA_NCRA] & (NCRA_ST0 | NCRA_ST1)))
{ {
// Technically transfer dma status is kept in TXDMA - not implemented // Technically transfer DMA status is kept in TXDMA - not implemented
if (data & NCRA_ST0) if (data & NCRA_ST0)
{ {
WARN_LOG(SP1, "start tx - local dma"); WARN_LOG(SP1, "start tx - local DMA");
SendFromPacketBuffer(); SendFromPacketBuffer();
} }
else if (data & NCRA_ST1) else if (data & NCRA_ST1)
{ {
DEBUG_LOG(SP1, "start tx - direct fifo"); DEBUG_LOG(SP1, "start tx - direct FIFO");
SendFromDirectFIFO(); SendFromDirectFIFO();
// Kind of a hack: send completes instantly, so we don't // Kind of a hack: send completes instantly, so we don't
// actually write the "send in status" bit to the register // actually write the "send in status" bit to the register
@ -451,7 +451,7 @@ void CEXIETHERNET::DirectFIFOWrite(u8 *data, u32 size)
memcpy(tx_fifo + *tx_fifo_count, data, size); memcpy(tx_fifo + *tx_fifo_count, data, size);
*tx_fifo_count += size; *tx_fifo_count += size;
// TODO not sure this mask is correct. // TODO: not sure this mask is correct.
// However, BBA_TXFIFOCNT should never get even close to this amount, // However, BBA_TXFIFOCNT should never get even close to this amount,
// so it shouldn't matter // so it shouldn't matter
*tx_fifo_count &= (1 << 12) - 1; *tx_fifo_count &= (1 << 12) - 1;
@ -464,7 +464,7 @@ void CEXIETHERNET::SendFromDirectFIFO()
void CEXIETHERNET::SendFromPacketBuffer() void CEXIETHERNET::SendFromPacketBuffer()
{ {
ERROR_LOG(SP1, "tx packet buffer not implemented"); ERROR_LOG(SP1, "tx packet buffer not implemented.");
} }
void CEXIETHERNET::SendComplete() void CEXIETHERNET::SendComplete()
@ -484,7 +484,7 @@ void CEXIETHERNET::SendComplete()
inline u8 CEXIETHERNET::HashIndex(u8 *dest_eth_addr) inline u8 CEXIETHERNET::HashIndex(u8 *dest_eth_addr)
{ {
// Calculate crc // Calculate CRC
u32 crc = 0xffffffff; u32 crc = 0xffffffff;
for (size_t byte_num = 0; byte_num < 6; ++byte_num) for (size_t byte_num = 0; byte_num < 6; ++byte_num)
@ -601,7 +601,7 @@ bool CEXIETHERNET::RecvHandlePacket()
if (AUTORCVR) if (AUTORCVR)
discard bad packet discard bad packet
else else
inc MPC instad of recving packets inc MPC instead of receiving packets
*/ */
status |= DESC_FO | DESC_BF; status |= DESC_FO | DESC_BF;
mBbaMem[BBA_IR] |= mBbaMem[BBA_IMR] & INT_RBF; mBbaMem[BBA_IR] |= mBbaMem[BBA_IMR] & INT_RBF;

14
Source/Core/Core/Src/HW/EXI_DeviceMemoryCard.cpp
View File

@ -40,7 +40,7 @@
void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate) void CEXIMemoryCard::FlushCallback(u64 userdata, int cyclesLate)
{ {
// note that userdata is forbidden to be a pointer, due to the implemenation of EventDoState // note that userdata is forbidden to be a pointer, due to the implementation of EventDoState
int card_index = (int)userdata; int card_index = (int)userdata;
CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARD, card_index); CEXIMemoryCard* pThis = (CEXIMemoryCard*)ExpansionInterface::FindDevice(EXIDEVICE_MEMORYCARD, card_index);
if (pThis) if (pThis)
@ -86,7 +86,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index)
//0x00000510 16Mb "bigben" card //0x00000510 16Mb "bigben" card
//card_id = 0xc243; //card_id = 0xc243;
card_id = 0xc221; // It's a nintendo brand memcard card_id = 0xc221; // It's a Nintendo brand memcard
File::IOFile pFile(m_strFilename, "rb"); File::IOFile pFile(m_strFilename, "rb");
if (pFile) if (pFile)
@ -110,7 +110,7 @@ CEXIMemoryCard::CEXIMemoryCard(const int index)
memory_card_content = new u8[memory_card_size]; memory_card_content = new u8[memory_card_size];
GCMemcard::Format(memory_card_content, m_strFilename.find(".JAP.raw") != std::string::npos, nintendo_card_id); GCMemcard::Format(memory_card_content, m_strFilename.find(".JAP.raw") != std::string::npos, nintendo_card_id);
memset(memory_card_content+MC_HDR_SIZE, 0xFF, memory_card_size-MC_HDR_SIZE); memset(memory_card_content+MC_HDR_SIZE, 0xFF, memory_card_size-MC_HDR_SIZE);
WARN_LOG(EXPANSIONINTERFACE, "No memory card found. Will create new."); WARN_LOG(EXPANSIONINTERFACE, "No memory card found. Will create a new one.");
} }
SetCardFlashID(memory_card_content, card_index); SetCardFlashID(memory_card_content, card_index);
} }
@ -130,7 +130,9 @@ void innerFlush(FlushData* data)
if (!pFile) // Note - pFile changed inside above if if (!pFile) // Note - pFile changed inside above if
{ {
PanicAlertT("Could not write memory card file %s.\n\n" PanicAlertT("Could not write memory card file %s.\n\n"
"Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?", data->filename.c_str()); "Are you running Dolphin from a CD/DVD, or is the save file maybe write protected?\n\n"
"Are you receiving this after moving the emulator directory?\nIf so, then you may "
"need to re-specify your memory card location in the options.", data->filename.c_str());
return; return;
} }
@ -337,11 +339,11 @@ void CEXIMemoryCard::TransferByte(u8 &byte)
{ {
case cmdNintendoID: case cmdNintendoID:
// //
// nintendo card: // Nintendo card:
// 00 | 80 00 00 00 10 00 00 00 // 00 | 80 00 00 00 10 00 00 00
// "bigben" card: // "bigben" card:
// 00 | ff 00 00 05 10 00 00 00 00 00 00 00 00 00 00 // 00 | ff 00 00 05 10 00 00 00 00 00 00 00 00 00 00
// we do it the nintendo way. // we do it the Nintendo way.
if (m_uPosition == 1) if (m_uPosition == 1)
byte = 0x80; // dummy cycle byte = 0x80; // dummy cycle
else else

12
Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
View File

@ -333,7 +333,7 @@ bool Wiimote::Connect()
/* /*
if (!SetThreadPriority(m_wiimote_thread.native_handle(), THREAD_PRIORITY_TIME_CRITICAL)) if (!SetThreadPriority(m_wiimote_thread.native_handle(), THREAD_PRIORITY_TIME_CRITICAL))
{ {
ERROR_LOG(WIIMOTE, "Failed to set wiimote thread priority"); ERROR_LOG(WIIMOTE, "Failed to set Wiimote thread priority");
} }
*/ */
#ifdef SHARE_WRITE_WIIMOTES #ifdef SHARE_WRITE_WIIMOTES
@ -386,7 +386,7 @@ int Wiimote::IORead(u8* buf)
{ {
// Timeout - cancel and continue // Timeout - cancel and continue
if (*buf) if (*buf)
WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem (timeout is %i ms).", WARN_LOG(WIIMOTE, "Packet ignored. This may indicate a problem (timeout is %i ms).",
WIIMOTE_DEFAULT_TIMEOUT); WIIMOTE_DEFAULT_TIMEOUT);
CancelIo(dev_handle); CancelIo(dev_handle);
@ -394,14 +394,14 @@ int Wiimote::IORead(u8* buf)
} }
else if (WAIT_FAILED == r) else if (WAIT_FAILED == r)
{ {
WARN_LOG(WIIMOTE, "A wait error occurred on reading from wiimote %i.", index + 1); WARN_LOG(WIIMOTE, "A wait error occurred on reading from Wiimote %i.", index + 1);
bytes = 0; bytes = 0;
} }
else if (WAIT_OBJECT_0 == r) else if (WAIT_OBJECT_0 == r)
{ {
if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, TRUE)) if (!GetOverlappedResult(dev_handle, &hid_overlap_read, &bytes, TRUE))
{ {
WARN_LOG(WIIMOTE, "GetOverlappedResult failed on wiimote %i.", index + 1); WARN_LOG(WIIMOTE, "GetOverlappedResult failed on Wiimote %i.", index + 1);
bytes = 0; bytes = 0;
} }
} }
@ -468,7 +468,7 @@ int Wiimote::IOWrite(const u8* buf, int len)
if (err == 121) if (err == 121)
{ {
// Semaphore timeout // Semaphore timeout
NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to wiimote"); NOTICE_LOG(WIIMOTE, "WiimoteIOWrite[MSBT_STACK_MS]: Unable to send data to the Wiimote");
} }
else else
{ {
@ -647,7 +647,7 @@ bool ForgetWiimote(BLUETOOTH_DEVICE_INFO_STRUCT& btdi)
{ {
// Make Windows forget about device so it will re-find it if visible. // Make Windows forget about device so it will re-find it if visible.
// This is also required to detect a disconnect for some reason.. // This is also required to detect a disconnect for some reason..
NOTICE_LOG(WIIMOTE, "Removing remembered wiimote."); NOTICE_LOG(WIIMOTE, "Removing remembered Wiimote.");
Bth_BluetoothRemoveDevice(&btdi.Address); Bth_BluetoothRemoveDevice(&btdi.Address);
return true; return true;
} }

32
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
View File

@ -163,7 +163,7 @@ void Wiimote::InterruptChannel(const u16 channel, const void* const _data, const
} }
// Disallow games from turning off all of the LEDs. // 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) if (rpt.first[1] == WM_LEDS)
{ {
auto& leds_rpt = *reinterpret_cast<wm_leds*>(&rpt.first[2]); auto& leds_rpt = *reinterpret_cast<wm_leds*>(&rpt.first[2]);
@ -195,7 +195,7 @@ bool Wiimote::Read()
if (0 == rpt.second) 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(); Disconnect();
} }
@ -308,12 +308,12 @@ void Wiimote::EmuStop()
DisableDataReporting(); DisableDataReporting();
NOTICE_LOG(WIIMOTE, "Stopping wiimote data reporting"); NOTICE_LOG(WIIMOTE, "Stopping Wiimote data reporting.");
} }
unsigned int CalculateWantedWiimotes() unsigned int CalculateWantedWiimotes()
{ {
// Figure out how many real wiimotes are required // Figure out how many real Wiimotes are required
unsigned int wanted_wiimotes = 0; unsigned int wanted_wiimotes = 0;
for (unsigned int i = 0; i < MAX_WIIMOTES; ++i) for (unsigned int i = 0; i < MAX_WIIMOTES; ++i)
if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] && !g_wiimotes[i]) if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] && !g_wiimotes[i])
@ -358,13 +358,13 @@ void WiimoteScanner::ThreadFunc()
{ {
Common::SetCurrentThreadName("Wiimote Scanning Thread"); Common::SetCurrentThreadName("Wiimote Scanning Thread");
NOTICE_LOG(WIIMOTE, "Wiimote scanning has started"); NOTICE_LOG(WIIMOTE, "Wiimote scanning has started.");
while (m_run_thread) while (m_run_thread)
{ {
std::vector<Wiimote*> found_wiimotes; std::vector<Wiimote*> found_wiimotes;
//NOTICE_LOG(WIIMOTE, "in loop"); //NOTICE_LOG(WIIMOTE, "In loop");
if (m_want_wiimotes) if (m_want_wiimotes)
found_wiimotes = FindWiimotes(); found_wiimotes = FindWiimotes();
@ -374,7 +374,7 @@ void WiimoteScanner::ThreadFunc()
Update(); Update();
} }
//NOTICE_LOG(WIIMOTE, "after update"); //NOTICE_LOG(WIIMOTE, "After update");
// TODO: this is a fairly lame place for this // TODO: this is a fairly lame place for this
CheckForDisconnectedWiimotes(); CheckForDisconnectedWiimotes();
@ -385,7 +385,7 @@ void WiimoteScanner::ThreadFunc()
Common::SleepCurrentThread(500); Common::SleepCurrentThread(500);
} }
NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped"); NOTICE_LOG(WIIMOTE, "Wiimote scanning has stopped.");
} }
void Wiimote::StartThread() void Wiimote::StartThread()
@ -485,7 +485,7 @@ void ChangeWiimoteSource(unsigned int index, int source)
DoneWithWiimote(index); DoneWithWiimote(index);
} }
// reconnect to emu // reconnect to the emulator
Host_ConnectWiimote(index, false); Host_ConnectWiimote(index, false);
if (WIIMOTE_SRC_EMU & source) if (WIIMOTE_SRC_EMU & source)
Host_ConnectWiimote(index, true); Host_ConnectWiimote(index, true);
@ -502,7 +502,7 @@ void TryToConnectWiimote(Wiimote* wm)
{ {
if (wm->Connect() && wm->Prepare(i)) 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); std::swap(g_wiimotes[i], wm);
g_wiimotes[i]->StartThread(); g_wiimotes[i]->StartThread();
@ -528,7 +528,7 @@ void DoneWithWiimote(int index)
{ {
g_wiimotes[index]->StopThread(); 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) for (unsigned int i = 0; i != MAX_WIIMOTES; ++i)
{ {
if (WIIMOTE_SRC_REAL & g_wiimote_sources[i] if (WIIMOTE_SRC_REAL & g_wiimote_sources[i]
@ -546,7 +546,7 @@ void DoneWithWiimote(int index)
} }
} }
// else, just disconnect the wiimote // else, just disconnect the Wiimote
HandleWiimoteDisconnect(index); HandleWiimoteDisconnect(index);
} }
@ -563,7 +563,7 @@ void HandleWiimoteDisconnect(int index)
if (wm) if (wm)
{ {
delete wm; delete wm;
NOTICE_LOG(WIIMOTE, "Disconnected wiimote %i.", index + 1); NOTICE_LOG(WIIMOTE, "Disconnected Wiimote %i.", index + 1);
} }
} }
@ -583,7 +583,7 @@ void Refresh()
if (0 != CalculateWantedWiimotes()) if (0 != CalculateWantedWiimotes())
{ {
// Don't hang dolphin when searching // Don't hang Dolphin when searching
lk.unlock(); lk.unlock();
found_wiimotes = g_wiimote_scanner.FindWiimotes(); found_wiimotes = g_wiimote_scanner.FindWiimotes();
lk.lock(); lk.lock();
@ -591,7 +591,7 @@ void Refresh()
CheckForDisconnectedWiimotes(); CheckForDisconnectedWiimotes();
// Brief rumble for already connected wiimotes. // Brief rumble for already connected Wiimotes.
for (int i = 0; i != MAX_WIIMOTES; ++i) for (int i = 0; i != MAX_WIIMOTES; ++i)
{ {
if (g_wiimotes[i]) if (g_wiimotes[i])
@ -633,7 +633,7 @@ void Update(int _WiimoteNumber)
if (g_wiimotes[_WiimoteNumber]) if (g_wiimotes[_WiimoteNumber])
g_wiimotes[_WiimoteNumber]->Update(); 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]) if (!g_wiimotes[_WiimoteNumber])
{ {
Host_ConnectWiimote(_WiimoteNumber, false); Host_ConnectWiimote(_WiimoteNumber, false);

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
View File

@ -523,7 +523,7 @@ void ExecuteCommand(u32 _Address)
if (CmdSuccess) if (CmdSuccess)
{ {
// Ensure replies happen in order, fairly ugly // 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; int reply_delay = pDevice ? pDevice->GetCmdDelay(_Address) : 0;
const s64 ticks_til_last_reply = last_reply_time - CoreTiming::GetTicks(); const s64 ticks_til_last_reply = last_reply_time - CoreTiming::GetTicks();

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
View File

@ -186,7 +186,7 @@ bool CWII_IPC_HLE_Device_FileIO::Read(u32 _CommandAddress)
{ {
if (m_Mode == ISFS_OPEN_WRITE) 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 else
{ {
@ -225,7 +225,7 @@ bool CWII_IPC_HLE_Device_FileIO::Write(u32 _CommandAddress)
{ {
if (m_Mode == ISFS_OPEN_READ) 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 else
{ {

14
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
View File

@ -112,7 +112,7 @@ bool CWII_IPC_HLE_Device_es::Open(u32 _CommandAddress, u32 _Mode)
Memory::Write_U32(GetDeviceID(), _CommandAddress+4); Memory::Write_U32(GetDeviceID(), _CommandAddress+4);
if (m_Active) if (m_Active)
INFO_LOG(WII_IPC_ES, "Device was ReOpened"); INFO_LOG(WII_IPC_ES, "Device was re-opened.");
m_Active = true; m_Active = true;
return true; return true;
} }
@ -777,14 +777,14 @@ bool CWII_IPC_HLE_Device_es::IOCtlV(u32 _CommandAddress)
{ {
//TODO: fixme //TODO: fixme
// The following is obviously a hack // 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 // someone with an affected game should test
IOSv = TitleID & 0xffff; IOSv = TitleID & 0xffff;
} }
if (!bSuccess && IOSv >= 30 && IOSv != 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" 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); "TitleID %016llx.\n Dolphin will likely hang now.", TitleID);
} }
else else
{ {
@ -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 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 //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 //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"); WARN_LOG(WII_IPC_ES,"IOCTL_ES_CHECKKOREAREGION: Title checked for Korean keys.");
Memory::Write_U32(ES_PARAMTER_SIZE_OR_ALIGNMENT , _CommandAddress + 0x4); Memory::Write_U32(ES_PARAMTER_SIZE_OR_ALIGNMENT , _CommandAddress + 0x4);
return true; return true;
@ -952,7 +952,7 @@ u32 CWII_IPC_HLE_Device_es::ES_DIVerify(u8* _pTMD, u32 _sz)
{ {
File::IOFile _pTMDFile(tmdPath, "wb"); File::IOFile _pTMDFile(tmdPath, "wb");
if (!_pTMDFile.WriteBytes(_pTMD, _sz)) 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); DiscIO::cUIDsys::AccessInstance().AddTitle(tmdTitleID);
return 0; return 0;

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View File

@ -136,7 +136,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
if ((CommandBuffer.InBuffer.size() == 1) && (CommandBuffer.PayloadBuffer.size() == 1)) if ((CommandBuffer.InBuffer.size() == 1) && (CommandBuffer.PayloadBuffer.size() == 1))
{ {
size_t numFile = FileSearch.GetFileNames().size(); 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); Memory::Write_U32((u32)numFile, CommandBuffer.PayloadBuffer[0].m_Address);
} }
@ -227,7 +227,7 @@ bool CWII_IPC_HLE_Device_fs::IOCtlV(u32 _CommandAddress)
fsBlocks = 0; fsBlocks = 0;
iNodes = 0; iNodes = 0;
ReturnValue = FS_RESULT_OK; 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); Memory::Write_U32(fsBlocks, CommandBuffer.PayloadBuffer[0].m_Address);

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_sdio_slot0.cpp
View File

@ -158,7 +158,7 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtl(u32 _CommandAddress)
break; break;
case IOCTL_SENDCMD: 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); Memory::Read_U32(BufferIn), _CommandAddress);
ReturnValue = ExecuteCommand(BufferIn, BufferInSize, 0, 0, BufferOut, BufferOutSize); ReturnValue = ExecuteCommand(BufferIn, BufferInSize, 0, 0, BufferOut, BufferOutSize);
break; break;
@ -242,7 +242,7 @@ bool CWII_IPC_HLE_Device_sdio_slot0::IOCtlV(u32 _CommandAddress)
break; break;
default: 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; break;
} }

12
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.cpp
View File

@ -422,7 +422,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::AddEventToQueue(const SQueuedEvent& _e
else else
{ {
DEBUG_LOG(WII_IPC_WIIMOTE, "HCI endpoint not currently valid, " 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); m_EventQueue.push_back(_event);
} }
} }
@ -431,7 +431,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
{ {
bool packet_transferred = false; bool packet_transferred = false;
// check hci queue // check HCI queue
if (!m_EventQueue.empty() && m_HCIEndpoint.IsValid()) if (!m_EventQueue.empty() && m_HCIEndpoint.IsValid())
{ {
// an endpoint has become available, and we have a stored response. // an endpoint has become available, and we have a stored response.
@ -450,7 +450,7 @@ u32 CWII_IPC_HLE_Device_usb_oh1_57e_305::Update()
packet_transferred = true; packet_transferred = true;
} }
// check acl queue // check ACL queue
if (!m_acl_pool.IsEmpty() && m_ACLEndpoint.IsValid() && m_EventQueue.empty()) if (!m_acl_pool.IsEmpty() && m_ACLEndpoint.IsValid() && m_EventQueue.empty())
{ {
m_acl_pool.WriteToEndpoint(m_ACLEndpoint); m_acl_pool.WriteToEndpoint(m_ACLEndpoint);
@ -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, _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()); m_queue.push_back(Packet());
auto& packet = m_queue.back(); auto& packet = m_queue.back();
@ -602,7 +602,7 @@ bool CWII_IPC_HLE_Device_usb_oh1_57e_305::SendEventInquiryResponse()
pResponse->page_scan_mode = 0; pResponse->page_scan_mode = 0;
pResponse->clock_offset = 0x3818; 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", 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[0], pResponse->bdaddr.b[1], pResponse->bdaddr.b[2],
pResponse->bdaddr.b[3], pResponse->bdaddr.b[4], pResponse->bdaddr.b[5]); pResponse->bdaddr.b[3], pResponse->bdaddr.b[4], pResponse->bdaddr.b[5]);
@ -1778,7 +1778,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::CommandReadBufferSize(u8* _Input)
hci_read_buffer_size_rp Reply; hci_read_buffer_size_rp Reply;
Reply.status = 0x00; Reply.status = 0x00;
Reply.max_acl_size = m_acl_pkt_size; 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 // let the stack think the controller is buffering more than 10 data packets
// - it will cause a u8 underflow and royally screw things up. // - it will cause a u8 underflow and royally screw things up.
Reply.num_acl_pkts = m_acl_pkts_num; Reply.num_acl_pkts = m_acl_pkts_num;

2
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb_kbd.cpp
View File

@ -227,7 +227,7 @@ u8 CWII_IPC_HLE_Device_usb_kbd::m_KeyCodesQWERTY[256] = {
0x55, // Multiply 0x55, // Multiply
0x57, // Add 0x57, // Add
0x00, // Separator 0x00, // Separator
0x56, // Substract 0x56, // Subtract
0x63, // Decimal 0x63, // Decimal
0x54, // Divide 0x54, // Divide
// F1 -> F12 // F1 -> F12

2
Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
View File

@ -306,7 +306,7 @@ void Interpreter::unknown_instruction(UGeckoInstruction _inst)
DisassembleGekko(Memory::ReadUnchecked_U32(last_pc), last_pc, disasm, 256); DisassembleGekko(Memory::ReadUnchecked_U32(last_pc), last_pc, disasm, 256);
NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm); NOTICE_LOG(POWERPC, "Last PC = %08x : %s", last_pc, disasm);
Dolphin_Debugger::PrintCallstack(); 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);
} }
} }

2
Source/Core/Core/Src/PowerPC/Jit64/Jit.cpp
View File

@ -679,7 +679,7 @@ const u8* Jit64::DoJit(u32 em_address, PPCAnalyst::CodeBuffer *code_buf, JitBloc
{ {
char ppcInst[256]; char ppcInst[256];
DisassembleGekko(ops[i].inst.hex, em_address, 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 #endif
if (js.skipnext) { if (js.skipnext) {

4
Source/Core/DolphinWX/Src/GLInterface/WGL.cpp
View File

@ -171,14 +171,14 @@ void cInterfaceWGL::Shutdown()
NOTICE_LOG(VIDEO, "Could not release drawing context."); NOTICE_LOG(VIDEO, "Could not release drawing context.");
if (!wglDeleteContext(hRC)) if (!wglDeleteContext(hRC))
ERROR_LOG(VIDEO, "Release Rendering Context Failed."); ERROR_LOG(VIDEO, "Attempt to release rendering context failed.");
hRC = NULL; hRC = NULL;
} }
if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC)) if (hDC && !ReleaseDC(EmuWindow::GetWnd(), hDC))
{ {
ERROR_LOG(VIDEO, "Release Device Context Failed."); ERROR_LOG(VIDEO, "Attempt to release device context failed.");
hDC = NULL; hDC = NULL;
} }
} }

4
Source/Core/DolphinWX/Src/Main.cpp
View File

@ -218,7 +218,7 @@ bool DolphinApp::OnInit()
RegisterMsgAlertHandler(&wxMsgAlert); RegisterMsgAlertHandler(&wxMsgAlert);
RegisterStringTranslator(&wxStringTranslator); RegisterStringTranslator(&wxStringTranslator);
// "ExtendedTrace" looks freakin dangerous!!! // "ExtendedTrace" looks freakin' dangerous!!!
#ifdef _WIN32 #ifdef _WIN32
EXTENDEDTRACEINITIALIZE("."); EXTENDEDTRACEINITIALIZE(".");
SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter); SetUnhandledExceptionFilter(&MyUnhandledExceptionFilter);
@ -239,7 +239,7 @@ bool DolphinApp::OnInit()
#ifdef __APPLE__ #ifdef __APPLE__
if (floor(NSAppKitVersionNumber) < NSAppKitVersionNumber10_7) 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" "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" "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" "Please upgrade to 10.7 or greater to use the newest Dolphin version.\n\n"

2
Source/Core/VideoCommon/Src/XFStructs.cpp
View File

@ -212,7 +212,7 @@ void LoadXFReg(u32 transferSize, u32 baseAddress, u32 *pData)
// do not allow writes past registers // do not allow writes past registers
if (baseAddress + transferSize > 0x1058) 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) if (baseAddress >= 0x1058)
transferSize = 0; transferSize = 0;

2
Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
View File

@ -234,7 +234,7 @@ void VertexManager::vFlush()
PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0); PixelShaderManager::SetTexDims(i, tentry->native_width, tentry->native_height, 0, 0);
} }
else else
ERROR_LOG(VIDEO, "error loading texture"); ERROR_LOG(VIDEO, "Error loading texture");
} }
} }