From: smea <smealum@gmail.com>
Date: Tue, 27 May 2014 18:49:50 +0000 (+0200)
Subject: Merge branch 'master' of github.com:smealum/ctrulib
X-Git-Tag: v0.2.0~150
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=4beea431842407fb18067314adac10d7b24cb221;p=corbenik%2Fctrulib.git

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

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

4beea431842407fb18067314adac10d7b24cb221
diff --cc libctru/include/ctr/GSP.h
index 166fedb,57f3cdf..5ac95ea
--- a/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 fc4d886,a47acdd..7aa56f7
--- a/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];