diff options
| author | liamwhite <liamwhite@users.noreply.github.com> | 2023-11-23 12:36:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-23 12:36:19 -0500 |
| commit | 0b766e4523dea156d69aab1a2a43b55f50c65071 (patch) | |
| tree | 44715eb026414d084f3f493f137b578339884a99 /src/core/hle/service/hid/controllers/touchscreen.cpp | |
| parent | 91c12db07098625756338e682a4d300a27d7978c (diff) | |
| parent | cff2d0e19e164d879b57bab9d06306fa70a1049e (diff) | |
Merge pull request #12076 from german77/resource
service: hid: Create appropriate hid resources
Diffstat (limited to 'src/core/hle/service/hid/controllers/touchscreen.cpp')
| -rw-r--r-- | src/core/hle/service/hid/controllers/touchscreen.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/hle/service/hid/controllers/touchscreen.cpp b/src/core/hle/service/hid/controllers/touchscreen.cpp index 3ef91df4b..3bcf0ee9f 100644 --- a/src/core/hle/service/hid/controllers/touchscreen.cpp +++ b/src/core/hle/service/hid/controllers/touchscreen.cpp @@ -15,8 +15,7 @@ namespace Service::HID { constexpr std::size_t SHARED_MEMORY_OFFSET = 0x400; -Controller_Touchscreen::Controller_Touchscreen(Core::HID::HIDCore& hid_core_, - u8* raw_shared_memory_) +TouchScreen::TouchScreen(Core::HID::HIDCore& hid_core_, u8* raw_shared_memory_) : ControllerBase{hid_core_} { static_assert(SHARED_MEMORY_OFFSET + sizeof(TouchSharedMemory) < shared_memory_size, "TouchSharedMemory is bigger than the shared memory"); @@ -25,13 +24,13 @@ Controller_Touchscreen::Controller_Touchscreen(Core::HID::HIDCore& hid_core_, console = hid_core.GetEmulatedConsole(); } -Controller_Touchscreen::~Controller_Touchscreen() = default; +TouchScreen::~TouchScreen() = default; -void Controller_Touchscreen::OnInit() {} +void TouchScreen::OnInit() {} -void Controller_Touchscreen::OnRelease() {} +void TouchScreen::OnRelease() {} -void Controller_Touchscreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) { +void TouchScreen::OnUpdate(const Core::Timing::CoreTiming& core_timing) { shared_memory->touch_screen_lifo.timestamp = core_timing.GetGlobalTimeNs().count(); if (!IsControllerActivated()) { |