From fd8dd82a8d22b9d7d978004038b69e151d8714e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Dellac=C3=A0?= Date: Wed, 22 Jul 2020 21:21:21 +0200 Subject: [PATCH] fixed various build errors --- k11_extension/source/svc/ControlProcess.c | 9 +++++++-- sysmodules/rosalina/source/draw.c | 4 ++-- sysmodules/rosalina/source/input_redirection.c | 4 ++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/k11_extension/source/svc/ControlProcess.c b/k11_extension/source/svc/ControlProcess.c index d77d94a..3becc07 100644 --- a/k11_extension/source/svc/ControlProcess.c +++ b/k11_extension/source/svc/ControlProcess.c @@ -5,8 +5,13 @@ typedef bool (*ThreadPredicate)(KThread *thread); -void rosalinaLockThread(KThread *thread); -void rosalinaRescheduleThread(KThread *thread, bool lock); +static void rosalinaLockThread(KThread *thread) +{ + KThread *syncThread = synchronizationMutex->owner; + + if(syncThread == NULL || syncThread != thread) + rosalinaRescheduleThread(thread, true); +} Result ControlProcess(Handle processHandle, ProcessOp op, u32 varg2, u32 varg3) { diff --git a/sysmodules/rosalina/source/draw.c b/sysmodules/rosalina/source/draw.c index 5685f66..f8ee672 100644 --- a/sysmodules/rosalina/source/draw.c +++ b/sysmodules/rosalina/source/draw.c @@ -277,7 +277,7 @@ void Draw_CreateBitmapHeader(u8 *dst, u32 width, u32 heigth) Draw_WriteUnaligned(dst + 0x22, 3 * width * heigth, 4); } -static inline void Draw_ConvertPixelToBGR8(u8 *dst, const u8 *src, GSPGPU_FramebufferFormats srcFormat) +static inline void Draw_ConvertPixelToBGR8(u8 *dst, const u8 *src, GSPGPU_FramebufferFormat srcFormat) { u8 red, green, blue; switch(srcFormat) @@ -354,7 +354,7 @@ static void Draw_ConvertFrameBufferLinesKernel(const FrameBufferConvertArgs *arg { static const u8 formatSizes[] = { 4, 3, 2, 2, 2 }; - GSPGPU_FramebufferFormats fmt = args->top ? (GSPGPU_FramebufferFormats)(GPU_FB_TOP_FMT & 7) : (GSPGPU_FramebufferFormats)(GPU_FB_BOTTOM_FMT & 7); + GSPGPU_FramebufferFormat fmt = args->top ? (GSPGPU_FramebufferFormat)(GPU_FB_TOP_FMT & 7) : (GSPGPU_FramebufferFormat)(GPU_FB_BOTTOM_FMT & 7); u32 width = args->width; u32 stride = args->top ? GPU_FB_TOP_STRIDE : GPU_FB_BOTTOM_STRIDE; diff --git a/sysmodules/rosalina/source/input_redirection.c b/sysmodules/rosalina/source/input_redirection.c index 9174c48..2956845 100644 --- a/sysmodules/rosalina/source/input_redirection.c +++ b/sysmodules/rosalina/source/input_redirection.c @@ -223,7 +223,7 @@ static Result InputRedirection_DoUndoIrPatches(Handle processHandle, bool doPatc totalSize = (u32)(textTotalRoundedSize + rodataTotalRoundedSize + dataTotalRoundedSize); svcGetProcessInfo(&startAddress, processHandle, 0x10005); - res = svcMapProcessMemoryEx(processHandle, 0x00100000, (u32) startAddress, totalSize); + res = svcMapProcessMemoryEx(CUR_PROCESS_HANDLE, 0x00100000, processHandle, (u32) startAddress, totalSize); if(R_SUCCEEDED(res) && !patchPrepared) { @@ -358,7 +358,7 @@ static Result InputRedirection_DoUndoHidPatches(Handle processHandle, bool doPat totalSize = (u32)(textTotalRoundedSize + rodataTotalRoundedSize + dataTotalRoundedSize); svcGetProcessInfo(&startAddress, processHandle, 0x10005); - res = svcMapProcessMemoryEx(processHandle, 0x00100000, (u32) startAddress, totalSize); + res = svcMapProcessMemoryEx(CUR_PROCESS_HANDLE, 0x00100000, processHandle, (u32) startAddress, totalSize); if (R_SUCCEEDED(res) && !patchPrepared) {