Merge branch 'master' into great-refactor

Conflicts:
	libctru/include/3ds/services/apt.h
	libctru/source/services/apt.c

diff --cc libctru/include/3ds/services/apt.h
index 3d1930c09a57eba3609cb95446234d5efce8fa4f,133abcb07f96f8355ed6a17ce484f6a80d17cff1..04de77ad34cfde9672954f6a7adf9492571117e7
--- 1/libctru/include/3ds/services/apt.h
--- 2/libctru/include/3ds/services/apt.h
+++ b/libctru/include/3ds/services/apt.h
@@@ -91,38 -91,39 +91,39 @@@ bool aptMainLoop(void); // Use like thi
  void aptHook(aptHookCookie* cookie, aptHookFn callback, void* param);
  void aptUnhook(aptHookCookie* cookie);
  
 -Result APT_GetLockHandle(Handle* handle, u16 flags, Handle* lockHandle);
 -Result APT_Initialize(Handle* handle, NS_APPID appId, Handle* eventHandle1, Handle* eventHandle2);
 -Result APT_Finalize(Handle* handle, NS_APPID appId);
 -Result APT_HardwareResetAsync(Handle* handle);
 -Result APT_Enable(Handle* handle, u32 a);
 -Result APT_GetAppletManInfo(Handle* handle, u8 inval, u8 *outval8, u32 *outval32, NS_APPID *menu_appid, NS_APPID *active_appid);
 -Result APT_GetAppletProgramInfo(Handle* handle, u32 id, u32 flags, u16 *titleversion);
 -Result APT_PrepareToJumpToHomeMenu(Handle* handle);
 -Result APT_JumpToHomeMenu(Handle* handle, u32 a, u32 b, u32 c);
 -Result APT_PrepareToJumpToApplication(Handle* handle, u32 a);
 -Result APT_JumpToApplication(Handle* handle, u32 a, u32 b, u32 c);
 -Result APT_IsRegistered(Handle* handle, NS_APPID appID, u8* out);
 -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, u8* signalType);
 -Result APT_ReceiveParameter(Handle* handle, NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize, u8* signalType);
 -Result APT_SendParameter(Handle* handle, NS_APPID src_appID, NS_APPID dst_appID, u32 bufferSize, u32* buffer, Handle paramhandle, u8 signalType);
 -Result APT_SendCaptureBufferInfo(Handle* handle, u32 bufferSize, u32* buffer);
 -Result APT_ReplySleepQuery(Handle* handle, NS_APPID appID, u32 a);
 -Result APT_ReplySleepNotificationComplete(Handle* handle, NS_APPID appID);
 -Result APT_PrepareToCloseApplication(Handle* handle, u8 a);
 -Result APT_CloseApplication(Handle* handle, u32 a, u32 b, u32 c);
 -Result APT_SetAppCpuTimeLimit(Handle* handle, u32 percent);
 -Result APT_GetAppCpuTimeLimit(Handle* handle, u32 *percent);
 -Result APT_CheckNew3DS_Application(Handle* handle, u8 *out);// Note: this function is unreliable, see: http://3dbrew.org/wiki/APT:PrepareToStartApplication
 -Result APT_CheckNew3DS_System(Handle* handle, u8 *out);
 -Result APT_CheckNew3DS(Handle* handle, u8 *out);
 -Result APT_PrepareToDoAppJump(Handle* handle, u8 flags, u64 programID, u8 mediatype);
 -Result APT_DoAppJump(Handle* handle, u32 NSbuf0Size, u32 NSbuf1Size, u8 *NSbuf0Ptr, u8 *NSbuf1Ptr);
 -Result APT_PrepareToStartLibraryApplet(Handle* handle, NS_APPID appID);
 -Result APT_StartLibraryApplet(Handle* handle, NS_APPID appID, Handle inhandle, u32 *parambuf, u32 parambufsize);
 +Result APT_GetLockHandle(u16 flags, Handle* lockHandle);
 +Result APT_Initialize(NS_APPID appId, Handle* eventHandle1, Handle* eventHandle2);
 +Result APT_Finalize(NS_APPID appId);
 +Result APT_HardwareResetAsync(void);
 +Result APT_Enable(u32 a);
 +Result APT_GetAppletManInfo(u8 inval, u8 *outval8, u32 *outval32, NS_APPID *menu_appid, NS_APPID *active_appid);
++Result APT_GetAppletProgramInfo(u32 id, u32 flags, u16 *titleversion);
 +Result APT_PrepareToJumpToHomeMenu(void);
 +Result APT_JumpToHomeMenu(u32 a, u32 b, u32 c);
 +Result APT_PrepareToJumpToApplication(u32 a);
 +Result APT_JumpToApplication(u32 a, u32 b, u32 c);
 +Result APT_IsRegistered(NS_APPID appID, u8* out);
 +Result APT_InquireNotification(u32 appID, u8* signalType);
 +Result APT_NotifyToWait(NS_APPID appID);
 +Result APT_AppletUtility(u32* out, u32 a, u32 size1, u8* buf1, u32 size2, u8* buf2);
 +Result APT_GlanceParameter(NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize, u8* signalType);
 +Result APT_ReceiveParameter(NS_APPID appID, u32 bufferSize, u32* buffer, u32* actualSize, u8* signalType);
 +Result APT_SendParameter(NS_APPID src_appID, NS_APPID dst_appID, u32 bufferSize, u32* buffer, Handle paramhandle, u8 signalType);
 +Result APT_SendCaptureBufferInfo(u32 bufferSize, u32* buffer);
 +Result APT_ReplySleepQuery(NS_APPID appID, u32 a);
 +Result APT_ReplySleepNotificationComplete(NS_APPID appID);
 +Result APT_PrepareToCloseApplication(u8 a);
 +Result APT_CloseApplication(u32 a, u32 b, u32 c);
 +Result APT_SetAppCpuTimeLimit(u32 percent);
 +Result APT_GetAppCpuTimeLimit(u32 *percent);
 +Result APT_CheckNew3DS_Application(u8 *out);// Note: this function is unreliable, see: http://3dbrew.org/wiki/APT:PrepareToStartApplication
 +Result APT_CheckNew3DS_System(u8 *out);
 +Result APT_CheckNew3DS(u8 *out);
 +Result APT_PrepareToDoAppJump(u8 flags, u64 programID, u8 mediatype);
 +Result APT_DoAppJump(u32 NSbuf0Size, u32 NSbuf1Size, u8 *NSbuf0Ptr, u8 *NSbuf1Ptr);
 +Result APT_PrepareToStartLibraryApplet(NS_APPID appID);
 +Result APT_StartLibraryApplet(NS_APPID appID, Handle inhandle, u32 *parambuf, u32 parambufsize);
  Result APT_LaunchLibraryApplet(NS_APPID appID, Handle inhandle, u32 *parambuf, u32 parambufsize);//This should be used for launching library applets, this uses the above APT_StartLibraryApplet/APT_PrepareToStartLibraryApplet funcs + apt*Session(). parambuf is used for APT params input, when the applet closes the output param block is copied here. This is not usable from the homebrew launcher. This is broken: when the applet does get launched at all, the applet process doesn't actually get terminated when the applet gets closed.
 -Result APT_PrepareToStartSystemApplet(Handle* handle, NS_APPID appID);
 -Result APT_StartSystemApplet(Handle* handle, NS_APPID appID, u32 bufSize, Handle applHandle, u8 *buf);
 +Result APT_PrepareToStartSystemApplet(NS_APPID appID);
 +Result APT_StartSystemApplet(NS_APPID appID, u32 bufSize, Handle applHandle, u8 *buf);
  

diff --cc libctru/include/3ds/services/httpc.h
Simple merge

diff --cc libctru/source/services/apt.c
index ca0e6d3ff59f5aec001169ee0a7b02f385c3b08b,644f181b7f4a9f8d3b8ed5f79fad09c7bf8c5d70..e82821163bd5c6a623d5c51823e5c8cf4bac4033
--- 1/libctru/source/services/apt.c
--- 2/libctru/source/services/apt.c
+++ b/libctru/source/services/apt.c
@@@ -792,8 -798,25 +792,23 @@@ Result APT_GetAppletManInfo(u8 inval, u
        return cmdbuf[1];
  }
  
 -Result APT_GetAppletProgramInfo(Handle* handle, u32 id, u32 flags, u16 *titleversion)
++Result APT_GetAppletProgramInfo(u32 id, u32 flags, u16 *titleversion)
+ {
 -      if(!handle)handle=&aptuHandle;
+       u32* cmdbuf=getThreadCommandBuffer();
+       cmdbuf[0]=0x004D0080; //request header code
+       cmdbuf[1]=id;
+       cmdbuf[2]=flags;
+ 
+       Result ret=0;
 -      if((ret=svcSendSyncRequest(*handle)))return ret;
++      if((ret=svcSendSyncRequest(aptuHandle)))return ret;
+ 
+       if(titleversion)*titleversion=cmdbuf[2];
+ 
+       return cmdbuf[1];
+ }
+ 
 -Result APT_IsRegistered(Handle* handle, NS_APPID appID, u8* out)
 +Result APT_IsRegistered(NS_APPID appID, u8* out)
  {
 -      if(!handle)handle=&aptuHandle;
        u32* cmdbuf=getThreadCommandBuffer();
        cmdbuf[0]=0x90040; //request header code
        cmdbuf[1]=appID;

diff --cc libctru/source/services/hid.c
Simple merge

diff --cc libctru/source/services/httpc.c
Simple merge