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

Fatal: Make fatalSimple not create report, add FatalType enum

Browse Source
This commit is contained in:
Michael Scire 2018-06-24 22:34:39 -06:00 committed by fincs
parent 8b2b12b454
commit c26e410ed8
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
nx/include/switch/services/fatal.h
View File

@ -7,9 +7,23 @@
#pragma once #pragma once
#include "../types.h" #include "../types.h"
typedef enum {
FatalType_ErrorReportAndErrorScreen = 0,
FatalType_ErrorReport = 1,
FatalType_ErrorScreen = 2
} FatalType;
/** /**
* @brief Triggers a system fatal error. * @brief Triggers a system fatal error.
* @param err[in] Result code to throw. * @param err[in] Result code to throw.
* @note This function does not return. * @note This function does not return.
*/ */
void NORETURN fatalSimple(Result err); void NORETURN fatalSimple(Result err);
/**
* @brief Triggers a system fatal error with a custom FatalType.
* @param err[in] Result code to throw.
* @param err[in] Type of fatal error to throw.
* @note This function does not return.
*/
void NORETURN fatalWithType(Result err, FatalType type);

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

@ -7,7 +7,12 @@
#include "services/fatal.h" #include "services/fatal.h"
#include "services/sm.h" #include "services/sm.h"
void fatalSimple(Result err) { void NORETURN fatalSimple(Result err) {
/* By default, do not generate an error report. */
fatalWithType(err, FatalType_ErrorScreen);
}
void NORETURN fatalWithType(Result err, FatalType type) {
Result rc = 0; Result rc = 0;
if (detectDebugger()) { if (detectDebugger()) {
@ -31,7 +36,7 @@ void fatalSimple(Result err) {
u64 magic; u64 magic;
u64 cmd_id; u64 cmd_id;
u64 result; u64 result;
u64 unknown; u64 type;
} *raw; } *raw;
raw = ipcPrepareHeader(&c, sizeof(*raw)); raw = ipcPrepareHeader(&c, sizeof(*raw));
@ -39,7 +44,7 @@ void fatalSimple(Result err) {
raw->magic = SFCI_MAGIC; raw->magic = SFCI_MAGIC;
raw->cmd_id = 1; raw->cmd_id = 1;
raw->result = err; raw->result = err;
raw->unknown = 0; raw->type = type;
ipcDispatch(srv); ipcDispatch(srv);
} }