DevKit7/libctru
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

apt: Add APT_LockTransition, use it in aptWaitForWakeUp

Browse Source
This commit is contained in:
fincs 2020-06-10 21:46:48 +02:00
parent 6ce690828c
commit b48b5da211
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libctru/include/3ds/services/apt.h
View File

@ -371,10 +371,16 @@ Result APT_AppletUtility(int id, void* out, size_t outSize, const void* in, size
/// Sleeps if shell is closed (?). /// Sleeps if shell is closed (?).
Result APT_SleepIfShellClosed(void); Result APT_SleepIfShellClosed(void);
/**
* @brief Locks a transition (?).
* @param transition Transition ID.
* @param flag Flag (?)
*/
Result APT_LockTransition(u32 transition, bool flag);
/** /**
* @brief Tries to lock a transition (?). * @brief Tries to lock a transition (?).
* @param transition Transition ID. * @param transition Transition ID.
* @param succeeded Pointer to output whether the lock was successfully applied.
*/ */
Result APT_TryLockTransition(u32 transition, bool* succeeded); Result APT_TryLockTransition(u32 transition, bool* succeeded);

18
libctru/source/services/apt.c
View File

@ -480,9 +480,9 @@ APT_Command aptWaitForWakeUp(APT_Transition transition)
{ {
APT_Command cmd; APT_Command cmd;
APT_NotifyToWait(envGetAptAppId()); APT_NotifyToWait(envGetAptAppId());
aptFlags &= ~FLAG_ACTIVE;
if (transition != TR_ENABLE) if (transition != TR_ENABLE)
APT_SleepIfShellClosed(); APT_SleepIfShellClosed();
aptFlags &= ~FLAG_ACTIVE;
for (;;) for (;;)
{ {
Result res = aptReceiveParameter(&cmd, NULL, NULL); Result res = aptReceiveParameter(&cmd, NULL, NULL);
@ -512,8 +512,8 @@ APT_Command aptWaitForWakeUp(APT_Transition transition)
APT_SleepIfShellClosed(); APT_SleepIfShellClosed();
} else } else
{ {
bool dummy; aptHomeButtonState = 1;
APT_TryLockTransition(0x01, &dummy); APT_LockTransition(0x01, true);
} }
if (transition == TR_JUMPTOMENU || transition == TR_LIBAPPLET || transition == TR_SYSAPPLET || transition == TR_APPJUMP) if (transition == TR_JUMPTOMENU || transition == TR_LIBAPPLET || transition == TR_SYSAPPLET || transition == TR_APPJUMP)
@ -991,6 +991,18 @@ Result APT_SleepIfShellClosed(void)
return APT_AppletUtility(4, &out, sizeof(out), &in, sizeof(in)); return APT_AppletUtility(4, &out, sizeof(out), &in, sizeof(in));
} }
Result APT_LockTransition(u32 transition, bool flag)
{
const struct
{
u32 transition;
bool flag;
u8 padding[3];
} in = { transition, flag, {0} };
u8 out;
return APT_AppletUtility(5, &out, sizeof(out), &in, sizeof(in));
}
Result APT_TryLockTransition(u32 transition, bool* succeeded) Result APT_TryLockTransition(u32 transition, bool* succeeded)
{ {
return APT_AppletUtility(6, &succeeded, sizeof(succeeded), &transition, sizeof(transition)); return APT_AppletUtility(6, &succeeded, sizeof(succeeded), &transition, sizeof(transition));