Update FIRM loading magic, only deinit LCDs if they are inited, fix ntrboot naming

2017-09-07 05:24:43 +02:00
parent bc1aa15dd7
commit 4116c1e00f
5 changed files with 8 additions and 4 deletions
--- a/source/config.c
+++ b/source/config.c
@@ -240,7 +240,7 @@ void configMenu(bool oldPinStatus, u32 oldPinMode)
    initScreens();

    static const char *bootTypes[] = { "B9S",
-                                       "B9S (ntrboothax)",
+                                       "B9S (ntrboot)",
                                       "FIRM0",
                                       "FIRM1" };

--- a/source/utils.c
+++ b/source/utils.c
@@ -107,7 +107,7 @@ void mcuPowerOff(void)
    if(bootType != FIRMLAUNCH && ARESCREENSINITIALIZED) clearScreens(false);

    //Shutdown LCD
-    i2cWriteRegister(I2C_DEV_MCU, 0x22, 1 << 0);
+    if(ARESCREENSINITIALIZED) i2cWriteRegister(I2C_DEV_MCU, 0x22, 1 << 0);

    //Ensure that all memory transfers have completed and that the data cache has been flushed
    flushEntireDCache();