Ports/perfect_dark
1
0 Fork 1
mirror of https://github.com/perfect-dark-pc-port/perfect_dark.git synced 2026-10-23 15:52:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

portx64: a couple things breaking the build in github - actual fix, plus renamed more functions in filebg.c

Browse Source
This commit is contained in:
Raf committed 2024-08-09 01:21:28 +08:00
1 parent 5bee1b0cce
commit a9e82658fd
4 files changed
+7 -26
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/PR/os_pi.h
+2 -2
View File
@@ -37,7 +37,7 @@ extern "C" {
#include <PR/ultratypes.h> #include <PR/ultratypes.h>
#include "os_thread.h" #include "os_thread.h"
#include "os_message.h" #include "os_message.h"
#include <stdint.h>
#if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS) #if defined(_LANGUAGE_C) || defined(_LANGUAGE_C_PLUS_PLUS)
@@ -198,7 +198,7 @@ extern u32 osPiGetStatus(void);
extern s32 osPiGetDeviceType(void); extern s32 osPiGetDeviceType(void);
extern s32 osPiWriteIo(u32, u32); extern s32 osPiWriteIo(u32, u32);
extern s32 osPiReadIo(u32, u32 *); extern s32 osPiReadIo(u32, u32 *);
extern s32 osPiStartDma(OSIoMesg *, s32, s32, u32, void *, u32, extern s32 osPiStartDma(OSIoMesg *, s32, s32, uintptr_t, void *, u32,
OSMesgQueue *); OSMesgQueue *);
extern void osCreatePiManager(OSPri, OSMesgQueue *, OSMesg *, s32); extern void osCreatePiManager(OSPri, OSMesgQueue *, OSMesg *, s32);
port/include/preprocess.h
+2 -1
View File
@@ -14,13 +14,14 @@ void preprocessALCMidiHdr(u8 *data, u32 size);
u8* preprocessSequences(u8 *data, u32 size, u32 *outSize); u8* preprocessSequences(u8 *data, u32 size, u32 *outSize);
u8* preprocessTexturesList(u8 *data, u32 size, u32 *outSize); u8* preprocessTexturesList(u8 *data, u32 size, u32 *outSize);
void preprocessBgSection1(u8* data, u32 size); void preprocessBgSection1(u8* data, u32 size, u32 ofs);
void preprocessBgSection2(u8 *data, u32 size); void preprocessBgSection2(u8 *data, u32 size);
void preprocessBgSection3(u8* data, u32 size); void preprocessBgSection3(u8* data, u32 size);
void preprocessBgSection1Header(u8 *data, u32 size); void preprocessBgSection1Header(u8 *data, u32 size);
void preprocessBgSection2Header(u8 *data, u32 size); void preprocessBgSection2Header(u8 *data, u32 size);
void preprocessBgSection3Header(u8 *data, u32 size); void preprocessBgSection3Header(u8 *data, u32 size);
void preprocessBgLights(u8 *data, u32 ofs); void preprocessBgLights(u8 *data, u32 ofs);
u32 preprocessBgRoom(u8* data, u32 size, u32 room_ofs);
u8 *preprocessLangFile(u8 *data, u32 size, u32 *outSize); u8 *preprocessLangFile(u8 *data, u32 size, u32 *outSize);
u8 *preprocessPadsFile(u8 *data, u32 size, u32 *outSize); u8 *preprocessPadsFile(u8 *data, u32 size, u32 *outSize);
port/src/preprocess/filebg.c
+2 -22
View File
@@ -515,7 +515,7 @@ static u32 convertSection1(u8 *dst, u8 *src, u32 ofs)
return dstpos; return dstpos;
} }
static void convert_section2_texturenums(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos, u32 srclen) static void convertSection2TextureNums(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos, u32 srclen)
{ {
u16 *src_ids = (u16 *) &src[*srcpos]; u16 *src_ids = (u16 *) &src[*srcpos];
u16 *dst_ids = (u16 *) &dst[*dstpos]; u16 *dst_ids = (u16 *) &dst[*dstpos];
@@ -529,7 +529,7 @@ static void convert_section2_texturenums(u8 *dst, u32 *dstpos, u8 *src, u32 *src
*dstpos += srclen; *dstpos += srclen;
} }
static void convert_section3_bboxes(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos) static void convertSection3Bboxes(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
{ {
s16 *src_bboxes = (s16 *) &src[*srcpos]; s16 *src_bboxes = (s16 *) &src[*srcpos];
s16 *dst_bboxes = (s16 *) &dst[*dstpos]; s16 *dst_bboxes = (s16 *) &dst[*dstpos];
@@ -547,26 +547,6 @@ static void convert_section3_bboxes(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
*dstpos += sizeof(s16) * 6 * (m_NumRooms - 1); *dstpos += sizeof(s16) * 6 * (m_NumRooms - 1);
} }
static void convert_section3_allocsizes(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
{
u16 *dst_sizes = (u16 *) &dst[*dstpos];
for (int i = 0; i < m_NumRooms; i++) {
dst_sizes[i] = (m_AllocSizes[i] - 0x100) / 0x10;
}
*srcpos += sizeof(u16) * (m_NumRooms - 1);
*dstpos += sizeof(u16) * (m_NumRooms - 1);
}
static void convert_section3_lightcounts(u8 *dst, u32 *dstpos, u8 *src, u32 *srcpos)
{
memcpy(&dst[*dstpos], &src[*srcpos], m_NumRooms);
*srcpos += (m_NumRooms - 1);
*dstpos += (m_NumRooms - 1);
}
void preprocessBgSection1(u8 *data, u32 size, u32 ofs) void preprocessBgSection1(u8 *data, u32 size, u32 ofs)
{ {
u8 *dst = sysMemZeroAlloc(size); u8 *dst = sysMemZeroAlloc(size);
src/lib/ultra/io/pidma.c
+1 -1
View File
@@ -1,7 +1,7 @@
#include <os_internal.h> #include <os_internal.h>
#include "piint.h" #include "piint.h"
s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, u32 devAddr, void *dramAddr, u32 size, OSMesgQueue *mq) s32 osPiStartDma(OSIoMesg *mb, s32 priority, s32 direction, uintptr_t devAddr, void *dramAddr, u32 size, OSMesgQueue *mq)
{ {
register s32 ret; register s32 ret;