From 538d1dec77361006a7677466a4ff91e8e4b48f87 Mon Sep 17 00:00:00 2001 From: Aurora Wright Date: Mon, 21 Aug 2017 19:32:39 +0200 Subject: [PATCH] Minor style stuff --- source/exceptions.c | 27 ++++++++++++--------------- source/main.c | 1 - 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/source/exceptions.c b/source/exceptions.c index c245c6f..ae14520 100644 --- a/source/exceptions.c +++ b/source/exceptions.c @@ -89,20 +89,7 @@ void detectAndProcessExceptionDumps(void) drawString(true, 10, 10, COLOR_RED, "An exception occurred"); u32 posY; if(dumpHeader->processor == 11) posY = drawFormattedString(true, 10, 30, COLOR_WHITE, "Processor: ARM11 (core %u)", dumpHeader->core); - else posY = drawString(true, 10, 30, COLOR_WHITE, "Processor: ARM9"); - - const char *faultStatusInfos = NULL; - if(dumpHeader->type >= 2) - { - u32 xfsr = dumpHeader->type == 2 ? regs[18] : regs[17]; - xfsr &= 0xF; - for(u32 i = 0; i < 15; i++) - if(xfsr == faultStatusValues[i]) - { - faultStatusInfos = faultStatusNames[i]; - break; - } - } + else posY = drawString(true, 10, 30, COLOR_WHITE, "Processor: ARM9"); if(dumpHeader->type == 2) { @@ -130,7 +117,17 @@ void detectAndProcessExceptionDumps(void) else posY = drawFormattedString(true, 10, posY + SPACING_Y, COLOR_WHITE, "Exception type: %s", handledExceptionNames[dumpHeader->type]); - if(faultStatusInfos != NULL) posY = drawFormattedString(true, 10, posY + SPACING_Y, COLOR_WHITE, "Fault status: %s", faultStatusInfos); + if(dumpHeader->type >= 2) + { + u32 xfsr = (dumpHeader->type == 2 ? regs[18] : regs[17]) & 0xF; + + for(u32 i = 0; i < 15; i++) + if(xfsr == faultStatusValues[i]) + { + posY = drawFormattedString(true, 10, posY + SPACING_Y, COLOR_WHITE, "Fault status: %s", faultStatusNames[i]); + break; + } + } if(dumpHeader->processor == 11 && dumpHeader->additionalDataSize != 0) posY = drawFormattedString(true, 10, posY + SPACING_Y, COLOR_WHITE, diff --git a/source/main.c b/source/main.c index 0772a6c..6ec75dc 100644 --- a/source/main.c +++ b/source/main.c @@ -177,7 +177,6 @@ void main(int argc, char **argv, u32 magicWord) //If it's a MCU reboot, try to force boot options if(CFG_BOOTENV && needConfig != CREATE_CONFIGURATION) { - //Always force a SysNAND boot when quitting AGB_FIRM if(CFG_BOOTENV == 7) {