diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-03 06:51:34 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2010-06-03 06:51:34 +0000 |
| commit | 450aefdd01d87f659c0a83406b04d58362fedef8 (patch) | |
| tree | cbf735a76a6a91686a8bf3faeb1de5c08bc91d9e /Source/Core | |
| parent | 360b8427fd91789e615bd8e004f51de6d7e5888a (diff) | |
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
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Src/HW/DVDInterface.cpp | 10 | ||||
| -rw-r--r-- | Source/Core/DolphinWX/Src/NetPlay.cpp | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Source/Core/Core/Src/HW/DVDInterface.cpp b/Source/Core/Core/Src/HW/DVDInterface.cpp index e7011ad57d..986e39afca 100644 --- a/Source/Core/Core/Src/HW/DVDInterface.cpp +++ b/Source/Core/Core/Src/HW/DVDInterface.cpp @@ -574,29 +574,29 @@ void ExecuteCommand(UDICR& _DICR) { case 0x80000000: 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); break; case 0x80000040: 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(0x00000020, m_DIMAR.Address); // DIMM SIZE, LE Memory::Write_U32(0x4743414D, m_DIMAR.Address + 4); // GCAM signature break; case 0x80000120: 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); break; case 0x80000140: 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); break; case 0x84000020: 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); break; default: diff --git a/Source/Core/DolphinWX/Src/NetPlay.cpp b/Source/Core/DolphinWX/Src/NetPlay.cpp index 1e29ff8666..afe13da14a 100644 --- a/Source/Core/DolphinWX/Src/NetPlay.cpp +++ b/Source/Core/DolphinWX/Src/NetPlay.cpp @@ -214,7 +214,7 @@ void NetPlay::WiimoteInput(int _number, u16 _channelID, const void* _pData, u32 { // warning removing, like a boss _number = _channelID; - _Size = (u32)_pData; + // _Size = (u32)_pData; //m_crit.players.Enter(); // lock players @@ -357,7 +357,7 @@ u8 CSIDevice_GCController::NetPlay_GetPadNum(u8 numPAD) // wiimote update / used for frame counting void CWII_IPC_HLE_Device_usb_oh1_57e_305::NetPlay_WiimoteUpdate(int _number) { - _number;; + // _number;; //CritLocker crit(::crit_netplay_ptr); return; |