ShuriZma
/
bsnes
mirror of https://github.com/bsnes-emu/bsnes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve autojoypad timing 

auto-joypad test changes:
fixes 01, 05, 10, 12, 14

still bad: 06, 08, 09

improved: 07, 13
This commit is contained in:
Morilli 2025-06-22 16:33:41 +02:00 committed by Screwtapello
parent 20ddad606f
commit b53bf3d178
2 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bsnes/sfc/cpu/io.cpp
View File

@ -136,7 +136,14 @@ auto CPU::writeCPU(uint addr, uint8 data) -> void {
case 0x4200: //NMITIMEN
io.autoJoypadPoll = data & 1;
if(!io.autoJoypadPoll) status.autoJoypadCounter = 33; // Disable auto-joypad read
if(status.autoJoypadCounter < 2) {
// allow controller latches during this time
controllerPort1.device->latch(io.autoJoypadPoll);
controllerPort2.device->latch(io.autoJoypadPoll);
}else if (!io.autoJoypadPoll) {
status.autoJoypadCounter = 33; // Disable auto-joypad read
}
nmitimenUpdate(data);
return;

37
bsnes/sfc/cpu/timing.cpp
View File

@ -202,21 +202,20 @@ auto CPU::dmaEdge() -> void {
//called every 128 clocks from inside the CPU::stepOnce() function
auto CPU::joypadEdge() -> void {
//it is not yet confirmed if polling can be stopped early and/or (re)started later
if(!io.autoJoypadPoll) return;
if(vcounter() == ppu.vdisp() && hcounter() >= 130 && hcounter() <= 256) {
if(vcounter() == ppu.vdisp() && (counter.cpu & 255) == 0 && hcounter() >= 130 && hcounter() <= 384) {
//begin new polling sequence
status.autoJoypadCounter = 0;
}
} else {
//stop after polling has been completed for this frame
if(status.autoJoypadCounter >= 33) return;
//stop after polling has been completed for this frame
if(status.autoJoypadCounter >= 33) return;
status.autoJoypadCounter++;
}
if(status.autoJoypadCounter == 0) {
//latch controller states on the first polling cycle
controllerPort1.device->latch(1);
controllerPort2.device->latch(1);
controllerPort1.device->latch(io.autoJoypadPoll);
controllerPort2.device->latch(io.autoJoypadPoll);
}
if(status.autoJoypadCounter == 1) {
@ -224,11 +223,19 @@ auto CPU::joypadEdge() -> void {
controllerPort1.device->latch(0);
controllerPort2.device->latch(0);
//shift registers are cleared to zero at start of auto-joypad polling
io.joy1 = 0;
io.joy2 = 0;
io.joy3 = 0;
io.joy4 = 0;
if(io.autoJoypadPoll) {
//shift registers are cleared to zero at start of auto-joypad polling
io.joy1 = 0;
io.joy2 = 0;
io.joy3 = 0;
io.joy4 = 0;
}
}
if(status.autoJoypadCounter >= 2 && !io.autoJoypadPoll) {
// if auto-joypad polling is disabled at this point skip the rest of the polling
status.autoJoypadCounter = 33;
return;
}
if(status.autoJoypadCounter >= 2 && !(status.autoJoypadCounter & 1)) {
@ -241,6 +248,4 @@ auto CPU::joypadEdge() -> void {
io.joy3 = io.joy3 << 1 | port0.bit(1);
io.joy4 = io.joy4 << 1 | port1.bit(1);
}
status.autoJoypadCounter++;
}