kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update aurora

Browse source
This commit is contained in:
dbalatoni13 2025-04-07 17:42:11 +02:00
parent b480f7bfce
commit 5fbbec3502
5 changed files with 30 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
extern/aurora vendored

@ -1 +1 @@
Subproject commit f713ca675055fa522bf44e2d326eb3e7941ec381
Subproject commit 10bcf955aaabf8e1470ab07da51302a2ca3a8bfa

4
include/dolphin/os.h
View file

@ -29,8 +29,8 @@ u32 __OSCoreClock AT_ADDRESS(OS_BASE_CACHED | 0x00FC); // sync with OSLoMem.h
#define OS_BUS_CLOCK (u32) __OSBusClock
#define OS_CORE_CLOCK __OSCoreClock
#else
#define OS_BUS_CLOCK 162000000
#define OS_BUS_CLOCK 486000000
#define OS_BUS_CLOCK 162000000ull
#define OS_CORE_CLOCK 486000000ull
#endif
#define OS_TIMER_CLOCK (OS_BUS_CLOCK / 4)

32
src/REL/bootDll/main.c
View file

@ -541,17 +541,17 @@ void ObjectSetup(void)
s16 sprite;
AnimData *sprite_data;
s16 i;
titleMdlId[0] = model = Hu3DModelCreateFile(TITLE_CHAR_HSF);
Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
titleMdlId[1] = model = Hu3DModelCreateFile(TITLE_CUBE_HSF);
Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
titleMdlId[2] = model = Hu3DModelCreateFile(TITLE_SKY_HSF);
Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
Hu3DModelCameraInfoSet(model, 1);
Hu3DModelLightInfoSet(model, 1);
//titleMdlId[0] = model = Hu3DModelCreateFile(TITLE_CHAR_HSF);
//Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
//Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
//titleMdlId[1] = model = Hu3DModelCreateFile(TITLE_CUBE_HSF);
//Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
//Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
//titleMdlId[2] = model = Hu3DModelCreateFile(TITLE_SKY_HSF);
//Hu3DModelAttrSet(model, HU3D_ATTR_DISPOFF);
//Hu3DModelAttrSet(model, HU3D_MOTATTR_LOOP);
//Hu3DModelCameraInfoSet(model, 1);
//Hu3DModelLightInfoSet(model, 1);
#if VERSION_NTSC
bootGrpId = HuSprGrpCreate(4);
#else
@ -613,8 +613,8 @@ void ObjectSetup(void)
s16 choice;
float temp;
repeat:
Hu3DModelAttrReset(titleMdlId[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(titleMdlId[1], HU3D_ATTR_DISPOFF);
//Hu3DModelAttrReset(titleMdlId[0], HU3D_ATTR_DISPOFF);
//Hu3DModelAttrReset(titleMdlId[1], HU3D_ATTR_DISPOFF);
HuSprAttrReset(bootGrpId, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(bootGrpId, 1, HUSPR_ATTR_DISPOFF);
#ifdef __MWERKS__
@ -766,9 +766,9 @@ void ObjectSetup(void)
while (WipeStatGet()) {
HuPrcVSleep();
}
Hu3DModelAttrSet(titleMdlId[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(titleMdlId[1], HU3D_ATTR_DISPOFF);
Hu3DModelAttrSet(titleMdlId[2], HU3D_ATTR_DISPOFF);
//Hu3DModelAttrSet(titleMdlId[0], HU3D_ATTR_DISPOFF);
//Hu3DModelAttrSet(titleMdlId[1], HU3D_ATTR_DISPOFF);
//Hu3DModelAttrSet(titleMdlId[2], HU3D_ATTR_DISPOFF);
#if VERSION_NTSC
HuSprAttrSet(bootGrpId, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrSet(bootGrpId, 1, HUSPR_ATTR_DISPOFF);

9
src/port/OS.c
View file

@ -28,11 +28,6 @@ static LARGE_INTEGER PerfFrequency;
u8 LC_CACHE_BASE[4096];
static u64 GetGCTicksPerSec()
{
return 486000000ull;
}
static u64 GetGCTicks()
{
#if __APPLE__
@ -45,7 +40,7 @@ static u64 GetGCTicks()
#elif _WIN32
LARGE_INTEGER perf;
QueryPerformanceCounter(&perf);
perf.QuadPart *= GetGCTicksPerSec();
perf.QuadPart *= OS_CORE_CLOCK;
perf.QuadPart /= PerfFrequency.QuadPart;
return perf.QuadPart;
#else
@ -64,7 +59,7 @@ void OSInit()
#if __APPLE__
mach_timebase_info_data_t timebase;
mach_timebase_info(&timebase);
MachToDolphinNum = GetGCTicksPerSec() * timebase.numer;
MachToDolphinNum = OS_CORE_CLOCK * timebase.numer;
MachToDolphinDenom = 1000000000ull * timebase.denom;
#elif _WIN32
QueryPerformanceFrequency(&PerfFrequency);

19
src/port/stubs.c
View file

@ -452,7 +452,7 @@ void VIConfigurePan(u16 xOrg, u16 yOrg, u16 width, u16 height)
u32 VIGetRetraceCount()
{
puts("VIGetRetraceCount is a stub");
// puts("VIGetRetraceCount is a stub");
return 0; // TODO this might be important
}
@ -469,12 +469,12 @@ void VISetBlack(BOOL black)
void VISetNextFrameBuffer(void *fb)
{
puts("VISetNextFrameBuffer is a stub");
// puts("VISetNextFrameBuffer is a stub");
}
void VIWaitForRetrace()
{
puts("VIWaitForRetrace is a stub");
// puts("VIWaitForRetrace is a stub");
}
s32 __CARDFormatRegionAsync(int a, int b)
@ -587,7 +587,7 @@ void GXReadVCacheMetric(u32 *check, u32 *miss, u32 *stall)
void GXSetDrawSync(u16 token)
{
puts("GXSetDrawSync is a stub");
// puts("GXSetDrawSync is a stub");
}
GXDrawSyncCallback GXSetDrawSyncCallback(GXDrawSyncCallback cb)
@ -635,17 +635,17 @@ void GXNormal3s16(s16 x, s16 y, s16 z)
void GXPosition2u16(const u16 x, const u16 y)
{
puts("GXPosition2u16 is a stub");
GXPosition3f32(x, y, 0);
}
void GXPosition2f32(const f32 x, const f32 y)
{
puts("GXPosition2f32 is a stub");
GXPosition3f32(x, y, 0);
}
void GXPosition2s16(const s16 x, const s16 y)
{
puts("GXPosition2s16 is a stub");
GXPosition3f32(x, y, 0);
}
void GXColor1x8(u8 index)
@ -688,18 +688,17 @@ void msmSysRegularProc(void)
void msmMusFdoutEnd(void)
{
puts("msmMusFdoutEnd is a stub");
}
s32 HuSoftResetButtonCheck(void)
{
puts("HuSoftResetButtonCheck is a stub");
//puts("HuSoftResetButtonCheck is a stub");
return 0;
}
void MGSeqMain(void)
{
puts("MGSeqMain is a stub");
// puts("MGSeqMain is a stub");
}
// TODO remove