diff options
| author | 2021-05-07 23:30:17 -0700 | |
|---|---|---|
| committer | 2021-05-07 23:30:17 -0700 | |
| commit | faa067f175cbf5e916ed75776817f0046e6731c4 (patch) | |
| tree | 8ab02a72a6e4d6578848c8da2c02af02684aeec7 /src/core/core.h | |
| parent | Merge pull request #6287 from lioncash/ldr-copy (diff) | |
| parent | hle: kernel: KPageTable: CanContain should not be constexpr. (diff) | |
| download | yuzu-faa067f175cbf5e916ed75776817f0046e6731c4.tar.gz yuzu-faa067f175cbf5e916ed75776817f0046e6731c4.tar.xz yuzu-faa067f175cbf5e916ed75776817f0046e6731c4.zip | |
Merge pull request #6266 from bunnei/kautoobject-refactor
Kernel Rework: Migrate kernel objects to KAutoObject
Diffstat (limited to 'src/core/core.h')
| -rw-r--r-- | src/core/core.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/core.h b/src/core/core.h index f1068d23f..8b93ba998 100644 --- a/src/core/core.h +++ b/src/core/core.h | |||
| @@ -12,7 +12,6 @@ | |||
| 12 | 12 | ||
| 13 | #include "common/common_types.h" | 13 | #include "common/common_types.h" |
| 14 | #include "core/file_sys/vfs_types.h" | 14 | #include "core/file_sys/vfs_types.h" |
| 15 | #include "core/hle/kernel/object.h" | ||
| 16 | 15 | ||
| 17 | namespace Core::Frontend { | 16 | namespace Core::Frontend { |
| 18 | class EmuWindow; | 17 | class EmuWindow; |
| @@ -29,7 +28,7 @@ namespace Kernel { | |||
| 29 | class GlobalSchedulerContext; | 28 | class GlobalSchedulerContext; |
| 30 | class KernelCore; | 29 | class KernelCore; |
| 31 | class PhysicalCore; | 30 | class PhysicalCore; |
| 32 | class Process; | 31 | class KProcess; |
| 33 | class KScheduler; | 32 | class KScheduler; |
| 34 | } // namespace Kernel | 33 | } // namespace Kernel |
| 35 | 34 | ||
| @@ -264,10 +263,10 @@ public: | |||
| 264 | [[nodiscard]] const Core::DeviceMemory& DeviceMemory() const; | 263 | [[nodiscard]] const Core::DeviceMemory& DeviceMemory() const; |
| 265 | 264 | ||
| 266 | /// Provides a pointer to the current process | 265 | /// Provides a pointer to the current process |
| 267 | [[nodiscard]] Kernel::Process* CurrentProcess(); | 266 | [[nodiscard]] Kernel::KProcess* CurrentProcess(); |
| 268 | 267 | ||
| 269 | /// Provides a constant pointer to the current process. | 268 | /// Provides a constant pointer to the current process. |
| 270 | [[nodiscard]] const Kernel::Process* CurrentProcess() const; | 269 | [[nodiscard]] const Kernel::KProcess* CurrentProcess() const; |
| 271 | 270 | ||
| 272 | /// Provides a reference to the core timing instance. | 271 | /// Provides a reference to the core timing instance. |
| 273 | [[nodiscard]] Timing::CoreTiming& CoreTiming(); | 272 | [[nodiscard]] Timing::CoreTiming& CoreTiming(); |