From 3d40051146db6d50bfd2e4481d0c797372f039d4 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Mon, 26 Feb 2018 17:11:49 +0000 Subject: [PATCH] Rename set_core_entrypoint_and_context_id --- exosphere/src/cpu_context.c | 4 ++-- exosphere/src/package2.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/exosphere/src/cpu_context.c b/exosphere/src/cpu_context.c index 61996870c..0d86188c1 100644 --- a/exosphere/src/cpu_context.c +++ b/exosphere/src/cpu_context.c @@ -6,7 +6,7 @@ static saved_cpu_context_t g_cpu_contexts[NUM_CPU_CORES] = {0}; -void set_core_entrypoint_and_context_id(uint32_t core, uint64_t entrypoint_addr, uint64_t argument) { +void set_core_entrypoint_and_argument(uint32_t core, uint64_t entrypoint_addr, uint64_t argument) { g_cpu_contexts[core].ELR_EL3 = entrypoint_addr; g_cpu_contexts[core].argument = argument; } @@ -22,7 +22,7 @@ uint32_t cpu_on(uint32_t core, uint64_t entrypoint_addr, uint64_t argument) { return 0xFFFFFFFC; } - set_core_entrypoint_and_context_id(core, entrypoint_addr, argument); + set_core_entrypoint_and_argument(core, entrypoint_addr, argument); const uint32_t status_masks[NUM_CPU_CORES] = {0x4000, 0x200, 0x400, 0x800}; const uint32_t toggle_vals[NUM_CPU_CORES] = {0xE, 0x9, 0xA, 0xB}; diff --git a/exosphere/src/package2.c b/exosphere/src/package2.c index 7c96d1ee0..567c10277 100644 --- a/exosphere/src/package2.c +++ b/exosphere/src/package2.c @@ -436,7 +436,7 @@ void load_package2(void) { invalidate_icache_inner_shareable(); /* Set CORE0 entrypoint for Package2. */ - set_core_entrypoint_and_context_id(0, DRAM_BASE_PHYSICAL + header.metadata.entrypoint, 0); + set_core_entrypoint_and_argument(0, DRAM_BASE_PHYSICAL + header.metadata.entrypoint, 0); /* Synchronize with NX BOOTLOADER. */ if (MAILBOX_NX_BOOTLOADER_SETUP_STATE == NX_BOOTLOADER_STATE_LOADED_PACKAGE2) {