From 5bee1b0ccec444ba44bab33de24be7300308d465 Mon Sep 17 00:00:00 2001 From: Raf <> Date: Fri, 9 Aug 2024 00:50:21 +0800 Subject: [PATCH] portx64: a couple things breaking the build in github --- include/PR/os_pi.h | 2 +- port/include/preprocess.h | 5 +++-- src/lib/ultra/io/pidma.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/PR/os_pi.h b/include/PR/os_pi.h index 500ec916f..0c7459784 100644 --- a/include/PR/os_pi.h +++ b/include/PR/os_pi.h @@ -198,7 +198,7 @@ extern u32 osPiGetStatus(void); extern s32 osPiGetDeviceType(void); extern s32 osPiWriteIo(u32, u32); extern s32 osPiReadIo(u32, u32 *); -extern s32 osPiStartDma(OSIoMesg *, s32, s32, uintptr_t, void *, u32, +extern s32 osPiStartDma(OSIoMesg *, s32, s32, u32, void *, u32, OSMesgQueue *); extern void osCreatePiManager(OSPri, OSMesgQueue *, OSMesg *, s32); diff --git a/port/include/preprocess.h b/port/include/preprocess.h index c8734c1cd..36b19d9f5 100644 --- a/port/include/preprocess.h +++ b/port/include/preprocess.h @@ -14,11 +14,12 @@ void preprocessALCMidiHdr(u8 *data, u32 size); u8* preprocessSequences(u8 *data, u32 size, u32 *outSize); u8* preprocessTexturesList(u8 *data, u32 size, u32 *outSize); +void preprocessBgSection1(u8* data, u32 size); +void preprocessBgSection2(u8 *data, u32 size); +void preprocessBgSection3(u8* data, u32 size); void preprocessBgSection1Header(u8 *data, u32 size); void preprocessBgSection2Header(u8 *data, u32 size); -void preprocessBgSection2(u8 *data, u32 size); void preprocessBgSection3Header(u8 *data, u32 size); -void preprocessBgSection3(u8 *data, u32 size); void preprocessBgLights(u8 *data, u32 ofs); u8 *preprocessLangFile(u8 *data, u32 size, u32 *outSize); diff --git a/src/lib/ultra/io/pidma.c b/src/lib/ultra/io/pidma.c index 1fc7b61d7..75d758d1b 100644 --- a/src/lib/ultra/io/pidma.c +++ b/src/lib/ultra/io/pidma.c @@ -1,7 +1,7 @@ #include #include "piint.h" -s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *dramAddr, u32 size, OSMesgQueue *mq) +s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, u32 devAddr, void *dramAddr, u32 size, OSMesgQueue *mq) { register s32 ret;