summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/file_sys/kernel_executable.cpp2
-rw-r--r--src/core/file_sys/program_metadata.cpp6
-rw-r--r--src/core/file_sys/program_metadata.h4
3 files changed, 6 insertions, 6 deletions
diff --git a/src/core/file_sys/kernel_executable.cpp b/src/core/file_sys/kernel_executable.cpp
index 371300684..76313679d 100644
--- a/src/core/file_sys/kernel_executable.cpp
+++ b/src/core/file_sys/kernel_executable.cpp
@@ -147,7 +147,7 @@ std::vector<u32> KIP::GetKernelCapabilities() const {
147} 147}
148 148
149s32 KIP::GetMainThreadPriority() const { 149s32 KIP::GetMainThreadPriority() const {
150 return header.main_thread_priority; 150 return static_cast<s32>(header.main_thread_priority);
151} 151}
152 152
153u32 KIP::GetMainThreadStackSize() const { 153u32 KIP::GetMainThreadStackSize() const {
diff --git a/src/core/file_sys/program_metadata.cpp b/src/core/file_sys/program_metadata.cpp
index 7310b3602..1d6c30962 100644
--- a/src/core/file_sys/program_metadata.cpp
+++ b/src/core/file_sys/program_metadata.cpp
@@ -52,14 +52,14 @@ Loader::ResultStatus ProgramMetadata::Load(VirtualFile file) {
52} 52}
53 53
54void ProgramMetadata::LoadManual(bool is_64_bit, ProgramAddressSpaceType address_space, 54void ProgramMetadata::LoadManual(bool is_64_bit, ProgramAddressSpaceType address_space,
55 u8 main_thread_prio, u8 main_thread_core, 55 s32 main_thread_prio, u32 main_thread_core,
56 u32 main_thread_stack_size, u64 title_id, 56 u32 main_thread_stack_size, u64 title_id,
57 u64 filesystem_permissions, 57 u64 filesystem_permissions,
58 KernelCapabilityDescriptors capabilities) { 58 KernelCapabilityDescriptors capabilities) {
59 npdm_header.has_64_bit_instructions.Assign(is_64_bit); 59 npdm_header.has_64_bit_instructions.Assign(is_64_bit);
60 npdm_header.address_space_type.Assign(address_space); 60 npdm_header.address_space_type.Assign(address_space);
61 npdm_header.main_thread_priority = main_thread_prio; 61 npdm_header.main_thread_priority = static_cast<u8>(main_thread_prio);
62 npdm_header.main_thread_cpu = main_thread_core; 62 npdm_header.main_thread_cpu = static_cast<u8>(main_thread_core);
63 npdm_header.main_stack_size = main_thread_stack_size; 63 npdm_header.main_stack_size = main_thread_stack_size;
64 aci_header.title_id = title_id; 64 aci_header.title_id = title_id;
65 aci_file_access.permissions = filesystem_permissions; 65 aci_file_access.permissions = filesystem_permissions;
diff --git a/src/core/file_sys/program_metadata.h b/src/core/file_sys/program_metadata.h
index 88ec97d85..f8759a396 100644
--- a/src/core/file_sys/program_metadata.h
+++ b/src/core/file_sys/program_metadata.h
@@ -47,8 +47,8 @@ public:
47 Loader::ResultStatus Load(VirtualFile file); 47 Loader::ResultStatus Load(VirtualFile file);
48 48
49 // Load from parameters instead of NPDM file, used for KIP 49 // Load from parameters instead of NPDM file, used for KIP
50 void LoadManual(bool is_64_bit, ProgramAddressSpaceType address_space, u8 main_thread_prio, 50 void LoadManual(bool is_64_bit, ProgramAddressSpaceType address_space, s32 main_thread_prio,
51 u8 main_thread_core, u32 main_thread_stack_size, u64 title_id, 51 u32 main_thread_core, u32 main_thread_stack_size, u64 title_id,
52 u64 filesystem_permissions, KernelCapabilityDescriptors capabilities); 52 u64 filesystem_permissions, KernelCapabilityDescriptors capabilities);
53 53
54 bool Is64BitProgram() const; 54 bool Is64BitProgram() const;