From f34d3d7e84a1396d4d4f07ec1434b06b1f39bb8a Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 23 Dec 2023 13:58:09 -0500 Subject: core_timing: remove user data value --- src/core/core_timing.h | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/core/core_timing.h') diff --git a/src/core/core_timing.h b/src/core/core_timing.h index 21548f0a9..d86337cdc 100644 --- a/src/core/core_timing.h +++ b/src/core/core_timing.h @@ -22,7 +22,7 @@ namespace Core::Timing { /// A callback that may be scheduled for a particular core timing event. using TimedCallback = std::function( - std::uintptr_t user_data, s64 time, std::chrono::nanoseconds ns_late)>; + s64 time, std::chrono::nanoseconds ns_late)>; /// Contains the characteristics of a particular event. struct EventType { @@ -89,22 +89,19 @@ public: /// Schedules an event in core timing void ScheduleEvent(std::chrono::nanoseconds ns_into_future, - const std::shared_ptr& event_type, std::uintptr_t user_data = 0, - bool absolute_time = false); + const std::shared_ptr& event_type, bool absolute_time = false); /// Schedules an event which will automatically re-schedule itself with the given time, until /// unscheduled void ScheduleLoopingEvent(std::chrono::nanoseconds start_time, std::chrono::nanoseconds resched_time, const std::shared_ptr& event_type, - std::uintptr_t user_data = 0, bool absolute_time = false); + bool absolute_time = false); - void UnscheduleEvent(const std::shared_ptr& event_type, std::uintptr_t user_data, - bool wait = true); + void UnscheduleEvent(const std::shared_ptr& event_type, bool wait = true); - void UnscheduleEventWithoutWait(const std::shared_ptr& event_type, - std::uintptr_t user_data) { - UnscheduleEvent(event_type, user_data, false); + void UnscheduleEventWithoutWait(const std::shared_ptr& event_type) { + UnscheduleEvent(event_type, false); } void AddTicks(u64 ticks_to_add); @@ -158,7 +155,6 @@ private: heap_t event_queue; u64 event_fifo_id = 0; - std::shared_ptr ev_lost; Common::Event event{}; Common::Event pause_event{}; mutable std::mutex basic_lock; -- cgit v1.2.3