diff options
| author | 2015-05-11 18:23:45 -0500 | |
|---|---|---|
| committer | 2015-05-11 18:23:45 -0500 | |
| commit | 25c010dc7dda010175da42e1184e87cd1a45cbe4 (patch) | |
| tree | 0bb75d868f4e46987627a9cfdc798e05013488ab /src/core/hle/kernel | |
| parent | Core/HLE: Implemented the SVCs GetProcessId and GetProcessIdOfThread (diff) | |
| download | yuzu-25c010dc7dda010175da42e1184e87cd1a45cbe4.tar.gz yuzu-25c010dc7dda010175da42e1184e87cd1a45cbe4.tar.xz yuzu-25c010dc7dda010175da42e1184e87cd1a45cbe4.zip | |
fixup!
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/process.h | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 87a0dbe37..b5c98b249 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -137,8 +137,10 @@ void Init() { | |||
| 137 | Kernel::ThreadingInit(); | 137 | Kernel::ThreadingInit(); |
| 138 | Kernel::TimersInit(); | 138 | Kernel::TimersInit(); |
| 139 | 139 | ||
| 140 | Process::next_process_id = 0; | ||
| 141 | Object::next_object_id = 0; | 140 | Object::next_object_id = 0; |
| 141 | // TODO(Subv): Start the process ids from 10 for now, as lower PIDs are | ||
| 142 | // reserved for low-level services | ||
| 143 | Process::next_process_id = 10; | ||
| 142 | } | 144 | } |
| 143 | 145 | ||
| 144 | /// Shutdown the kernel | 146 | /// Shutdown the kernel |
diff --git a/src/core/hle/kernel/process.h b/src/core/hle/kernel/process.h index 11c2ad12d..22cd1049b 100644 --- a/src/core/hle/kernel/process.h +++ b/src/core/hle/kernel/process.h | |||
| @@ -57,12 +57,6 @@ public: | |||
| 57 | 57 | ||
| 58 | static u32 next_process_id; | 58 | static u32 next_process_id; |
| 59 | 59 | ||
| 60 | /* | ||
| 61 | * Gets the process' id | ||
| 62 | * @returns The process' id | ||
| 63 | */ | ||
| 64 | u32 GetProcessId() const { return process_id; } | ||
| 65 | |||
| 66 | /// Name of the process | 60 | /// Name of the process |
| 67 | std::string name; | 61 | std::string name; |
| 68 | /// Title ID corresponding to the process | 62 | /// Title ID corresponding to the process |