jaby
/
jabyengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Integrate all the progress into master #6

Merged
jaby merged 595 commits from ToolBox into main 2025-01-01 13:17:44 +00:00
Conversation 0 Commits 595 Files Changed 361 +35 -33
3 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2623c0c22c - Show all commits

2
examples/PoolBox/application/src/asset_mgr.cpp
View File

@ -111,7 +111,7 @@ namespace Assets {
namespace XAAudio { namespace XAAudio {
void play_fox() { void play_fox() {
CDXA::play(lba, FOX_XA, 1, true); CDXA::play(lba, FOX_XA, 0, false);
} }
} }
} }

1
src/Library/src/CD/cd.cpp
View File

@ -176,7 +176,6 @@ namespace JabyEngine {
send_read_n0(cur_file.cur_lba); send_read_n0(cur_file.cur_lba);
} }
void continue_reading() { void continue_reading() {
if(current_state == State::BufferFull) { if(current_state == State::BufferFull) {
Command::wait_completed(); Command::wait_completed();

3
src/Library/src/Periphery/periphery.cpp
View File

@ -1,5 +1,6 @@
#include "../../internal-include/periphery_internal.hpp" #include "../../internal-include/periphery_internal.hpp"
#include <PSX/Periphery/periphery.hpp> #include <PSX/Periphery/periphery.hpp>
#include <PSX/System/syscalls.hpp>
namespace JabyEngine { namespace JabyEngine {
namespace Periphery { namespace Periphery {
@ -87,6 +88,7 @@ namespace JabyEngine {
void query_controller() { void query_controller() {
static constexpr auto TypeIDX = 1; static constexpr auto TypeIDX = 1;
SysCall::EnterCriticalSection();
Periphery::connect_to(cur_controller_port); Periphery::connect_to(cur_controller_port);
for(uint32_t id = 0; id < Periphery::DeviceCount; id++) { for(uint32_t id = 0; id < Periphery::DeviceCount; id++) {
auto &cur_controller = controller[cur_controller_port][id]; auto &cur_controller = controller[cur_controller_port][id];
@ -128,6 +130,7 @@ namespace JabyEngine {
if(Configuration::Periphery::include_portB()) { if(Configuration::Periphery::include_portB()) {
cur_controller_port ^= 0x1; cur_controller_port ^= 0x1;
} }
SysCall::ExitCriticalSection();
} }
} }
} }