lifning
/
gpsp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(CTR/3DS) build fix for ctrulib/great-refactor

This commit is contained in:
aliaspider 2015-10-21 16:37:13 +01:00
parent 67ed544c01
commit 4047ea9869
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
3ds/libkhax/khaxinit.cpp
View File

@ -977,7 +977,7 @@ Result KHAX::IsNew3DS(bool *answer, u32 kernelVersionAlreadyKnown)
// Check whether the system is a New 3DS. If this fails, abort, because being wrong would // Check whether the system is a New 3DS. If this fails, abort, because being wrong would
// crash the system. // crash the system.
u8 isNew3DS = 0; u8 isNew3DS = 0;
if (Result error = APT_CheckNew3DS(nullptr, &isNew3DS)) if (Result error = APT_CheckNew3DS(&isNew3DS))
{ {
*answer = false; *answer = false;
return error; return error;
@ -999,14 +999,14 @@ Result KHAX::GSPwn(void *dest, const void *src, std::size_t size, bool wait)
{ {
// Attempt a flush of the source, but ignore the result, since we may have just been asked to // Attempt a flush of the source, but ignore the result, since we may have just been asked to
// read unmapped memory or something similar. // read unmapped memory or something similar.
GSPGPU_FlushDataCache(nullptr, static_cast<u8 *>(const_cast<void *>(src)), size); GSPGPU_FlushDataCache(static_cast<u8 *>(const_cast<void *>(src)), size);
// Invalidate the destination's cache, since we're about to overwrite it. Likewise, ignore // Invalidate the destination's cache, since we're about to overwrite it. Likewise, ignore
// errors, since it may be the destination that is an unmapped address. // errors, since it may be the destination that is an unmapped address.
GSPGPU_InvalidateDataCache(nullptr, static_cast<u8 *>(dest), size); GSPGPU_InvalidateDataCache(static_cast<u8 *>(dest), size);
// Copy that floppy. // Copy that floppy.
if (Result result = GX_SetTextureCopy(nullptr, static_cast<u32 *>(const_cast<void *>(src)), 0, if (Result result = GX_TextureCopy(static_cast<u32 *>(const_cast<void *>(src)), 0,
static_cast<u32 *>(dest), 0, size, 8)) static_cast<u32 *>(dest), 0, size, 8))
{ {
KHAX_printf("gspwn:copy fail:%08lx\n", result); KHAX_printf("gspwn:copy fail:%08lx\n", result);