From df85a86c5d2fd20b8e61c0caec89673591e65a59 Mon Sep 17 00:00:00 2001 From: Stephen Miller Date: Sat, 26 Apr 2025 19:03:58 -0500 Subject: [PATCH] Proper struct names --- src/core/libraries/kernel/equeue.h | 8 ++++---- src/core/libraries/videoout/video_out.cpp | 2 +- src/core/libraries/videoout/video_out.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/core/libraries/kernel/equeue.h b/src/core/libraries/kernel/equeue.h index 7de14410f..70cf9eb6f 100644 --- a/src/core/libraries/kernel/equeue.h +++ b/src/core/libraries/kernel/equeue.h @@ -61,13 +61,13 @@ struct SceKernelEvent { void* udata = nullptr; /* opaque user data identifier */ }; -struct DceHint { +struct OrbisVideoOutEventHint { u64 event_id : 8; u64 video_id : 8; u64 flip_arg : 48; }; -struct DceData { +struct OrbisVideoOutEventData { u64 time : 12; u64 count : 4; u64 flip_arg : 48; @@ -97,9 +97,9 @@ struct EqueueEvent { void TriggerDisplay(void* data) { is_triggered = true; if (data != nullptr) { - auto event_data = static_cast(event.data); + auto event_data = static_cast(event.data); auto event_hint_raw = reinterpret_cast(data); - auto event_hint = static_cast(event_hint_raw); + auto event_hint = static_cast(event_hint_raw); if (event_hint.event_id == event.ident && event.ident != 0xfe) { auto time = Common::FencedRDTSC(); auto counter = event_data.count; diff --git a/src/core/libraries/videoout/video_out.cpp b/src/core/libraries/videoout/video_out.cpp index 4e7d2cc56..c5208b6dd 100644 --- a/src/core/libraries/videoout/video_out.cpp +++ b/src/core/libraries/videoout/video_out.cpp @@ -233,7 +233,7 @@ s32 PS4_SYSV_ABI sceVideoOutGetEventCount(const Kernel::SceKernelEvent* ev) { return ORBIS_VIDEO_OUT_ERROR_INVALID_EVENT; } - auto event_data = static_cast(ev->data); + auto event_data = static_cast(ev->data); return event_data.count; } diff --git a/src/core/libraries/videoout/video_out.h b/src/core/libraries/videoout/video_out.h index 67b9e63af..2f697ff46 100644 --- a/src/core/libraries/videoout/video_out.h +++ b/src/core/libraries/videoout/video_out.h @@ -111,7 +111,7 @@ struct SceVideoOutColorSettings { u32 reserved[3]; }; -struct VideoOutEventData { +struct OrbisVideoOutEventData { u64 time : 12; u64 count : 4; u64 flip_arg : 48;