Merge branch 'master' of github.com:smealum/ctrulib

Conflicts:
	libctru/include/ctr/GSP.h
	libctru/source/GSP.c

diff --cc gpu/Makefile
Simple merge

diff --cc libctru/include/ctr/GSP.h
index 166fedb77e05153c43bb1585f74e6a2e9983fd4a,57f3cdf6629a63854f8579d06aec7d161914c5d8..5ac95ea77fd9c4575e37ad98d9bda1ba9dc99eba
--- 1/libctru/include/ctr/GSP.h
--- 2/libctru/include/ctr/GSP.h
+++ b/libctru/include/ctr/GSP.h
@@@ -8,9 -32,13 +32,13 @@@ void gspExit()
  
  Result GSPGPU_AcquireRight(Handle *handle, u8 flags);
  Result GSPGPU_ReleaseRight(Handle *handle);
+ Result GSPGPU_ImportDisplayCaptureInfo(Handle* handle, GSP_CaptureInfo *captureinfo);
+ Result GSPGPU_SaveVramSysArea(Handle* handle);
+ Result GSPGPU_RestoreVramSysArea(Handle* handle);
  Result GSPGPU_SetLcdForceBlack(Handle *handle, u8 flags);
+ Result GSPGPU_SetBufferSwap(Handle* handle, u32 screenid, GSP_FramebufferInfo *framebufinfo);
  Result GSPGPU_FlushDataCache(Handle *handle, u8* adr, u32 size);
 -Result GSPGPU_InvalidateDataCache(Handle* handle, u8 *adr, u32 size);
 +Result GSPGPU_InvalidateDataCache(Handle* handle, u8* adr, u32 size);
  Result GSPGPU_WriteHWRegs(Handle *handle, u32 regAddr, u32* data, u8 size);
  Result GSPGPU_WriteHWRegsWithMask(Handle* handle, u32 regAddr, u32* data, u8 datasize, u32* maskdata, u8 masksize);
  Result GSPGPU_ReadHWRegs(Handle *handle, u32 regAddr, u32* data, u8 size);

diff --cc libctru/source/GSP.c
index fc4d886d0d07239c2732ce103998b85214fa93af,a47acdde55b684193d3db0b09e1f6f239a04aa6a..7aa56f7d42da20acc8fb95cfb6a366ce50aba586
--- 1/libctru/source/GSP.c
--- 2/libctru/source/GSP.c
+++ b/libctru/source/GSP.c
@@@ -78,18 -140,19 +140,19 @@@ Result GSPGPU_FlushDataCache(Handle* ha
        return cmdbuf[1];
  }
  
 -Result GSPGPU_InvalidateDataCache(Handle* handle, u8 *adr, u32 size)
 +Result GSPGPU_InvalidateDataCache(Handle* handle, u8* adr, u32 size)
  {
+       Result ret=0;
+       u32 *cmdbuf = getThreadCommandBuffer();
+ 
        if(!handle)handle=&gspGpuHandle;
-       
-       u32* cmdbuf=getThreadCommandBuffer();
-       cmdbuf[0]=0x90082; //request header code
-       cmdbuf[1]=(u32)adr;
-       cmdbuf[2]=size;
-       cmdbuf[3]=0x0;
-       cmdbuf[4]=0xffff8001;
  
-       Result ret=0;
+       cmdbuf[0] = 0x00090082;
+       cmdbuf[1] = (u32)adr;
+       cmdbuf[2] = size;
+       cmdbuf[3] = 0;
+       cmdbuf[4] = 0xFFFF8001;
+ 
        if((ret=svc_sendSyncRequest(*handle)))return ret;
  
        return cmdbuf[1];