diff options
| author | 2019-01-31 23:05:00 -0500 | |
|---|---|---|
| committer | 2019-01-31 23:05:15 -0500 | |
| commit | 414cc1eb1fdbaa0001938711665f47c940bed3c7 (patch) | |
| tree | c3897dd1193d322b52aba555fcb422badee1520d /src/core/hle/kernel/kernel.h | |
| parent | Merge pull request #2072 from lioncash/service (diff) | |
| download | yuzu-414cc1eb1fdbaa0001938711665f47c940bed3c7.tar.gz yuzu-414cc1eb1fdbaa0001938711665f47c940bed3c7.tar.xz yuzu-414cc1eb1fdbaa0001938711665f47c940bed3c7.zip | |
kernel: Remove the Timer class
A holdover from citra, the Horizon kernel on the switch has no
prominent kernel object that functions as a timer. At least not
to the degree of sophistication that this class provided.
As such, this can be removed entirely. This class also wasn't used at
all in any meaningful way within the core, so this was just code sitting
around doing nothing. This also allows removing a few things from the
main KernelCore class that allows it to use slightly less resources
overall (though very minor and not anything really noticeable).
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 58c9d108b..c643a6401 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -22,7 +22,6 @@ class HandleTable; | |||
| 22 | class Process; | 22 | class Process; |
| 23 | class ResourceLimit; | 23 | class ResourceLimit; |
| 24 | class Thread; | 24 | class Thread; |
| 25 | class Timer; | ||
| 26 | 25 | ||
| 27 | /// Represents a single instance of the kernel. | 26 | /// Represents a single instance of the kernel. |
| 28 | class KernelCore { | 27 | class KernelCore { |
| @@ -51,9 +50,6 @@ public: | |||
| 51 | /// Retrieves a shared pointer to a Thread instance within the thread wakeup handle table. | 50 | /// Retrieves a shared pointer to a Thread instance within the thread wakeup handle table. |
| 52 | SharedPtr<Thread> RetrieveThreadFromWakeupCallbackHandleTable(Handle handle) const; | 51 | SharedPtr<Thread> RetrieveThreadFromWakeupCallbackHandleTable(Handle handle) const; |
| 53 | 52 | ||
| 54 | /// Retrieves a shared pointer to a Timer instance within the timer callback handle table. | ||
| 55 | SharedPtr<Timer> RetrieveTimerFromCallbackHandleTable(Handle handle) const; | ||
| 56 | |||
| 57 | /// Adds the given shared pointer to an internal list of active processes. | 53 | /// Adds the given shared pointer to an internal list of active processes. |
| 58 | void AppendNewProcess(SharedPtr<Process> process); | 54 | void AppendNewProcess(SharedPtr<Process> process); |
| 59 | 55 | ||
| @@ -82,7 +78,6 @@ private: | |||
| 82 | friend class Object; | 78 | friend class Object; |
| 83 | friend class Process; | 79 | friend class Process; |
| 84 | friend class Thread; | 80 | friend class Thread; |
| 85 | friend class Timer; | ||
| 86 | 81 | ||
| 87 | /// Creates a new object ID, incrementing the internal object ID counter. | 82 | /// Creates a new object ID, incrementing the internal object ID counter. |
| 88 | u32 CreateNewObjectID(); | 83 | u32 CreateNewObjectID(); |
| @@ -93,15 +88,9 @@ private: | |||
| 93 | /// Creates a new thread ID, incrementing the internal thread ID counter. | 88 | /// Creates a new thread ID, incrementing the internal thread ID counter. |
| 94 | u64 CreateNewThreadID(); | 89 | u64 CreateNewThreadID(); |
| 95 | 90 | ||
| 96 | /// Creates a timer callback handle for the given timer. | ||
| 97 | ResultVal<Handle> CreateTimerCallbackHandle(const SharedPtr<Timer>& timer); | ||
| 98 | |||
| 99 | /// Retrieves the event type used for thread wakeup callbacks. | 91 | /// Retrieves the event type used for thread wakeup callbacks. |
| 100 | CoreTiming::EventType* ThreadWakeupCallbackEventType() const; | 92 | CoreTiming::EventType* ThreadWakeupCallbackEventType() const; |
| 101 | 93 | ||
| 102 | /// Retrieves the event type used for timer callbacks. | ||
| 103 | CoreTiming::EventType* TimerCallbackEventType() const; | ||
| 104 | |||
| 105 | /// Provides a reference to the thread wakeup callback handle table. | 94 | /// Provides a reference to the thread wakeup callback handle table. |
| 106 | Kernel::HandleTable& ThreadWakeupCallbackHandleTable(); | 95 | Kernel::HandleTable& ThreadWakeupCallbackHandleTable(); |
| 107 | 96 | ||