From 4e29afefc4afbce77f7ea0d110d7e844ce411eac Mon Sep 17 00:00:00 2001
From: Narr the Reg <juangerman-13@hotmail.com>
Date: Fri, 27 Jan 2023 17:47:47 -0600
Subject: input_common: joycon: Replace ReadSPI vector with span
---
.../helpers/joycon_protocol/common_protocol.cpp | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
(limited to 'src/input_common/helpers/joycon_protocol/common_protocol.cpp')
diff --git a/src/input_common/helpers/joycon_protocol/common_protocol.cpp b/src/input_common/helpers/joycon_protocol/common_protocol.cpp
index 2f0ab6b2a7..0ef2403440 100644
--- a/src/input_common/helpers/joycon_protocol/common_protocol.cpp
+++ b/src/input_common/helpers/joycon_protocol/common_protocol.cpp
@@ -22,8 +22,8 @@ void JoyconCommonProtocol::SetNonBlocking() {
}
DriverResult JoyconCommonProtocol::GetDeviceType(ControllerType& controller_type) {
- std::vector<u8> buffer;
- const auto result = ReadSPI(SpiAddress::DEVICE_TYPE, 1, buffer);
+ std::array<u8, 1> buffer{};
+ const auto result = ReadRawSPI(SpiAddress::DEVICE_TYPE, buffer);
controller_type = ControllerType::None;
if (result == DriverResult::Success) {
@@ -148,11 +148,13 @@ DriverResult JoyconCommonProtocol::SendVibrationReport(std::span<const u8> buffe
return SendData(local_buffer);
}
-DriverResult JoyconCommonProtocol::ReadSPI(SpiAddress addr, u8 size, std::vector<u8>& output) {
+DriverResult JoyconCommonProtocol::ReadRawSPI(SpiAddress addr, std::span<u8> output) {
+ constexpr std::size_t HeaderSize = 20;
constexpr std::size_t MaxTries = 10;
+ const auto size = output.size();
std::size_t tries = 0;
- std::array<u8, 5> buffer = {0x00, 0x00, 0x00, 0x00, size};
- std::vector<u8> local_buffer(size + 20);
+ std::array<u8, 5> buffer = {0x00, 0x00, 0x00, 0x00, static_cast<u8>(size)};
+ std::vector<u8> local_buffer{};
buffer[0] = static_cast<u8>(static_cast<u16>(addr) & 0x00FF);
buffer[1] = static_cast<u8>((static_cast<u16>(addr) & 0xFF00) >> 8);
@@ -167,8 +169,12 @@ DriverResult JoyconCommonProtocol::ReadSPI(SpiAddress addr, u8 size, std::vector
}
} while (local_buffer[15] != buffer[0] || local_buffer[16] != buffer[1]);
+ if (local_buffer.size() < size + HeaderSize) {
+ return DriverResult::WrongReply;
+ }
+
// Remove header from output
- output = std::vector<u8>(local_buffer.begin() + 20, local_buffer.begin() + 20 + size);
+ memcpy(output.data(), local_buffer.data() + HeaderSize, size);
return DriverResult::Success;
}
--
cgit v1.2.3-70-g09d2