mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-07-15 15:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

fatalThrow: use hosversion instead of kerneldetect (and remove old alias)

Browse Source
This commit is contained in:
fincs 2020-08-04 13:32:44 +02:00
parent 4c6abe1e41
commit d0d64ce1ce
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nx/source/services/fatal.c
View File

@ -6,12 +6,13 @@
#include "sf/service.h" #include "sf/service.h"
#include "services/fatal.h" #include "services/fatal.h"
#include "services/sm.h" #include "services/sm.h"
#include "runtime/hosversion.h"
static void _fatalCmd(Result err, FatalPolicy type, FatalCpuContext *ctx, u32 cmd_id) { static void _fatalCmd(Result err, FatalPolicy type, FatalCpuContext *ctx, u32 cmd_id) {
Result rc = 0; Result rc = 0;
//Only [3.0.0+] supports FatalPolicy_ErrorScreen, when specified on pre-3.0.0 use FatalPolicy_ErrorReportAndErrorScreen instead. //Only [3.0.0+] supports FatalPolicy_ErrorScreen, when specified on pre-3.0.0 use FatalPolicy_ErrorReportAndErrorScreen instead.
if (type == FatalPolicy_ErrorScreen && !kernelAbove300()) type = FatalPolicy_ErrorReportAndErrorScreen; if (type == FatalPolicy_ErrorScreen && hosversionBefore(3,0,0)) type = FatalPolicy_ErrorReportAndErrorScreen;
if (detectDebugger()) { if (detectDebugger()) {
svcBreak(BreakReason_Panic | BreakReason_NotificationOnlyFlag, (uintptr_t)&err, sizeof(err)); svcBreak(BreakReason_Panic | BreakReason_NotificationOnlyFlag, (uintptr_t)&err, sizeof(err));
@ -66,5 +67,3 @@ void fatalThrowWithPolicy(Result err, FatalPolicy type) {
void fatalThrowWithContext(Result err, FatalPolicy type, FatalCpuContext *ctx) { void fatalThrowWithContext(Result err, FatalPolicy type, FatalCpuContext *ctx) {
_fatalCmd(err, type, ctx, 2); _fatalCmd(err, type, ctx, 2);
} }
void NORETURN fatalSimple(Result) __attribute__((alias("fatalThrow")));