summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorMichael Maltese <mchtly@gmail.com>2017-05-17 14:39:41 -0700
committerMichael Maltese <mchtly@gmail.com>2017-07-14 13:57:17 -0700
commitf004dfa92be2801514437670ec81e99bbc50580a (patch)
tree03b816e9b77b716657d6e0e4306a4a46a825d0e2 /Source/Core
parent8dee8e6494fd19f9b92a91076cf35643d948f855 (diff)
SI_DeviceGBA: use SI_ERROR_NO_RESPONSE when client isn't connected
Slight behavior change, but fills a gaping hole in the state logic.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/HW/SI/SI_DeviceGBA.cpp32
1 files changed, 19 insertions, 13 deletions
diff --git a/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
index 1222f88aa4..c771a7556b 100644
--- a/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
+++ b/Source/Core/Core/HW/SI/SI_DeviceGBA.cpp
@@ -5,6 +5,7 @@
#include "Core/HW/SI/SI_DeviceGBA.h"
#include <cstddef>
+#include <cstring>
#include <memory>
#include <mutex>
#include <queue>
@@ -303,6 +304,12 @@ int CSIDevice_GBA::RunBuffer(u8* buffer, int length)
#endif
m_sock_server.Send(buffer);
}
+ else
+ {
+ constexpr u32 reply = SI_ERROR_NO_RESPONSE;
+ std::memcpy(buffer, &reply, sizeof(reply));
+ return sizeof(reply);
+ }
m_last_cmd = buffer[3];
m_timestamp_sent = CoreTiming::GetTicks();
m_next_action = NextAction::WaitTransferTime;
@@ -322,22 +329,21 @@ int CSIDevice_GBA::RunBuffer(u8* buffer, int length)
case NextAction::ReceiveResponse:
{
int num_data_received = m_sock_server.Receive(buffer);
- if (m_sock_server.IsConnected())
+ if (!m_sock_server.IsConnected())
{
+ m_next_action = NextAction::SendCommand;
+ constexpr u32 reply = SI_ERROR_NO_RESPONSE;
+ std::memcpy(buffer, &reply, sizeof(reply));
+ return sizeof(reply);
+ }
#ifdef _DEBUG
- LogTypes::LOG_LEVELS log_level = (m_last_cmd == CMD_STATUS || m_last_cmd == CMD_RESET) ?
- LogTypes::LERROR :
- LogTypes::LWARNING;
- GENERIC_LOG(LogTypes::SERIALINTERFACE, log_level,
- "%01d [< %02x%02x%02x%02x%02x] (%i)",
- m_device_number, buffer[3], buffer[2], buffer[1], buffer[0], buffer[7],
- num_data_received);
+ LogTypes::LOG_LEVELS log_level = (m_last_cmd == CMD_STATUS || m_last_cmd == CMD_RESET) ?
+ LogTypes::LERROR :
+ LogTypes::LWARNING;
+ GENERIC_LOG(LogTypes::SERIALINTERFACE, log_level,
+ "%01d [< %02x%02x%02x%02x%02x] (%i)", m_device_number,
+ buffer[3], buffer[2], buffer[1], buffer[0], buffer[7], num_data_received);
#endif
- }
- else
- {
- num_data_received = RECV_MAX_SIZE;
- }
if (num_data_received > 0)
m_next_action = NextAction::SendCommand;
return num_data_received;