Skip to content

Fixed SPU code on real hardware #1990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nicolasnoble merged 2 commits into from
Mar 24, 2026
Merged

Fixed SPU code on real hardware #1990

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
63d85bd
Fixed SPU net being turned on for dummy block DMA transfer, added mor…
Mar 20, 2026
0b31743
Added SPU_CTRL=0 to clear unceirtain states, reverted to volume free …
Mar 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions src/mips/psyqo/src/spu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void psyqo::SPU::silenceChannels(const uint32_t channelMask) {
}
SPU_VOICES[channel].volumeLeft = 0;
SPU_VOICES[channel].volumeRight = 0;
SPU_VOICES[channel].sampleRate = 0;
SPU_VOICES[channel].sampleRate = 0x1000;
SPU_VOICES[channel].sampleStartAddr = DUMMY_SAMPLE_POSITION / 8;
SPU_VOICES[channel].sampleRepeatAddr = DUMMY_SAMPLE_POSITION / 8;
}
Expand All @@ -89,8 +89,8 @@ void psyqo::SPU::initialize() {

SPU_CTRL = 0;

SPU_VOL_MAIN_LEFT = 0x7fff;
SPU_VOL_MAIN_RIGHT = 0x7fff;
SPU_VOL_MAIN_LEFT = 0x3fff;
SPU_VOL_MAIN_RIGHT = 0x3fff;
SPU_REVERB_LEFT = 0;
SPU_REVERB_RIGHT = 0;

Expand All @@ -107,10 +107,10 @@ void psyqo::SPU::initialize() {
SPU_VOL_EXT_RIGHT = 0;
SPU_RAM_DTC = 4;

dmaWrite(DUMMY_SAMPLE_POSITION, &DUMMY_SAMPLE, DUMMY_SAMPLE_SIZE, 4);

SPU_CTRL = 1 << 15 | 1 << 14 | 1 << 6;

dmaWrite(DUMMY_SAMPLE_POSITION, &DUMMY_SAMPLE, DUMMY_SAMPLE_SIZE, 4);

silenceChannels(0xffffffff);
}

Expand All @@ -119,9 +119,9 @@ void psyqo::SPU::playADPCM(const uint8_t channelId, const uint16_t spuRamAddress
Kernel::assert(channelId < 24, "Invalid SPU channel ID");
if (hardCut) {
if (channelId > 15) {
SPU_KEY_OFF_HIGH |= 1 << (channelId - 16);
SPU_KEY_OFF_HIGH = 1 << (channelId - 16);
} else {
SPU_KEY_OFF_LOW |= 1 << (channelId);
SPU_KEY_OFF_LOW = 1 << (channelId);
}
}

Expand All @@ -133,9 +133,9 @@ void psyqo::SPU::playADPCM(const uint8_t channelId, const uint16_t spuRamAddress
SPU_VOICES[channelId].sr = (config.adsr >> 16) & 0xffff;

if (channelId > 15) {
SPU_KEY_ON_HIGH |= 1 << (channelId - 16);
SPU_KEY_ON_HIGH = 1 << (channelId - 16);
} else {
SPU_KEY_ON_LOW |= 1 << (channelId);
SPU_KEY_ON_LOW = 1 << (channelId);
}
}

Expand All @@ -146,4 +146,4 @@ uint32_t psyqo::SPU::getNextFreeChannel() {
}
}
return NO_FREE_CHANNEL;
}
}
Loading