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

Linux build fix, and silence some compiler warnings. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7395 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2011-03-22 15:37:34 +00:00
parent 1c847dd421
commit e8f4323834
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,7 +338,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::IncDataPacket(u16 _ConnectionHandle)
{ {
m_PacketCount[_ConnectionHandle & 0xff]++; m_PacketCount[_ConnectionHandle & 0xff]++;
if (m_PacketCount[_ConnectionHandle & 0xff] > m_acl_pkts_num) if (m_PacketCount[_ConnectionHandle & 0xff] > (unsigned int)m_acl_pkts_num)
{ {
DEBUG_LOG(WII_IPC_WIIMOTE, "ACL buffer overflow"); DEBUG_LOG(WII_IPC_WIIMOTE, "ACL buffer overflow");
m_PacketCount[_ConnectionHandle & 0xff] = m_acl_pkts_num; m_PacketCount[_ConnectionHandle & 0xff] = m_acl_pkts_num;
@ -367,7 +367,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::SendACLPacket(u16 _ConnectionHandle, u
else else
{ {
DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, " DEBUG_LOG(WII_IPC_WIIMOTE, "ACL endpoint not currently valid, "
"queueing(%lu)...", m_acl_pool.GetWritePos()); "queueing(%d)...", m_acl_pool.GetWritePos());
m_acl_pool.Store(_pData, _Size, _ConnectionHandle); m_acl_pool.Store(_pData, _Size, _ConnectionHandle);
} }
} }
@ -510,7 +510,7 @@ void CWII_IPC_HLE_Device_usb_oh1_57e_305::ACLPool::WriteToEndpoint(CtrlBuffer& e
const u16 conn_handle = m_info[m_read_ptr].conn_handle; const u16 conn_handle = m_info[m_read_ptr].conn_handle;
DEBUG_LOG(WII_IPC_WIIMOTE, "ACL packet being written from " DEBUG_LOG(WII_IPC_WIIMOTE, "ACL packet being written from "
"queue(%lu) to %08x", GetReadPos(), endpoint.m_address); "queue(%d) to %08x", GetReadPos(), endpoint.m_address);
hci_acldata_hdr_t* pHeader = (hci_acldata_hdr_t*)Memory::GetPointer(endpoint.m_buffer); hci_acldata_hdr_t* pHeader = (hci_acldata_hdr_t*)Memory::GetPointer(endpoint.m_buffer);
pHeader->con_handle = HCI_MK_CON_HANDLE(conn_handle, HCI_PACKET_START, HCI_POINT2POINT); pHeader->con_handle = HCI_MK_CON_HANDLE(conn_handle, HCI_PACKET_START, HCI_POINT2POINT);

4
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_usb.h
View File

@ -210,8 +210,8 @@ private:
{ {
p.Do(m_write_ptr); p.Do(m_write_ptr);
p.Do(m_read_ptr); p.Do(m_read_ptr);
p.DoArray(m_pool, sizeof(m_pool)); p.DoArray((u8 *)m_pool, sizeof(m_pool));
p.DoArray(m_info, sizeof(m_info)); p.DoArray((u8 *)m_info, sizeof(m_info));
} }
} m_acl_pool; } m_acl_pool;