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

fix warnings in windows build

This commit is contained in:
Martin Michelsen 2024-01-28 20:59:39 -08:00
parent 9cf8131b23
commit 12a7e17a41
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/HW/EXI/BBA/TAPServerBBA.cpp
View File

@ -80,7 +80,7 @@ void CEXIETHERNET::TAPServerNetworkInterface::HandleReceivedFrame(std::string&&
else else
{ {
memcpy(m_eth_ref->mRecvBuffer.get(), data.data(), data.size()); memcpy(m_eth_ref->mRecvBuffer.get(), data.data(), data.size());
m_eth_ref->mRecvBufferLength = data.size(); m_eth_ref->mRecvBufferLength = static_cast<u32>(data.size());
m_eth_ref->RecvHandlePacket(); m_eth_ref->RecvHandlePacket();
} }
} }

6
Source/Core/Core/HW/EXI/BBA/TAPServerConnection.cpp
View File

@ -320,9 +320,9 @@ void TAPServerConnection::ReadThreadHandler()
case ReadState::DATA: case ReadState::DATA:
case ReadState::SKIP: case ReadState::SKIP:
{ {
ws_ssize_t bytes_to_read = frame_data.size() - frame_bytes_received; const std::size_t bytes_to_read = frame_data.size() - frame_bytes_received;
ws_ssize_t bytes_read = ws_ssize_t bytes_read = recv(m_fd, frame_data.data() + frame_bytes_received,
recv(m_fd, frame_data.data() + frame_bytes_received, bytes_to_read, 0); static_cast<ws_ssize_t>(bytes_to_read), 0);
if (bytes_read <= 0) if (bytes_read <= 0)
{ {
ERROR_LOG_FMT(SP1, "Failed to read data from destination: {}", Common::StrNetworkError()); ERROR_LOG_FMT(SP1, "Failed to read data from destination: {}", Common::StrNetworkError());

3
Source/Core/Core/HW/EXI/EXI_DeviceModem.cpp
View File

@ -313,7 +313,8 @@ void CEXIModem::SetInterruptFlag(u8 what, bool enabled, bool from_cpu)
void CEXIModem::OnReceiveBufferSizeChangedLocked(bool from_cpu) void CEXIModem::OnReceiveBufferSizeChangedLocked(bool from_cpu)
{ {
// The caller is expected to hold m_receive_buffer_lock when calling this. // The caller is expected to hold m_receive_buffer_lock when calling this.
const u16 bytes_available = std::min<u16>(m_receive_buffer.size(), 0x200); const u16 bytes_available =
static_cast<u16>(std::min<std::size_t>(m_receive_buffer.size(), 0x200));
m_regs[Register::BYTES_AVAILABLE_HIGH] = (bytes_available >> 8) & 0xFF; m_regs[Register::BYTES_AVAILABLE_HIGH] = (bytes_available >> 8) & 0xFF;
m_regs[Register::BYTES_AVAILABLE_LOW] = bytes_available & 0xFF; m_regs[Register::BYTES_AVAILABLE_LOW] = bytes_available & 0xFF;
SetInterruptFlag(Interrupt::RECEIVE_BUFFER_ABOVE_THRESHOLD, SetInterruptFlag(Interrupt::RECEIVE_BUFFER_ABOVE_THRESHOLD,