From 48fe9d0f461cdaffdb621c2ce0eb0446a5dd43c3 Mon Sep 17 00:00:00 2001
From: angie <angheloalf95@gmail.com>
Date: Tue, 19 Sep 2023 15:32:30 -0300
Subject: [PATCH] fix merge

---
 include/PR/os_internal_rsp.h | 4 ++--
 src/libultra/io/sptask.c     | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/PR/os_internal_rsp.h b/include/PR/os_internal_rsp.h
index e7c3512910..63c8bf8d1e 100644
--- a/include/PR/os_internal_rsp.h
+++ b/include/PR/os_internal_rsp.h
@@ -6,7 +6,7 @@
 
 u32 __osSpGetStatus(void);
 void __osSpSetStatus(u32 data);
-s32 __osSpSetPc(void* pc);
-s32 __osSpRawStartDma(s32 direction, void* devAddr, void* dramAddr, size_t size);
+s32 __osSpSetPc(u32 pc);
+s32 __osSpRawStartDma(s32 direction, u32 devAddr, void* dramAddr, size_t size);
 
 #endif
diff --git a/src/libultra/io/sptask.c b/src/libultra/io/sptask.c
index 35ddeaf612..b261664f00 100644
--- a/src/libultra/io/sptask.c
+++ b/src/libultra/io/sptask.c
@@ -36,6 +36,7 @@ void osSpTaskLoad(OSTask* intp) {
             tp->t.ucode = IO_READ((uintptr_t)intp->t.yieldDataPtr + OS_YIELD_DATA_SIZE - 4);
         }
     }
+
     osWritebackDCache(tp, sizeof(OSTask));
     __osSpSetStatus(SP_CLR_SIG0 | SP_CLR_SIG1 | SP_CLR_SIG2 | SP_SET_INTR_BREAK);