diff options
author | bunnei <bunneidev@gmail.com> | 2023-01-30 21:17:09 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-30 21:17:09 +0100 |
commit | ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a (patch) | |
tree | 54b6ce04e859b1dee33f4331f392c0d645f4db43 /src/core/hle/service/hid/hidbus | |
parent | Merge pull request #9701 from german77/common_protocol (diff) | |
parent | hle_ipc: Use thread_local ReadBuffer (diff) | |
download | yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.gz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.bz2 yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.lz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.xz yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.tar.zst yuzu-ed4a88bd93c93ac1aaf5b6bae7d8ede10ff0338a.zip |
Diffstat (limited to 'src/core/hle/service/hid/hidbus')
-rw-r--r-- | src/core/hle/service/hid/hidbus/hidbus_base.h | 3 | ||||
-rw-r--r-- | src/core/hle/service/hid/hidbus/ringcon.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/hid/hidbus/ringcon.h | 3 | ||||
-rw-r--r-- | src/core/hle/service/hid/hidbus/starlink.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/hid/hidbus/starlink.h | 2 | ||||
-rw-r--r-- | src/core/hle/service/hid/hidbus/stubbed.cpp | 2 | ||||
-rw-r--r-- | src/core/hle/service/hid/hidbus/stubbed.h | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/src/core/hle/service/hid/hidbus/hidbus_base.h b/src/core/hle/service/hid/hidbus/hidbus_base.h index d3960f506..65e301137 100644 --- a/src/core/hle/service/hid/hidbus/hidbus_base.h +++ b/src/core/hle/service/hid/hidbus/hidbus_base.h @@ -4,6 +4,7 @@ #pragma once #include <array> +#include <span> #include "common/common_types.h" #include "core/hle/result.h" @@ -150,7 +151,7 @@ public: } // Assigns a command from data - virtual bool SetCommand(const std::vector<u8>& data) { + virtual bool SetCommand(std::span<const u8> data) { return {}; } diff --git a/src/core/hle/service/hid/hidbus/ringcon.cpp b/src/core/hle/service/hid/hidbus/ringcon.cpp index 78ed47014..35847cbdd 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.cpp +++ b/src/core/hle/service/hid/hidbus/ringcon.cpp @@ -116,7 +116,7 @@ std::vector<u8> RingController::GetReply() const { } } -bool RingController::SetCommand(const std::vector<u8>& data) { +bool RingController::SetCommand(std::span<const u8> data) { if (data.size() < 4) { LOG_ERROR(Service_HID, "Command size not supported {}", data.size()); command = RingConCommands::Error; diff --git a/src/core/hle/service/hid/hidbus/ringcon.h b/src/core/hle/service/hid/hidbus/ringcon.h index 845ce85a5..c2fb386b1 100644 --- a/src/core/hle/service/hid/hidbus/ringcon.h +++ b/src/core/hle/service/hid/hidbus/ringcon.h @@ -4,6 +4,7 @@ #pragma once #include <array> +#include <span> #include "common/common_types.h" #include "core/hle/service/hid/hidbus/hidbus_base.h" @@ -31,7 +32,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(const std::vector<u8>& data) override; + bool SetCommand(std::span<const u8> data) override; // Returns a reply from a command std::vector<u8> GetReply() const override; diff --git a/src/core/hle/service/hid/hidbus/starlink.cpp b/src/core/hle/service/hid/hidbus/starlink.cpp index dd439f60a..d0e760314 100644 --- a/src/core/hle/service/hid/hidbus/starlink.cpp +++ b/src/core/hle/service/hid/hidbus/starlink.cpp @@ -42,7 +42,7 @@ std::vector<u8> Starlink::GetReply() const { return {}; } -bool Starlink::SetCommand(const std::vector<u8>& data) { +bool Starlink::SetCommand(std::span<const u8> data) { LOG_ERROR(Service_HID, "Command not implemented"); return false; } diff --git a/src/core/hle/service/hid/hidbus/starlink.h b/src/core/hle/service/hid/hidbus/starlink.h index 0b1b7ba49..07c800e6e 100644 --- a/src/core/hle/service/hid/hidbus/starlink.h +++ b/src/core/hle/service/hid/hidbus/starlink.h @@ -29,7 +29,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(const std::vector<u8>& data) override; + bool SetCommand(std::span<const u8> data) override; // Returns a reply from a command std::vector<u8> GetReply() const override; diff --git a/src/core/hle/service/hid/hidbus/stubbed.cpp b/src/core/hle/service/hid/hidbus/stubbed.cpp index e477443e3..07632c872 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.cpp +++ b/src/core/hle/service/hid/hidbus/stubbed.cpp @@ -43,7 +43,7 @@ std::vector<u8> HidbusStubbed::GetReply() const { return {}; } -bool HidbusStubbed::SetCommand(const std::vector<u8>& data) { +bool HidbusStubbed::SetCommand(std::span<const u8> data) { LOG_ERROR(Service_HID, "Command not implemented"); return false; } diff --git a/src/core/hle/service/hid/hidbus/stubbed.h b/src/core/hle/service/hid/hidbus/stubbed.h index 91165ceff..38eaa0ecc 100644 --- a/src/core/hle/service/hid/hidbus/stubbed.h +++ b/src/core/hle/service/hid/hidbus/stubbed.h @@ -29,7 +29,7 @@ public: u8 GetDeviceId() const override; // Assigns a command from data - bool SetCommand(const std::vector<u8>& data) override; + bool SetCommand(std::span<const u8> data) override; // Returns a reply from a command std::vector<u8> GetReply() const override; |