From 8ebe60d2452889cd9699dfc742fe45ab38e2b0fd Mon Sep 17 00:00:00 2001 From: mrb0nk500 Date: Thu, 2 Feb 2023 15:48:16 -0400 Subject: sdk: Add the rest of Dolphin SDK to object file list --- obj_files.mk | 56 +++++++++++++++++++++++++++++++++++++++++++++++- src/Dolphin/dvd/dvd.c | 8 +++++-- src/Dolphin/dvd/dvdlow.c | 41 ++++++++++++++++++++++++++++++++++- src/Dolphin/os/OSFont.c | 2 +- 4 files changed, 102 insertions(+), 5 deletions(-) diff --git a/obj_files.mk b/obj_files.mk index 24a0fb6..57edbc9 100644 --- a/obj_files.mk +++ b/obj_files.mk @@ -34,4 +34,58 @@ O_FILES := $(BUILD_DIR)/src/main.o \ $(BUILD_DIR)/src/Dolphin/mtx/mtx.o \ $(BUILD_DIR)/src/Dolphin/mtx/mtxvec.o \ $(BUILD_DIR)/src/Dolphin/mtx/mtx44.o \ - $(BUILD_DIR)/src/Dolphin/mtx/vec.o + $(BUILD_DIR)/src/Dolphin/mtx/vec.o \ + $(BUILD_DIR)/src/Dolphin/dvd/dvdlow.o \ + $(BUILD_DIR)/src/Dolphin/dvd/dvdfs.o \ + $(BUILD_DIR)/src/Dolphin/dvd/dvd.o \ + $(BUILD_DIR)/src/Dolphin/dvd/dvdqueue.o \ + $(BUILD_DIR)/src/Dolphin/dvd/dvderror.o \ + $(BUILD_DIR)/src/Dolphin/dvd/fstload.o \ + $(BUILD_DIR)/src/Dolphin/vi/vi.o \ + $(BUILD_DIR)/src/Dolphin/pad/pad.o \ + $(BUILD_DIR)/src/Dolphin/ai.o \ + $(BUILD_DIR)/src/Dolphin/ar/ar.o \ + $(BUILD_DIR)/src/Dolphin/ar/arq.o \ + $(BUILD_DIR)/src/Dolphin/dsp/dsp.o \ + $(BUILD_DIR)/src/Dolphin/dsp/dsp_debug.o \ + $(BUILD_DIR)/src/Dolphin/dsp/dsp_task.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDBios.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDUnlock.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDRdwr.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDBlock.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDDir.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDCheck.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDMount.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDFormat.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDOpen.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDCreate.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDRead.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDWrite.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDStat.o \ + $(BUILD_DIR)/src/Dolphin/card/CARDNet.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXInit.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXFifo.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXAttr.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXMisc.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXGeometry.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXFrameBuf.o \ + $(BUILD_DIR)/src/Dolphin/gx/GXLight.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXTexture.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXBump.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXTev.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXPixel.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXDraw.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXStubs.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXDisplayList.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXTransform.o \ + $(BUILD_DIR)/asm/Dolphin/gx/GXPerf.o \ + $(BUILD_DIR)/asm/Dolphin/gd/GDBase.o \ + $(BUILD_DIR)/asm/Dolphin/gd/GDGeometry.o \ + $(BUILD_DIR)/asm/Dolphin/gd/GDLight.o \ + $(BUILD_DIR)/asm/Dolphin/gd/GDPixel.o \ + $(BUILD_DIR)/asm/Dolphin/gd/GDTev.o \ + $(BUILD_DIR)/asm/Dolphin/gd/GDTransform.o \ + $(BUILD_DIR)/src/Dolphin/si/SIBios.o \ + $(BUILD_DIR)/src/Dolphin/si/SISamplingRate.o \ + $(BUILD_DIR)/src/Dolphin/exi/EXIBios.o \ + $(BUILD_DIR)/src/Dolphin/exi/EXIUart.o diff --git a/src/Dolphin/dvd/dvd.c b/src/Dolphin/dvd/dvd.c index 65c67f6..176ee49 100644 --- a/src/Dolphin/dvd/dvd.c +++ b/src/Dolphin/dvd/dvd.c @@ -4,7 +4,7 @@ #include #include -const char* __DVDVersion = "<< Dolphin SDK - DVD\trelease build: Sep 5 2002 05:34:06 (0x2301) >>"; +//const char* __DVDVersion = "<< Dolphin SDK - DVD\trelease build: Sep 5 2002 05:34:06 (0x2301) >>"; typedef void (*stateFunc)(DVDCommandBlock* block); stateFunc LastState; @@ -84,7 +84,7 @@ void DVDInit() { return; } - OSRegisterVersion(__DVDVersion); + //OSRegisterVersion(__DVDVersion); DVDInitialized = TRUE; __DVDFSInit(); __DVDClearWaitingQueue(); @@ -97,10 +97,14 @@ void DVDInit() { __DIRegs[0] = 0x2a; __DIRegs[1] = 0; if (bootInfo->magic == 0xE5207C22) { + OSReport("app booted via JTAG\n"); OSReport("load fst\n"); __fstLoad(); } else if (bootInfo->magic != 0xD15EA5E) { FirstTimeInBootrom = TRUE; + OSReport("bootrom\n"); + } else { + OSReport("app booted from bootrom\n"); } } diff --git a/src/Dolphin/dvd/dvdlow.c b/src/Dolphin/dvd/dvdlow.c index 1a939ba..037bd47 100644 --- a/src/Dolphin/dvd/dvdlow.c +++ b/src/Dolphin/dvd/dvdlow.c @@ -76,7 +76,7 @@ static void AlarmHandlerForTimeout(OSAlarm* alarm, OSContext* context) { } static void Read(u32 tmp1, u32 tmp2, u32 tmp3, DVDLowCallback tmp4) { - + } static void SeekTwiceBeforeRead() { @@ -99,6 +99,45 @@ BOOL DVDLowWaitCoverClose(DVDLowCallback callback) { return TRUE; } +void DVDLowStopMotor() { + +} + +void DVDLowRequestAudioStatus() { + +} + +void DVDLowAudioStream() { + +} + +void DVDLowAudioBufferConfig() { + +} + +void DVDLowInquiry() { + +} + +void DVDLowReadDiskID() { + +} + +void DVDLowBreak() { + +} + +DVDLowCallback DVDLowClearCallback() { + +} + +void DVDLowRequestError() { + +} + +void DVDLowReset() { + +} void __DVDLowSetWAType(u32 type, u32 location) { BOOL enabled; diff --git a/src/Dolphin/os/OSFont.c b/src/Dolphin/os/OSFont.c index 34224bf..e309603 100644 --- a/src/Dolphin/os/OSFont.c +++ b/src/Dolphin/os/OSFont.c @@ -1,4 +1,4 @@ -#include +#include #include #include -- cgit v1.2.3-13-gbd6f