diff options
| author | 2015-05-08 21:20:37 -0400 | |
|---|---|---|
| committer | 2015-05-08 21:20:37 -0400 | |
| commit | 917ac23dfcab37c65e11e3413e397863bd4bc000 (patch) | |
| tree | 956ca5d1a4aad3383c4a3bfc9103476abe3f1987 /src/core/hle/kernel/kernel.h | |
| parent | Merge pull request #728 from lioncash/vars (diff) | |
| parent | Kernel: Remove unused g_main_thread variable (diff) | |
| download | yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.gz yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.tar.xz yuzu-917ac23dfcab37c65e11e3413e397863bd4bc000.zip | |
Merge pull request #731 from yuriks/app-info
Kernel: Process class and ExHeader caps parsing
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index a7bc6b71a..7c106d37c 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -7,6 +7,7 @@ | |||
| 7 | #include <boost/intrusive_ptr.hpp> | 7 | #include <boost/intrusive_ptr.hpp> |
| 8 | 8 | ||
| 9 | #include <array> | 9 | #include <array> |
| 10 | #include <memory> | ||
| 10 | #include <string> | 11 | #include <string> |
| 11 | #include <vector> | 12 | #include <vector> |
| 12 | 13 | ||
| @@ -15,6 +16,8 @@ | |||
| 15 | #include "core/hle/hle.h" | 16 | #include "core/hle/hle.h" |
| 16 | #include "core/hle/result.h" | 17 | #include "core/hle/result.h" |
| 17 | 18 | ||
| 19 | struct ApplicationInfo; | ||
| 20 | |||
| 18 | namespace Kernel { | 21 | namespace Kernel { |
| 19 | 22 | ||
| 20 | class Thread; | 23 | class Thread; |
| @@ -270,23 +273,10 @@ private: | |||
| 270 | 273 | ||
| 271 | extern HandleTable g_handle_table; | 274 | extern HandleTable g_handle_table; |
| 272 | 275 | ||
| 273 | /// The ID code of the currently running game | ||
| 274 | /// TODO(Subv): This variable should not be here, | ||
| 275 | /// we need a way to store information about the currently loaded application | ||
| 276 | /// for later query during runtime, maybe using the LDR service? | ||
| 277 | extern u64 g_program_id; | ||
| 278 | |||
| 279 | /// Initialize the kernel | 276 | /// Initialize the kernel |
| 280 | void Init(); | 277 | void Init(); |
| 281 | 278 | ||
| 282 | /// Shutdown the kernel | 279 | /// Shutdown the kernel |
| 283 | void Shutdown(); | 280 | void Shutdown(); |
| 284 | 281 | ||
| 285 | /** | ||
| 286 | * Loads executable stored at specified address | ||
| 287 | * @entry_point Entry point in memory of loaded executable | ||
| 288 | * @return True on success, otherwise false | ||
| 289 | */ | ||
| 290 | bool LoadExec(u32 entry_point); | ||
| 291 | |||
| 292 | } // namespace | 282 | } // namespace |