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

More fatalSimple unique error codes (plus some fixing)

Browse Source
This commit is contained in:
fincs 2018-01-20 14:33:34 +01:00 committed by plutoo
parent a4cff4de13
commit 79e51cb733
4 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,6 +38,9 @@ enum {
LIBNX_TOOMANYOVERRIDES,
LIBNX_PARCELERROR,
LIBNX_BADGFXINIT,
LIBNX_BADGFXEVENTWAIT,
LIBNX_BADGFXQUEUEBUFFER,
LIBNX_BADGFXDEQUEUEBUFFER,
LIBNX_APPLETCMDIDNOTFOUND,
LIBNX_BADAPPLETRECEIVEMESSAGE,
LIBNX_BADAPPLETNOTIFYRUNNING,
@ -45,11 +48,12 @@ enum {
LIBNX_BADAPPLETGETOPERATIONMODE,
LIBNX_BADAPPLETGETPERFORMANCEMODE,
LIBNX_BADUSBCOMMSREAD,
LIBNX_BADUSBCOMMSWRITE,
LIBNX_INITFAIL_SM,
LIBNX_INITFAIL_AM,
LIBNX_INITFAIL_HID,
LIBNX_INITFAIL_FS,
LIBNX_BADGETINFO_RNG,
LIBNX_JITUNAVAILABLE,
LIBNX_WEIRDKERNEL
LIBNX_WEIRDKERNEL,
};

10
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);
if (R_FAILED(rc)) fatalSimple(LIBNX_BADGFXINIT);
if (R_FAILED(rc)) fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGFXINIT));
}
void gfxExit(void)
@ -463,7 +463,7 @@ static void _waitevent(Handle *handle) {
} while(R_FAILED(rc) || (rc2 & 0x3FFFFF)==0xFA01);
if (R_FAILED(rc2)) fatalSimple(rc2);
if (R_FAILED(rc2)) fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGFXEVENTWAIT));
}
void gfxWaitForVsync(void) {
@ -475,9 +475,11 @@ void gfxSwapBuffers(void) {
rc = _gfxQueueBuffer(g_gfxCurrentProducerBuffer);
if (R_SUCCEEDED(rc)) rc = _gfxDequeueBuffer();
if (R_FAILED(rc)) fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGFXQUEUEBUFFER));
if (R_FAILED(rc)) fatalSimple(rc);
rc = _gfxDequeueBuffer();
if (R_FAILED(rc)) fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADGFXDEQUEUEBUFFER));
}
u8* gfxGetFramebuffer(u32* width, u32* height) {

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

@ -264,7 +264,7 @@ size_t usbCommsRead(void* buffer, size_t size)
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 (R_FAILED(ret))fatalSimple(LIBNX_BADUSBCOMMSREAD);
if (R_FAILED(ret))fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADUSBCOMMSREAD));
}
return transferredSize;
}
@ -280,7 +280,7 @@ size_t usbCommsWrite(const void* buffer, size_t size)
if (R_SUCCEEDED(ret2)) {
if (state!=5) ret = _usbCommsWrite(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(MAKERESULT(MODULE_LIBNX, LIBNX_BADUSBCOMMSWRITE));
}
return transferredSize;
}

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

@ -507,7 +507,7 @@ void appletNotifyRunning(u8 *out) {
}
}
if (R_FAILED(rc)) fatalSimple(LIBNX_BADAPPLETNOTIFYRUNNING);
if (R_FAILED(rc)) fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADAPPLETNOTIFYRUNNING));
}
static Result _appletReceiveMessage(u32 *out) {
@ -851,7 +851,7 @@ bool appletMainLoop(void) {
if ((rc & 0x3fffff) == 0x680)
return true;
fatalSimple(LIBNX_BADAPPLETRECEIVEMESSAGE);
fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADAPPLETRECEIVEMESSAGE));
}
switch(msg) {
@ -861,7 +861,7 @@ bool appletMainLoop(void) {
if (R_SUCCEEDED(rc))
appletCallHook(AppletHookType_OnFocusState);
else
fatalSimple(LIBNX_BADAPPLETGETCURRENTFOCUSSTATE);
fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADAPPLETGETCURRENTFOCUSSTATE));
break;
case 0x1E:
@ -870,7 +870,7 @@ bool appletMainLoop(void) {
if (R_SUCCEEDED(rc))
appletCallHook(AppletHookType_OnOperationMode);
else
fatalSimple(LIBNX_BADAPPLETGETOPERATIONMODE);
fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADAPPLETGETOPERATIONMODE));
break;
case 0x1F:
@ -879,7 +879,7 @@ bool appletMainLoop(void) {
if (R_SUCCEEDED(rc))
appletCallHook(AppletHookType_OnPerformanceMode);
else
fatalSimple(LIBNX_BADAPPLETGETPERFORMANCEMODE);
fatalSimple(MAKERESULT(MODULE_LIBNX, LIBNX_BADAPPLETGETPERFORMANCEMODE));
break;
}