mirror/jak-project
1
0
Fork 0
mirror of https://github.com/open-goal/jak-project synced 2026-07-28 23:28:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Initial Sound Implementation (#1325)

Browse Source
This commit is contained in:
Ziemas
2022-05-19 22:54:36 +02:00
committed by GitHub
parent be976d2e69
commit 07cc0ddc35
377 changed files with 108012 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files
game/overlord/iso_queue.cpp
+29 -42
View File
@@ -35,9 +35,6 @@ VagCommand vag_cmds[N_VAG_CMDS];
static s32 sSema;
void ReleaseMessage(IsoMessage* cmd);
void FreeVAGCommand(VagCommand* cmd);
void iso_queue_init_globals() {
memset(sBuffer, 0, sizeof(sBuffer));
memset(sStrBuffer, 0, sizeof(sStrBuffer));
@@ -260,41 +257,30 @@ IsoMessage* GetMessage() {
* Execute callbacks and maintain buffers for finished reads in the priority stack
*/
void ProcessMessageData() {
int32_t pri = N_PRIORITIES - 1;
for (s32 pri = N_PRIORITIES - 1; pri >= 0; pri--) {
for (s32 n = gPriStack[pri].n - 1; n >= 0; n--) {
IsoMessage* cmd = gPriStack[pri].cmds[n];
for (;;) {
if (pri < 0)
return;
int32_t cmdID = gPriStack[pri].n;
IsoMessage* popped_command;
do {
cmdID--;
if (cmdID < 0)
goto end_cur;
popped_command = gPriStack[pri].cmds[cmdID];
auto* callback_buffer = popped_command->callback_buffer;
if (popped_command->status == CMD_STATUS_IN_PROGRESS &&
callback_buffer) { // if we have a callback buffer (meaning a read finished and let us
// know)
// execute the callback!
uint32_t callback_result =
popped_command->callback_function(popped_command, callback_buffer);
popped_command->status = callback_result;
// printf("ProcessMessage Data set command %p status to %d\n", popped_command,
// popped_command->status);
// if we're done with the buffer, free it and load the next one (if there is one)
if (callback_buffer->data_size == 0) {
popped_command->callback_buffer = (IsoBufferHeader*)callback_buffer->next;
FreeBuffer(callback_buffer);
if (cmd->status == CMD_STATUS_IN_PROGRESS) {
IsoBufferHeader* callback_buffer = cmd->callback_buffer;
if (callback_buffer != nullptr) {
cmd->status = cmd->callback_function(cmd, callback_buffer);
if (callback_buffer->data_size == 0) {
cmd->callback_buffer = (IsoBufferHeader*)callback_buffer->next;
FreeBuffer(callback_buffer);
}
}
}
} while (popped_command->status == CMD_STATUS_IN_PROGRESS);
ReleaseMessage(popped_command);
ReturnMessage(popped_command);
// return message todo this will free vag commands!
pri++;
end_cur:
pri--;
if (cmd->status != CMD_STATUS_IN_PROGRESS) {
ReleaseMessage(cmd);
ReturnMessage(cmd);
pri++;
break;
}
}
}
}
@@ -342,8 +328,9 @@ VagCommand* GetVAGCommand() {
}
// wait for VAG semaphore
while (WaitSema(sSema)) {
}
// while (WaitSema(sSema)) {
//}
// try to get something.
for (s32 i = 0; i < N_VAG_CMDS; i++) {
if (!((vag_cmd_used >> (i & 0x1f)) & 1)) {
@@ -353,24 +340,24 @@ VagCommand* GetVAGCommand() {
if (vag_cmd_cnt > max_vag_cmd_cnt) {
max_vag_cmd_cnt = vag_cmd_cnt;
}
SignalSema(sSema);
// SignalSema(sSema);
return &vag_cmds[i];
}
}
SignalSema(sSema);
// SignalSema(sSema);
}
}
void FreeVAGCommand(VagCommand* cmd) {
s32 idx = cmd - vag_cmds;
if (idx >= 0 && idx < N_VAG_CMDS && ((vag_cmd_used >> (idx & 0x1f)) & 1)) {
while (WaitSema(sSema)) {
}
// while (WaitSema(sSema)) {
// }
vag_cmd_used &= ~(1 << (idx & 0x1f));
vag_cmd_cnt--;
SignalSema(sSema);
// SignalSema(sSema);
} else {
printf("[OVERLORD] Invalid FreeVAGCommand!\n");
}