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

Added appletHolderActive and appletHolderCheckFinished.

Browse Source
This commit is contained in:
yellows8 2019-01-04 11:46:36 -05:00
parent f589310ef2
commit 82e526c72f
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nx/include/switch/services/applet.h
View File

@ -234,6 +234,9 @@ Result appletCreateLibraryAppletSelf(AppletHolder *h, AppletId id, LibAppletMode
/// Closes an AppletHolder object. /// Closes an AppletHolder object.
void appletHolderClose(AppletHolder *h); void appletHolderClose(AppletHolder *h);
/// Returns whether the AppletHolder object was initialized.
bool appletHolderActive(AppletHolder *h);
/** /**
* @brief Gets the IndirectLayerConsumerHandle loaded during \ref appletCreateLibraryApplet, on 2.0.0+. * @brief Gets the IndirectLayerConsumerHandle loaded during \ref appletCreateLibraryApplet, on 2.0.0+.
* @note Only available when \ref LibAppletMode is \ref LibAppletMode_Unknown3. * @note Only available when \ref LibAppletMode is \ref LibAppletMode_Unknown3.
@ -254,6 +257,12 @@ Result appletHolderStart(AppletHolder *h);
*/ */
void appletHolderJoin(AppletHolder *h); void appletHolderJoin(AppletHolder *h);
/**
* @brief Waits on the LibraryApplet StateChangedEvent with timeout=0, and returns whether it was successful.
* @param h AppletHolder object.
*/
bool appletHolderCheckFinished(AppletHolder *h);
/** /**
* @brief Gets the \ref LibAppletExitReason set by \ref appletHolderJoin. * @brief Gets the \ref LibAppletExitReason set by \ref appletHolderJoin.
* @param h AppletHolder object. * @param h AppletHolder object.

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

@ -1642,6 +1642,10 @@ void appletHolderClose(AppletHolder *h) {
memset(h, 0, sizeof(AppletHolder)); memset(h, 0, sizeof(AppletHolder));
} }
bool appletHolderActive(AppletHolder *h) {
return serviceIsActive(&h->s);
}
Result appletHolderGetIndirectLayerConsumerHandle(AppletHolder *h, u64 *out) { Result appletHolderGetIndirectLayerConsumerHandle(AppletHolder *h, u64 *out) {
if (!serviceIsActive(&h->s)) if (!serviceIsActive(&h->s))
return MAKERESULT(Module_Libnx, LibnxError_NotInitialized); return MAKERESULT(Module_Libnx, LibnxError_NotInitialized);
@ -1690,6 +1694,10 @@ void appletHolderJoin(AppletHolder *h) {
h->exitreason = res; h->exitreason = res;
} }
bool appletHolderCheckFinished(AppletHolder *h) {
return R_SUCCEEDED(eventWait(&h->StateChangedEvent, 0));
}
u32 appletHolderGetExitReason(AppletHolder *h) { u32 appletHolderGetExitReason(AppletHolder *h) {
return h->exitreason; return h->exitreason;
} }