From d436aeb1de3b3f091fccf686fcf75cbc8929986a Mon Sep 17 00:00:00 2001 From: chaoskagami Date: Mon, 23 May 2016 22:51:08 -0400 Subject: [PATCH] Minor naming change --- source/firm/firm.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/source/firm/firm.c b/source/firm/firm.c index 0bdd65b..d2f7950 100644 --- a/source/firm/firm.c +++ b/source/firm/firm.c @@ -262,10 +262,14 @@ exit_error: return status; } -void __attribute__((naked)) disable_lcds() +// FAIR WARNING; This function is arm11 code, not ARM9. +// They share enough in common that this isn't a problem, +// but still worth documenting. +void __attribute__((naked)) arm11_preboot_halt() { *a11_entry = 0; // Don't wait for us + // Disables the LCD. *(volatile uint32_t*)0x10202A44 = 0; *(volatile uint32_t*)0x10202244 = 0; *(volatile uint32_t*)0x1020200C = 0; @@ -322,7 +326,7 @@ boot_firm() // No fprintf will work from here on out. - *a11_entry = (uint32_t)disable_lcds; + *a11_entry = (uint32_t)arm11_preboot_halt; while (*a11_entry) ; // Make sure it jumped there correctly before changing it. *a11_entry = (uint32_t)firm_loc->a11Entry; -- 2.39.5