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

Make fatalSimple error codes unique

Browse Source
This commit is contained in:
fincs 2018-01-15 20:33:13 +01:00 committed by plutoo
parent eec1fc2fcc
commit a8a15f7d16
5 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
nx/include/switch/result.h
View File

@ -23,7 +23,8 @@ enum {
LIBNX_BADRELOC=1, LIBNX_BADRELOC=1,
LIBNX_OUTOFMEM, LIBNX_OUTOFMEM,
LIBNX_ALREADYMAPPED, LIBNX_ALREADYMAPPED,
LIBNX_BADGETINFO, LIBNX_BADGETINFO_STACK,
LIBNX_BADGETINFO_HEAP,
LIBNX_BADQUERYMEMORY, LIBNX_BADQUERYMEMORY,
LIBNX_ALREADYINITIALIZED, LIBNX_ALREADYINITIALIZED,
LIBNX_NOTINITIALIZED, LIBNX_NOTINITIALIZED,
@ -36,8 +37,16 @@ enum {
LIBNX_HEAPALLOCFAILED, LIBNX_HEAPALLOCFAILED,
LIBNX_TOOMANYOVERRIDES, LIBNX_TOOMANYOVERRIDES,
LIBNX_PARCELERROR, LIBNX_PARCELERROR,
LIBNX_BADGFXINIT,
LIBNX_APPLETCMDIDNOTFOUND,
LIBNX_BADAPPLETRECEIVEMESSAGE,
LIBNX_BADAPPLETNOTIFYRUNNING,
LIBNX_BADAPPLETGETCURRENTFOCUSSTATE,
LIBNX_BADAPPLETGETOPERATIONMODE,
LIBNX_BADAPPLETGETPERFORMANCEMODE,
LIBNX_BADUSBCOMMSREAD,
LIBNX_INITFAIL_SM, LIBNX_INITFAIL_SM,
LIBNX_INITFAIL_AM, LIBNX_INITFAIL_AM,
LIBNX_INITFAIL_HID, LIBNX_INITFAIL_HID,
LIBNX_INITFAIL_FS LIBNX_INITFAIL_FS,
}; };

2
nx/source/gfx/gfx.c
View File

@ -314,7 +314,7 @@ void gfxInitDefault(void)
} }
Result rc = _gfxInit(ViServiceType_Default, "Default", ViLayerFlags_Default, 0, nv_servicetype, 0x300000); Result rc = _gfxInit(ViServiceType_Default, "Default", ViLayerFlags_Default, 0, nv_servicetype, 0x300000);
if (R_FAILED(rc)) fatalSimple(rc); if (R_FAILED(rc)) fatalSimple(LIBNX_BADGFXINIT);
} }
void gfxExit(void) void gfxExit(void)

4
nx/source/kernel/virtmem.c
View File

@ -48,11 +48,11 @@ void virtmemSetup(void) {
} }
if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_STACK], 2, 3))) { if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_STACK], 2, 3))) {
fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGETINFO)); fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGETINFO_STACK));
} }
if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_HEAP], 4, 5))) { if (R_FAILED(_GetRegionFromInfo(&g_Region[REGION_HEAP], 4, 5))) {
fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGETINFO)); fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGETINFO_HEAP));
} }
// Failure is OK, happens on 1.0.0 // Failure is OK, happens on 1.0.0

2
nx/source/runtime/devices/usb_comms.c
View File

@ -272,7 +272,7 @@ size_t usbCommsRead(void* buffer, size_t size)
if (R_SUCCEEDED(ret2)) { if (R_SUCCEEDED(ret2)) {
if (state!=5) ret = _usbCommsRead(buffer, size, &transferredSize); //If state changed during transfer, try again. usbDsWaitReady() will be called from this. if (state!=5) ret = _usbCommsRead(buffer, size, &transferredSize); //If state changed during transfer, try again. usbDsWaitReady() will be called from this.
} }
if (R_FAILED(ret))fatalSimple(ret); if (R_FAILED(ret))fatalSimple(LIBNX_BADUSBCOMMSREAD);
} }
return transferredSize; return transferredSize;
} }

15
nx/source/services/applet.c
View File

@ -92,7 +92,7 @@ Result appletInitialize(void)
case AppletType_OverlayApplet: cmd_id = 300; break; case AppletType_OverlayApplet: cmd_id = 300; break;
case AppletType_SystemApplication: cmd_id = 350; break; case AppletType_SystemApplication: cmd_id = 350; break;
// TODO: Replace error code // TODO: Replace error code
default: fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_NOTFOUND)); default: fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_APPLETCMDIDNOTFOUND));
} }
rc = _appletGetSessionProxy(&g_appletProxySession, cmd_id, CUR_PROCESS_HANDLE, NULL); rc = _appletGetSessionProxy(&g_appletProxySession, cmd_id, CUR_PROCESS_HANDLE, NULL);
@ -507,7 +507,7 @@ void appletNotifyRunning(u8 *out) {
} }
} }
if (R_FAILED(rc)) fatalSimple(rc); if (R_FAILED(rc)) fatalSimple(LIBNX_BADAPPLETNOTIFYRUNNING);
} }
static Result _appletReceiveMessage(u32 *out) { static Result _appletReceiveMessage(u32 *out) {
@ -851,7 +851,7 @@ bool appletMainLoop(void) {
if ((rc & 0x3fffff) == 0x680) if ((rc & 0x3fffff) == 0x680)
return true; return true;
fatalSimple(rc); fatalSimple(LIBNX_BADAPPLETRECEIVEMESSAGE);
} }
switch(msg) { switch(msg) {
@ -860,6 +860,8 @@ bool appletMainLoop(void) {
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
appletCallHook(AppletHookType_OnFocusState); appletCallHook(AppletHookType_OnFocusState);
else
fatalSimple(LIBNX_BADAPPLETGETCURRENTFOCUSSTATE);
break; break;
case 0x1E: case 0x1E:
@ -867,6 +869,8 @@ bool appletMainLoop(void) {
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
appletCallHook(AppletHookType_OnOperationMode); appletCallHook(AppletHookType_OnOperationMode);
else
fatalSimple(LIBNX_BADAPPLETGETOPERATIONMODE);
break; break;
case 0x1F: case 0x1F:
@ -874,12 +878,11 @@ bool appletMainLoop(void) {
if (R_SUCCEEDED(rc)) if (R_SUCCEEDED(rc))
appletCallHook(AppletHookType_OnPerformanceMode); appletCallHook(AppletHookType_OnPerformanceMode);
else
fatalSimple(LIBNX_BADAPPLETGETPERFORMANCEMODE);
break; break;
} }
if (R_FAILED(rc))
fatalSimple(rc);
return true; return true;
} }