summaryrefslogtreecommitdiffstats
path: root/src/core/hle/service/hid/controllers/debug_pad.h
diff options
context:
space:
mode:
authorNarr the Reg <juangerman-13@hotmail.com>2022-04-19 22:30:32 +0200
committerNarr the Reg <juangerman-13@hotmail.com>2022-04-23 22:41:42 +0200
commit61582efeb976b0852e73b734835d60c73b38f3cf (patch)
treeb5ac72746de0533cd292ad5cb962d0e663326b0e /src/core/hle/service/hid/controllers/debug_pad.h
parentMerge pull request #8249 from german77/queued (diff)
downloadyuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar
yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.gz
yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.bz2
yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.lz
yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.xz
yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.tar.zst
yuzu-61582efeb976b0852e73b734835d60c73b38f3cf.zip
Diffstat (limited to 'src/core/hle/service/hid/controllers/debug_pad.h')
-rw-r--r--src/core/hle/service/hid/controllers/debug_pad.h18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/core/hle/service/hid/controllers/debug_pad.h b/src/core/hle/service/hid/controllers/debug_pad.h
index 388d25b3c..543e9f3a6 100644
--- a/src/core/hle/service/hid/controllers/debug_pad.h
+++ b/src/core/hle/service/hid/controllers/debug_pad.h
@@ -17,7 +17,7 @@ struct AnalogStickState;
namespace Service::HID {
class Controller_DebugPad final : public ControllerBase {
public:
- explicit Controller_DebugPad(Core::HID::HIDCore& hid_core_);
+ explicit Controller_DebugPad(Core::HID::HIDCore& hid_core_, u8* raw_shared_memory_);
~Controller_DebugPad() override;
// Called when the controller is initialized
@@ -27,7 +27,7 @@ public:
void OnRelease() override;
// When the controller is requesting an update for the shared memory
- void OnUpdate(const Core::Timing::CoreTiming& core_timing, u8* data, std::size_t size) override;
+ void OnUpdate(const Core::Timing::CoreTiming& core_timing) override;
private:
// This is nn::hid::DebugPadAttribute
@@ -49,11 +49,17 @@ private:
};
static_assert(sizeof(DebugPadState) == 0x20, "DebugPadState is an invalid state");
- // This is nn::hid::detail::DebugPadLifo
- Lifo<DebugPadState, hid_entry_count> debug_pad_lifo{};
- static_assert(sizeof(debug_pad_lifo) == 0x2C8, "debug_pad_lifo is an invalid size");
- DebugPadState next_state{};
+ struct DebugPadSharedMemory {
+ // This is nn::hid::detail::DebugPadLifo
+ Lifo<DebugPadState, hid_entry_count> debug_pad_lifo{};
+ static_assert(sizeof(debug_pad_lifo) == 0x2C8, "debug_pad_lifo is an invalid size");
+ INSERT_PADDING_WORDS(0x4E);
+ };
+ static_assert(sizeof(DebugPadSharedMemory) == 0x400, "DebugPadSharedMemory is an invalid size");
+ DebugPadSharedMemory* shared_memory;
+
+ DebugPadState next_state{};
Core::HID::EmulatedController* controller;
};
} // namespace Service::HID