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

APT : preliminary support for exiting app

Browse Source
This commit is contained in:
smea 2014-02-01 13:27:52 +01:00
parent 4250f91d55
commit 30e765f52c
6 changed files with 126 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arm11u/source/main.c
View File

@ -118,7 +118,7 @@ int main()
aptSetupEventHandler();
while(1)
while(!aptGetStatus())
{
u32 PAD=((u32*)0x10000000)[7];
renderEffect();
@ -129,6 +129,7 @@ int main()
svc_sleepThread(1000000000);
}
aptExit();
svc_exitProcess();
return 0;
}

10
libctru/include/ctr/APT.h
View File

@ -11,9 +11,12 @@ typedef enum{
extern Handle aptEvents[3];
void aptInit();
void aptExit();
void aptOpenSession();
void aptCloseSession();
void aptSetupEventHandler();
u32 aptGetStatus();
void aptSetStatus(u32 status);
Result APT_GetLockHandle(Handle* handle, u16 flags, Handle* lockHandle);
Result APT_Initialize(Handle* handle, NS_APPID appId, Handle* eventHandle1, Handle* eventHandle2);
@ -23,7 +26,10 @@ Result APT_JumpToHomeMenu(Handle* handle, u32 a, u32 b, u32 c);
Result APT_InquireNotification(Handle* handle, u32 appID, u8* signalType);
Result APT_NotifyToWait(Handle* handle, NS_APPID appID);
Result APT_AppletUtility(Handle* handle, u32* out, u32 a, u32 size1, u8* buf1, u32 size2, u8* buf2);
Result APT_GlanceParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize);
Result APT_ReceiveParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize);
Result APT_GlanceParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize, u8* signalType);
Result APT_ReceiveParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize, u8* signalType);
Result APT_ReplySleepQuery(Handle* handle, NS_APPID appID, u32 a);
Result APT_PrepareToCloseApplication(Handle* handle, u8 a);
Result APT_CloseApplication(Handle* handle, u32 a, u32 b, u32 c);
#endif

1
libctru/include/ctr/svc.h
View File

@ -7,6 +7,7 @@
Result svc_createThread(Handle* thread, ThreadFunc entrypoint, u32 arg, u32* stacktop, s32 threadpriority, s32 processorid);
void svc_exitThread();
void svc_sleepThread(s64 ns);
Result svc_createMutex(Handle* mutex, bool initialLocked);
Result svc_releaseMutex(Handle handle);
Result svc_controlMemory(u32* outaddr, u32 addr0, u32 addr1, u32 size, u32 operation, u32 permissions); //(outaddr is usually the same as the input addr0)
Result svc_createEvent(Handle* event, u8 resettype);

107
libctru/source/APT.c
View File

@ -16,6 +16,9 @@ Handle aptEvents[3];
Handle aptEventHandlerThread;
u64 aptEventHandlerStack[APT_HANDLER_STACKSIZE/8]; //u64 so that it's 8-byte aligned
Handle aptStatusMutex;
u32 aptStatus;
u32 aptParameters[0x1000/4]; //TEMP
void aptEventHandler(u32 arg)
@ -55,11 +58,27 @@ void aptEventHandler(u32 arg)
break;
case 0x1: //event 1 means app just started or we're returning to app
{
u8 signalType;
aptOpenSession();
APT_ReceiveParameter(NULL, APPID_APPLICATION, 0x1000, aptParameters, NULL);
APT_ReceiveParameter(NULL, APPID_APPLICATION, 0x1000, aptParameters, NULL, &signalType);
aptCloseSession();
// if(!draw)GSPGPU_AcquireRight(NULL, 0x0);
switch(signalType)
{
case 0x1: //application just started
break;
case 0xB: //just returned from menu
GSPGPU_AcquireRight(NULL, 0x0);
break;
case 0xC: //exiting application
aptOpenSession();
APT_ReplySleepQuery(NULL, APPID_APPLICATION, 0x0);
aptCloseSession();
runThread=false;
aptSetStatus(1); //app exit signal
break;
}
}
break;
case 0x2: //event 2 means we should exit the thread
@ -90,6 +109,17 @@ void aptInit()
aptCloseSession();
}
void aptExit()
{
aptOpenSession();
APT_PrepareToCloseApplication(NULL, 0x1);
aptCloseSession();
aptOpenSession();
APT_CloseApplication(NULL, 0x0, 0x0, 0x0);
aptCloseSession();
}
void aptSetupEventHandler()
{
u8 buf1[4], buf2[4];
@ -116,10 +146,30 @@ void aptSetupEventHandler()
APT_AppletUtility(NULL, NULL, 0x4, 0x1, buf1, 0x1, buf2);
aptCloseSession();
svc_createMutex(&aptStatusMutex, true);
aptStatus=0;
svc_releaseMutex(aptStatusMutex);
//create thread for stuff handling APT events
svc_createThread(&aptEventHandlerThread, aptEventHandler, 0x0, (u32*)(&aptEventHandlerStack[APT_HANDLER_STACKSIZE/8]), 0x31, 0xfffffffe);
}
u32 aptGetStatus()
{
u32 ret;
svc_waitSynchronization1(aptStatusMutex, U64_MAX);
ret=aptStatus;
svc_releaseMutex(aptStatusMutex);
return ret;
}
void aptSetStatus(u32 status)
{
svc_waitSynchronization1(aptStatusMutex, U64_MAX);
aptStatus=status;
svc_releaseMutex(aptStatusMutex);
}
void aptOpenSession()
{
svc_waitSynchronization1(aptLockHandle, U64_MAX);
@ -255,7 +305,7 @@ Result APT_AppletUtility(Handle* handle, u32* out, u32 a, u32 size1, u8* buf1, u
return cmdbuf[1];
}
Result APT_GlanceParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize)
Result APT_GlanceParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize, u8* signalType)
{
if(!handle)handle=&aptuHandle;
u32* cmdbuf=getThreadCommandBuffer();
@ -269,12 +319,13 @@ Result APT_GlanceParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32*
Result ret=0;
if((ret=svc_sendSyncRequest(*handle)))return ret;
if(signalType)*signalType=cmdbuf[3];
if(actualSize)*actualSize=cmdbuf[4];
return cmdbuf[1];
}
Result APT_ReceiveParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize)
Result APT_ReceiveParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize, u8* signalType)
{
if(!handle)handle=&aptuHandle;
u32* cmdbuf=getThreadCommandBuffer();
@ -288,7 +339,55 @@ Result APT_ReceiveParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32*
Result ret=0;
if((ret=svc_sendSyncRequest(*handle)))return ret;
if(signalType)*signalType=cmdbuf[3];
if(actualSize)*actualSize=cmdbuf[4];
return cmdbuf[1];
}
Result APT_ReplySleepQuery(Handle* handle, NS_APPID appID, u32 a)
{
if(!handle)handle=&aptuHandle;
u32* cmdbuf=getThreadCommandBuffer();
cmdbuf[0]=0x3E0080; //request header code
cmdbuf[1]=appID;
cmdbuf[2]=a;
Result ret=0;
if((ret=svc_sendSyncRequest(*handle)))return ret;
return cmdbuf[1];
}
Result APT_PrepareToCloseApplication(Handle* handle, u8 a)
{
if(!handle)handle=&aptuHandle;
u32* cmdbuf=getThreadCommandBuffer();
cmdbuf[0]=0x220040; //request header code
cmdbuf[1]=a;
Result ret=0;
if((ret=svc_sendSyncRequest(*handle)))return ret;
return cmdbuf[1];
}
Result APT_CloseApplication(Handle* handle, u32 a, u32 b, u32 c)
{
if(!handle)handle=&aptuHandle;
u32* cmdbuf=getThreadCommandBuffer();
cmdbuf[0]=0x270044; //request header code
cmdbuf[1]=a;
cmdbuf[2]=0x0;
cmdbuf[3]=b;
cmdbuf[4]=(a<<14)|2;
cmdbuf[5]=c;
Result ret=0;
if((ret=svc_sendSyncRequest(*handle)))return ret;
return cmdbuf[1];
}

9
libctru/source/svc.s
View File

@ -52,6 +52,15 @@ svc_sleepThread:
svc 0x0A
bx lr
.global svc_createMutex
.type svc_createMutex, %function
svc_createMutex:
str r0, [sp, #-4]!
svc 0x13
ldr r3, [sp], #4
str r1, [r3]
bx lr
.global svc_releaseMutex
.type svc_releaseMutex, %function
svc_releaseMutex:

3
sdmc/source/main.c
View File

@ -131,7 +131,7 @@ int main()
aptSetupEventHandler();
while(1)
while(!aptGetStatus())
{
u32 PAD=((u32*)0x10000000)[7];
renderEffect();
@ -142,6 +142,7 @@ int main()
svc_sleepThread(1000000000);
}
aptExit();
svc_exitProcess();
return 0;
}