summaryrefslogtreecommitdiff
path: root/src/hid_core/hidbus/ringcon.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/hid_core/hidbus/ringcon.h')
-rw-r--r--src/hid_core/hidbus/ringcon.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/hid_core/hidbus/ringcon.h b/src/hid_core/hidbus/ringcon.h
index 0953e8100..a48eeed45 100644
--- a/src/hid_core/hidbus/ringcon.h
+++ b/src/hid_core/hidbus/ringcon.h
@@ -34,7 +34,7 @@ public:
34 bool SetCommand(std::span<const u8> data) override; 34 bool SetCommand(std::span<const u8> data) override;
35 35
36 // Returns a reply from a command 36 // Returns a reply from a command
37 std::vector<u8> GetReply() const override; 37 u64 GetReply(std::span<u8> data) const override;
38 38
39private: 39private:
40 // These values are obtained from a real ring controller 40 // These values are obtained from a real ring controller
@@ -184,44 +184,44 @@ private:
184 RingConData GetSensorValue() const; 184 RingConData GetSensorValue() const;
185 185
186 // Returns 8 byte reply with firmware version 186 // Returns 8 byte reply with firmware version
187 std::vector<u8> GetFirmwareVersionReply() const; 187 u64 GetFirmwareVersionReply(std::span<u8> out_data) const;
188 188
189 // Returns 16 byte reply with ID values 189 // Returns 16 byte reply with ID values
190 std::vector<u8> GetReadIdReply() const; 190 u64 GetReadIdReply(std::span<u8> out_data) const;
191 191
192 // (STUBBED) Returns 8 byte reply 192 // (STUBBED) Returns 8 byte reply
193 std::vector<u8> GetC020105Reply() const; 193 u64 GetC020105Reply(std::span<u8> out_data) const;
194 194
195 // (STUBBED) Returns 8 byte empty reply 195 // (STUBBED) Returns 8 byte empty reply
196 std::vector<u8> GetReadUnkCalReply() const; 196 u64 GetReadUnkCalReply(std::span<u8> out_data) const;
197 197
198 // Returns 20 byte reply with factory calibration values 198 // Returns 20 byte reply with factory calibration values
199 std::vector<u8> GetReadFactoryCalReply() const; 199 u64 GetReadFactoryCalReply(std::span<u8> out_data) const;
200 200
201 // Returns 20 byte reply with user calibration values 201 // Returns 20 byte reply with user calibration values
202 std::vector<u8> GetReadUserCalReply() const; 202 u64 GetReadUserCalReply(std::span<u8> out_data) const;
203 203
204 // Returns 8 byte reply 204 // Returns 8 byte reply
205 std::vector<u8> GetReadRepCountReply() const; 205 u64 GetReadRepCountReply(std::span<u8> out_data) const;
206 206
207 // Returns 8 byte reply 207 // Returns 8 byte reply
208 std::vector<u8> GetReadTotalPushCountReply() const; 208 u64 GetReadTotalPushCountReply(std::span<u8> out_data) const;
209 209
210 // Returns 8 byte reply 210 // Returns 8 byte reply
211 std::vector<u8> GetResetRepCountReply() const; 211 u64 GetResetRepCountReply(std::span<u8> out_data) const;
212 212
213 // Returns 4 byte save data reply 213 // Returns 4 byte save data reply
214 std::vector<u8> GetSaveDataReply() const; 214 u64 GetSaveDataReply(std::span<u8> out_data) const;
215 215
216 // Returns 8 byte error reply 216 // Returns 8 byte error reply
217 std::vector<u8> GetErrorReply() const; 217 u64 GetErrorReply(std::span<u8> out_data) const;
218 218
219 // Returns 8 bit redundancy check from provided data 219 // Returns 8 bit redundancy check from provided data
220 u8 GetCrcValue(const std::vector<u8>& data) const; 220 u8 GetCrcValue(const std::vector<u8>& data) const;
221 221
222 // Converts structs to an u8 vector equivalent 222 // Converts structs to an u8 vector equivalent
223 template <typename T> 223 template <typename T>
224 std::vector<u8> GetDataVector(const T& reply) const; 224 u64 GetData(const T& reply, std::span<u8> out_data) const;
225 225
226 RingConCommands command{RingConCommands::Error}; 226 RingConCommands command{RingConCommands::Error};
227 227