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

A few minor nits to fix building on OS X. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5584 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang 2010-06-03 06:51:34 +00:00
parent 360b8427fd
commit 450aefdd01
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Core/Core/Src/HW/DVDInterface.cpp
View File

@ -574,29 +574,29 @@ void ExecuteCommand(UDICR& _DICR)
{ {
case 0x80000000: case 0x80000000:
ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (80000000)"); ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (80000000)");
for (unsigned int i = 0; i < m_DILENGTH.Length / 4; i++) for (int i = 0; i < m_DILENGTH.Length / 4; i++)
Memory::Write_U32(0, m_DIMAR.Address + i * 4); Memory::Write_U32(0, m_DIMAR.Address + i * 4);
break; break;
case 0x80000040: case 0x80000040:
ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (2) (80000040)"); ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (2) (80000040)");
for (unsigned int i = 0; i < m_DILENGTH.Length / 4; i++) for (int i = 0; i < m_DILENGTH.Length / 4; i++)
Memory::Write_U32(~0, m_DIMAR.Address + i * 4); Memory::Write_U32(~0, m_DIMAR.Address + i * 4);
Memory::Write_U32(0x00000020, m_DIMAR.Address); // DIMM SIZE, LE Memory::Write_U32(0x00000020, m_DIMAR.Address); // DIMM SIZE, LE
Memory::Write_U32(0x4743414D, m_DIMAR.Address + 4); // GCAM signature Memory::Write_U32(0x4743414D, m_DIMAR.Address + 4); // GCAM signature
break; break;
case 0x80000120: case 0x80000120:
ERROR_LOG(DVDINTERFACE, "GC-AM: READ FIRMWARE STATUS (80000120)"); ERROR_LOG(DVDINTERFACE, "GC-AM: READ FIRMWARE STATUS (80000120)");
for (unsigned int i = 0; i < m_DILENGTH.Length / 4; i++) for (int i = 0; i < m_DILENGTH.Length / 4; i++)
Memory::Write_U32(0x01010101, m_DIMAR.Address + i * 4); Memory::Write_U32(0x01010101, m_DIMAR.Address + i * 4);
break; break;
case 0x80000140: case 0x80000140:
ERROR_LOG(DVDINTERFACE, "GC-AM: READ FIRMWARE STATUS (80000140)"); ERROR_LOG(DVDINTERFACE, "GC-AM: READ FIRMWARE STATUS (80000140)");
for (unsigned int i = 0; i < m_DILENGTH.Length / 4; i++) for (int i = 0; i < m_DILENGTH.Length / 4; i++)
Memory::Write_U32(0x01010101, m_DIMAR.Address + i * 4); Memory::Write_U32(0x01010101, m_DIMAR.Address + i * 4);
break; break;
case 0x84000020: case 0x84000020:
ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (1) (84000020)"); ERROR_LOG(DVDINTERFACE, "GC-AM: READ MEDIA BOARD STATUS (1) (84000020)");
for (unsigned int i = 0; i < m_DILENGTH.Length / 4; i++) for (int i = 0; i < m_DILENGTH.Length / 4; i++)
Memory::Write_U32(0x00000000, m_DIMAR.Address + i * 4); Memory::Write_U32(0x00000000, m_DIMAR.Address + i * 4);
break; break;
default: default:

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

@ -214,7 +214,7 @@ void NetPlay::WiimoteInput(int _number, u16 _channelID, const void* _pData, u32
{ {
// warning removing, like a boss // warning removing, like a boss
_number = _channelID; _number = _channelID;
_Size = (u32)_pData; // _Size = (u32)_pData;
//m_crit.players.Enter(); // lock players //m_crit.players.Enter(); // lock players
@ -357,7 +357,7 @@ u8 CSIDevice_GCController::NetPlay_GetPadNum(u8 numPAD)
// wiimote update / used for frame counting // wiimote update / used for frame counting
void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int _number) void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int _number)
{ {
_number;; // _number;;
//CritLocker crit(::crit_netplay_ptr); //CritLocker crit(::crit_netplay_ptr);
return; return;