summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoraliaspider2015-10-21 16:37:13 +0100
committeraliaspider2015-10-21 16:37:13 +0100
commit4047ea98691d46971cdf75e6c1abe42d9b50de9f (patch)
tree9c9910e5b6a08cb9cd51e2245c57ad0817da3387
parent67ed544c015c4a8d6e3c41f026663a523d5563a9 (diff)
downloadpicogpsp-4047ea98691d46971cdf75e6c1abe42d9b50de9f.tar.gz
picogpsp-4047ea98691d46971cdf75e6c1abe42d9b50de9f.tar.bz2
picogpsp-4047ea98691d46971cdf75e6c1abe42d9b50de9f.zip
(CTR/3DS) build fix for ctrulib/great-refactor
-rw-r--r--3ds/libkhax/khaxinit.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/3ds/libkhax/khaxinit.cpp b/3ds/libkhax/khaxinit.cpp
index 5c5ad81..795195a 100644
--- a/3ds/libkhax/khaxinit.cpp
+++ b/3ds/libkhax/khaxinit.cpp
@@ -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
// crash the system.
u8 isNew3DS = 0;
- if (Result error = APT_CheckNew3DS(nullptr, &isNew3DS))
+ if (Result error = APT_CheckNew3DS(&isNew3DS))
{
*answer = false;
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
// 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
// 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.
- 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))
{
KHAX_printf("gspwn:copy fail:%08lx\n", result);