mirror of
https://github.com/projectPiki/pikmin2.git
synced 2024-11-27 07:10:42 +00:00
finish jaudio dsp
i think that's the last of the c files
This commit is contained in:
EpochFlame
parent
ea16184eaa
commit
64eb457a62
File diff suppressed because it is too large
Load Diff
@ -354,7 +354,7 @@ LIBS = [
|
||||
"host": True,
|
||||
"objects": [
|
||||
["JSystem/JAudio/dsp/dspproc", True],
|
||||
["JSystem/JAudio/dsp/dsptask", False],
|
||||
["JSystem/JAudio/dsp/dsptask", True],
|
||||
["JSystem/JAudio/dsp/osdsp", True],
|
||||
["JSystem/JAudio/dsp/osdsp_task", True],
|
||||
],
|
||||
|
||||
@ -57,16 +57,15 @@
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory_v21.cpp">J3D/J3DMaterialFactory_v21.cpp</a> | 41204 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DShapeMtx.cpp">J3D/J3DShapeMtx.cpp</a> | 42377 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DTevs.cpp">J3D/J3DTevs.cpp</a> | 44120 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DAnimation.cpp">J3D/J3DAnimation.cpp</a> | 46665 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DModelLoader.cpp">J3D/J3DModelLoader.cpp</a> | 47976 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JMessage/processor.cpp">JMessage/processor.cpp</a> | 49155 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 49816 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/dsp/dsptask.c">JAudio//dsp/dsptask.c</a> | 50356 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 52317 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 62631 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 68579 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 69307 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 72267 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 79855 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 81389 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 83566 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 85497 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 88860 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 96588 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 105587 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 109415 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 110986 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMatBlock.cpp">J2D/J2DMatBlock.cpp</a> | 116704 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-object.cpp">JStudio/jstudio-object.cpp</a> | 144108 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMatBlock.cpp">J3D/J3DMatBlock.cpp</a> | 311971 | | |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASSeqParser.cpp">JAudio//JAS/JASSeqParser.cpp</a> | 49816 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JUtility/JUTGamePad.cpp">JUtility/JUTGamePad.cpp</a> | 52317 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAIStreamMgr.cpp">JAudio//JAI/JAIStreamMgr.cpp</a> | 62631 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISeMgr.cpp">JAudio//JAI/JAISeMgr.cpp</a> | 68579 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAFieldBlock.cpp">JParticle/JPAFieldBlock.cpp</a> | 69307 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DWindowEx.cpp">J2D/J2DWindowEx.cpp</a> | 72267 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISound.cpp">JAudio//JAI/JAISound.cpp</a> | 79855 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPAResource.cpp">JParticle/JPAResource.cpp</a> | 81389 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMaterialFactory.cpp">J3D/J3DMaterialFactory.cpp</a> | 83566 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPicture.cpp">J2D/J2DPicture.cpp</a> | 85497 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAI/JAISequenceMgr.cpp">JAudio//JAI/JAISequenceMgr.cpp</a> | 88860 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JAudio/JSystem/JAS/JASTrack.cpp">JAudio//JAS/JASTrack.cpp</a> | 96588 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JParticle/JPABaseShape.cpp">JParticle/JPABaseShape.cpp</a> | 105587 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/functionvalue.cpp">JStudio/functionvalue.cpp</a> | 109415 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DPictureEx.cpp">J2D/J2DPictureEx.cpp</a> | 110986 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J2D/J2DMatBlock.cpp">J2D/J2DMatBlock.cpp</a> | 116704 |
|
||||
| <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/JStudio/jstudio-object.cpp">JStudio/jstudio-object.cpp</a> | 144108 | <a href="https://github.com/projectPiki/pikmin2/tree/main/src/JSystem/J3D/J3DMatBlock.cpp">J3D/J3DMatBlock.cpp</a> | 311971 |
|
||||
|
||||
### <section id="plugProjectEbisawaU">plugProjectEbisawaU</section>
|
||||
| File | Size (bytes) | File | Size (bytes) |
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
JAUDIO_DSP_FILES:=\
|
||||
$(BUILD_DIR)/src/JSystem/JAudio/dsp/dspproc.o\
|
||||
$(BUILD_DIR)/asm/JSystem/JAudio/dsp/dsptask.o\
|
||||
$(BUILD_DIR)/src/JSystem/JAudio/dsp/dsptask.o\
|
||||
$(BUILD_DIR)/src/JSystem/JAudio/dsp/osdsp.o\
|
||||
$(BUILD_DIR)/src/JSystem/JAudio/dsp/osdsp_task.o\
|
||||
|
||||
|
||||
@ -2,15 +2,10 @@
|
||||
#include "types.h"
|
||||
#include "JSystem/JAudio/DSP.h"
|
||||
|
||||
typedef struct {
|
||||
DSPTaskInfo info;
|
||||
u8 filler[0x10];
|
||||
} DSPAudioTaskInfo;
|
||||
|
||||
static DSPAudioTaskInfo audio_task ATTRIBUTE_ALIGN(32); // why is this 0x60 bytes big? it should be 0x50 if it were a DSPTaskInfo
|
||||
static DSPTaskInfo audio_task ATTRIBUTE_ALIGN(32);
|
||||
static u8 AUDIO_YIELD_BUFFER[8192] ATTRIBUTE_ALIGN(32);
|
||||
|
||||
u8 jdsp[] = {
|
||||
u8 jdsp[] ATTRIBUTE_ALIGN(32) = {
|
||||
0x02, 0x9F, 0x00, 0x12, 0x00, 0x00, 0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x02, 0xFF,
|
||||
0x00, 0x00, 0x02, 0xFF, 0x00, 0x00, 0x02, 0x9F, 0x05, 0xB8, 0x02, 0x9F, 0x00, 0x4E, 0x12, 0x05, 0x02, 0xBF, 0x00, 0x57, 0x81, 0x00,
|
||||
0x00, 0x9F, 0x10, 0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x5F, 0x1B, 0x1E, 0x02, 0xBF, 0x06, 0x88, 0x02, 0xBF, 0x04, 0xC0, 0x02, 0xBF,
|
||||
@ -373,21 +368,21 @@ static void DspHandShake(void* a1)
|
||||
void DspBoot(DSPCallback callback)
|
||||
{
|
||||
DspInitWork();
|
||||
audio_task.info.priority = 0xF0;
|
||||
audio_task.info.iram_mmem_addr = (u16*)(jdsp + 0x80000000);
|
||||
audio_task.info.iram_length = sizeof(jdsp);
|
||||
audio_task.info.iram_addr = nullptr;
|
||||
audio_task.info.dram_mmem_addr = (u16*)(AUDIO_YIELD_BUFFER + 0x80000000);
|
||||
audio_task.info.dram_length = sizeof(AUDIO_YIELD_BUFFER);
|
||||
audio_task.info.dram_addr = 0;
|
||||
audio_task.info.dsp_init_vector = 0;
|
||||
audio_task.info.dsp_resume_vector = 0x10;
|
||||
audio_task.info.init_cb = DspHandShake;
|
||||
audio_task.info.res_cb = nullptr;
|
||||
audio_task.info.done_cb = nullptr;
|
||||
audio_task.info.req_cb = callback;
|
||||
audio_task.priority = 0xF0;
|
||||
audio_task.iram_mmem_addr = (u16*)(jdsp + 0x80000000);
|
||||
audio_task.iram_length = sizeof(jdsp);
|
||||
audio_task.iram_addr = nullptr;
|
||||
audio_task.dram_mmem_addr = (u16*)(AUDIO_YIELD_BUFFER + 0x80000000);
|
||||
audio_task.dram_length = sizeof(AUDIO_YIELD_BUFFER);
|
||||
audio_task.dram_addr = 0;
|
||||
audio_task.dsp_init_vector = 0;
|
||||
audio_task.dsp_resume_vector = 0x10;
|
||||
audio_task.init_cb = DspHandShake;
|
||||
audio_task.res_cb = nullptr;
|
||||
audio_task.done_cb = nullptr;
|
||||
audio_task.req_cb = callback;
|
||||
DSPInit();
|
||||
DSPAddPriorTask(&audio_task.info);
|
||||
DSPAddPriorTask(&audio_task);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -431,86 +426,6 @@ int DSPSendCommands2(u32* p1, u32 mailCount, void (*callBack)(u16))
|
||||
|
||||
OSRestoreInterrupts(interruptFlag);
|
||||
return startWorkStatus;
|
||||
|
||||
/*
|
||||
.loc_0x0:
|
||||
stwu r1, -0x20(r1)
|
||||
mflr r0
|
||||
stw r0, 0x24(r1)
|
||||
addi r11, r1, 0x20
|
||||
bl 0x17260
|
||||
mr r26, r3
|
||||
mr r27, r4
|
||||
mr r30, r5
|
||||
|
||||
.loc_0x20:
|
||||
bl 0x6A0
|
||||
cmpwi r3, 0
|
||||
beq+ .loc_0x20
|
||||
bl 0x4420C
|
||||
mr r29, r3
|
||||
bl 0x3027C
|
||||
cmplwi r3, 0
|
||||
beq- .loc_0x50
|
||||
mr r3, r29
|
||||
bl 0x4421C
|
||||
li r3, -0x1
|
||||
b .loc_0xD0
|
||||
|
||||
.loc_0x50:
|
||||
mr r3, r27
|
||||
bl 0x30294
|
||||
bl 0x302A4
|
||||
nop
|
||||
|
||||
.loc_0x60:
|
||||
bl 0x30250
|
||||
cmplwi r3, 0
|
||||
bne+ .loc_0x60
|
||||
cmplwi r27, 0
|
||||
bne- .loc_0x78
|
||||
li r27, 0x1
|
||||
|
||||
.loc_0x78:
|
||||
cmplwi r30, 0
|
||||
beq- .loc_0x90
|
||||
lwz r3, 0x0(r26)
|
||||
mr r4, r30
|
||||
bl 0xB8
|
||||
mr r28, r3
|
||||
|
||||
.loc_0x90:
|
||||
li r30, 0
|
||||
li r31, 0
|
||||
b .loc_0xBC
|
||||
|
||||
.loc_0x9C:
|
||||
lwzx r3, r26, r31
|
||||
bl 0x30248
|
||||
nop
|
||||
|
||||
.loc_0xA8:
|
||||
bl 0x30208
|
||||
cmplwi r3, 0
|
||||
bne+ .loc_0xA8
|
||||
addi r30, r30, 0x1
|
||||
addi r31, r31, 0x4
|
||||
|
||||
.loc_0xBC:
|
||||
cmplw r30, r27
|
||||
blt+ .loc_0x9C
|
||||
mr r3, r29
|
||||
bl 0x44198
|
||||
mr r3, r28
|
||||
|
||||
.loc_0xD0:
|
||||
addi r11, r1, 0x20
|
||||
bl 0x171E8
|
||||
lwz r0, 0x24(r1)
|
||||
mtlr r0
|
||||
addi r1, r1, 0x20
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
@ -530,23 +445,6 @@ void DspInitWork()
|
||||
for (u32 i = 0; i < 16; i++) {
|
||||
taskwork[i]._04 = nullptr;
|
||||
}
|
||||
|
||||
/*
|
||||
.loc_0x0:
|
||||
li r3, 0
|
||||
lis r4, 0x804F
|
||||
li r0, 0x10
|
||||
mr r6, r3
|
||||
addi r5, r4, 0x27E0
|
||||
mtctr r0
|
||||
|
||||
.loc_0x18:
|
||||
add r4, r5, r3
|
||||
addi r3, r3, 0x8
|
||||
stw r6, 0x4(r4)
|
||||
bdnz+ .loc_0x18
|
||||
blr
|
||||
*/
|
||||
}
|
||||
|
||||
static u32 taskreadp;
|
||||
|
||||
@ -885,3 +885,5 @@ You have 3904 out of 10000 Pokos and 100 out of 201 treasures.",2024-01-17 19:53
|
||||
You have 3908 out of 10000 Pokos and 100 out of 201 treasures.",2024-01-17 22:17:18.267603
|
||||
3923,1825312,0.39234176605725446,100,356619,0.5002679363013007,"
|
||||
You have 3923 out of 10000 Pokos and 100 out of 201 treasures.",2024-01-17 22:49:31.690445
|
||||
3924,1825992,0.3924879286863935,105,372483,0.5225220801957198,"
|
||||
You have 3924 out of 10000 Pokos and 105 out of 201 treasures.",2024-01-17 16:47:38.318153
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user