diff options
Diffstat (limited to 'src/core/core.h')
| -rw-r--r-- | src/core/core.h | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/src/core/core.h b/src/core/core.h index 29b8fb92a..579a774e4 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -26,11 +26,11 @@ class VfsFilesystem; | |||
| 26 | } // namespace FileSys | 26 | } // namespace FileSys |
| 27 | 27 | ||
| 28 | namespace Kernel { | 28 | namespace Kernel { |
| 29 | class GlobalScheduler; | 29 | class GlobalSchedulerContext; |
| 30 | class KernelCore; | 30 | class KernelCore; |
| 31 | class PhysicalCore; | 31 | class PhysicalCore; |
| 32 | class Process; | 32 | class Process; |
| 33 | class Scheduler; | 33 | class KScheduler; |
| 34 | } // namespace Kernel | 34 | } // namespace Kernel |
| 35 | 35 | ||
| 36 | namespace Loader { | 36 | namespace Loader { |
| @@ -213,12 +213,6 @@ public: | |||
| 213 | /// Gets the index of the currently running CPU core | 213 | /// Gets the index of the currently running CPU core |
| 214 | [[nodiscard]] std::size_t CurrentCoreIndex() const; | 214 | [[nodiscard]] std::size_t CurrentCoreIndex() const; |
| 215 | 215 | ||
| 216 | /// Gets the scheduler for the CPU core that is currently running | ||
| 217 | [[nodiscard]] Kernel::Scheduler& CurrentScheduler(); | ||
| 218 | |||
| 219 | /// Gets the scheduler for the CPU core that is currently running | ||
| 220 | [[nodiscard]] const Kernel::Scheduler& CurrentScheduler() const; | ||
| 221 | |||
| 222 | /// Gets the physical core for the CPU core that is currently running | 216 | /// Gets the physical core for the CPU core that is currently running |
| 223 | [[nodiscard]] Kernel::PhysicalCore& CurrentPhysicalCore(); | 217 | [[nodiscard]] Kernel::PhysicalCore& CurrentPhysicalCore(); |
| 224 | 218 | ||
| @@ -261,17 +255,11 @@ public: | |||
| 261 | /// Gets an immutable reference to the renderer. | 255 | /// Gets an immutable reference to the renderer. |
| 262 | [[nodiscard]] const VideoCore::RendererBase& Renderer() const; | 256 | [[nodiscard]] const VideoCore::RendererBase& Renderer() const; |
| 263 | 257 | ||
| 264 | /// Gets the scheduler for the CPU core with the specified index | ||
| 265 | [[nodiscard]] Kernel::Scheduler& Scheduler(std::size_t core_index); | ||
| 266 | |||
| 267 | /// Gets the scheduler for the CPU core with the specified index | ||
| 268 | [[nodiscard]] const Kernel::Scheduler& Scheduler(std::size_t core_index) const; | ||
| 269 | |||
| 270 | /// Gets the global scheduler | 258 | /// Gets the global scheduler |
| 271 | [[nodiscard]] Kernel::GlobalScheduler& GlobalScheduler(); | 259 | [[nodiscard]] Kernel::GlobalSchedulerContext& GlobalSchedulerContext(); |
| 272 | 260 | ||
| 273 | /// Gets the global scheduler | 261 | /// Gets the global scheduler |
| 274 | [[nodiscard]] const Kernel::GlobalScheduler& GlobalScheduler() const; | 262 | [[nodiscard]] const Kernel::GlobalSchedulerContext& GlobalSchedulerContext() const; |
| 275 | 263 | ||
| 276 | /// Gets the manager for the guest device memory | 264 | /// Gets the manager for the guest device memory |
| 277 | [[nodiscard]] Core::DeviceMemory& DeviceMemory(); | 265 | [[nodiscard]] Core::DeviceMemory& DeviceMemory(); |