emu-mirror/Lime3DS
1
0
Fork 0
mirror of https://github.com/Lime3DS/Lime3DS.git synced 2025-03-13 09:12:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed build issues

Browse Source 
Co-authored-by: Reg Tiangha <rtiangha@users.noreply.github.com>
This commit is contained in:
Reg Tiangha 2024-09-07 13:06:59 -06:00 committed by OpenSauce
parent 6bc8906a15
commit 279f469f42
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/CMakeLists.txt
View File

@ -499,6 +499,10 @@ target_link_libraries(citra_core PUBLIC citra_common PRIVATE audio_core network
target_link_libraries(citra_core PRIVATE Boost::boost Boost::serialization Boost::iostreams httplib) target_link_libraries(citra_core PRIVATE Boost::boost Boost::serialization Boost::iostreams httplib)
target_link_libraries(citra_core PUBLIC dds-ktx PRIVATE cryptopp fmt lodepng open_source_archives) target_link_libraries(citra_core PUBLIC dds-ktx PRIVATE cryptopp fmt lodepng open_source_archives)
if (NOT ANDROID)
target_link_libraries(citra_core PUBLIC input_common)
endif()
if (ENABLE_WEB_SERVICE) if (ENABLE_WEB_SERVICE)
target_link_libraries(citra_core PRIVATE web_service) target_link_libraries(citra_core PRIVATE web_service)
endif() endif()

17
src/core/rpc/rpc_server.cpp
View File

@ -7,8 +7,11 @@
#include "core/memory.h" #include "core/memory.h"
#include "core/rpc/packet.h" #include "core/rpc/packet.h"
#include "core/rpc/rpc_server.h" #include "core/rpc/rpc_server.h"
#ifndef ANDROID
#include "input_common/keyboard.h" #include "input_common/keyboard.h"
#include "input_common/main.h" #include "input_common/main.h"
#endif
namespace Core::RPC { namespace Core::RPC {
@ -47,6 +50,7 @@ void RPCServer::HandleWriteMemory(Packet& packet, u32 address, std::span<const u
packet.SendReply(); packet.SendReply();
} }
#ifndef ANDROID
void RPCServer::HandleSendKey(Packet& packet, u32 key_code, u8 state) { void RPCServer::HandleSendKey(Packet& packet, u32 key_code, u8 state) {
if (state == 0) { if (state == 0) {
InputCommon::GetKeyboard()->ReleaseKey(key_code); InputCommon::GetKeyboard()->ReleaseKey(key_code);
@ -63,6 +67,7 @@ void RPCServer::HandleSendSignal(Packet& packet, u32 signal_code, u32 signal_par
packet.SetPacketDataSize(0); packet.SetPacketDataSize(0);
packet.SendReply(); packet.SendReply();
} }
#endif
bool RPCServer::ValidatePacket(const PacketHeader& packet_header) { bool RPCServer::ValidatePacket(const PacketHeader& packet_header) {
if (packet_header.version <= CURRENT_VERSION) { if (packet_header.version <= CURRENT_VERSION) {
@ -73,6 +78,8 @@ bool RPCServer::ValidatePacket(const PacketHeader& packet_header) {
return true; return true;
} }
break; break;
#ifndef ANDROID
case PacketType::SendKey: case PacketType::SendKey:
if (packet_header.packet_size >= (sizeof(u32) + sizeof(u8))) { if (packet_header.packet_size >= (sizeof(u32) + sizeof(u8))) {
return true; return true;
@ -83,6 +90,8 @@ bool RPCServer::ValidatePacket(const PacketHeader& packet_header) {
return true; return true;
} }
break; break;
#endif
default: default:
break; break;
} }
@ -97,10 +106,14 @@ void RPCServer::HandleSingleRequest(std::unique_ptr<Packet> request_packet) {
if (ValidatePacket(request_packet->GetHeader())) { if (ValidatePacket(request_packet->GetHeader())) {
u32 address = 0; u32 address = 0;
u32 data_size = 0; u32 data_size = 0;
#ifndef ANDROID
u32 key_code = 0; u32 key_code = 0;
u8 key_state = 0; u8 key_state = 0;
u32 signal_code = 0; u32 signal_code = 0;
u32 signal_parameter = 0; u32 signal_parameter = 0;
#endif
switch (request_packet->GetPacketType()) { switch (request_packet->GetPacketType()) {
case PacketType::ReadMemory: case PacketType::ReadMemory:
std::memcpy(&address, packet_data.data(), sizeof(address)); std::memcpy(&address, packet_data.data(), sizeof(address));
@ -118,6 +131,8 @@ void RPCServer::HandleSingleRequest(std::unique_ptr<Packet> request_packet) {
success = true; success = true;
} }
break; break;
#ifndef ANDROID
case PacketType::SendKey: case PacketType::SendKey:
std::memcpy(&key_code, packet_data.data(), sizeof(key_code)); std::memcpy(&key_code, packet_data.data(), sizeof(key_code));
std::memcpy(&key_state, packet_data.data() + sizeof(key_code), sizeof(key_state)); std::memcpy(&key_state, packet_data.data() + sizeof(key_code), sizeof(key_state));
@ -130,6 +145,8 @@ void RPCServer::HandleSingleRequest(std::unique_ptr<Packet> request_packet) {
sizeof(signal_parameter)); sizeof(signal_parameter));
HandleSendSignal(*request_packet, signal_code, signal_parameter); HandleSendSignal(*request_packet, signal_code, signal_parameter);
break; break;
#endif
default: default:
break; break;
} }

4
src/core/rpc/rpc_server.h
View File

@ -29,8 +29,12 @@ public:
private: private:
void HandleReadMemory(Packet& packet, u32 address, u32 data_size); void HandleReadMemory(Packet& packet, u32 address, u32 data_size);
void HandleWriteMemory(Packet& packet, u32 address, std::span<const u8> data); void HandleWriteMemory(Packet& packet, u32 address, std::span<const u8> data);
#ifndef ANDROID
void HandleSendKey(Packet& packet, u32 key_code, u8 state); void HandleSendKey(Packet& packet, u32 key_code, u8 state);
void HandleSendSignal(Packet& packet, u32 signal_code, u32 signal_parameter); void HandleSendSignal(Packet& packet, u32 signal_code, u32 signal_parameter);
#endif
bool ValidatePacket(const PacketHeader& packet_header); bool ValidatePacket(const PacketHeader& packet_header);
void HandleSingleRequest(std::unique_ptr<Packet> request); void HandleSingleRequest(std::unique_ptr<Packet> request);
void HandleRequestsLoop(std::stop_token stop_token); void HandleRequestsLoop(std::stop_token stop_token);