Skip to content

Commit ea50b5e

Browse files
committed
Revert "GBA SIO: Loosen timing where possible"
This reverts commit a0647ff.
1 parent 66a0889 commit ea50b5e

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/gba/sio/lockstep.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#define DRIVER_ID 0x6B636F4C
1212
#define DRIVER_STATE_VERSION 1
1313
#define LOCKSTEP_INTERVAL 4096
14-
#define UNLOCKED_INTERVAL 8192
14+
#define UNLOCKED_INTERVAL 4096
1515
#define HARD_SYNC_INTERVAL 0x80000
1616
#define TARGET(P) (1 << (P))
1717
#define TARGET_ALL 0xF
@@ -923,8 +923,11 @@ void _lockstepEvent(struct mTiming* timing, void* context, uint32_t cyclesLate)
923923
if (!coordinator->transferActive) {
924924
GBASIOLockstepCoordinatorWakePlayers(coordinator);
925925
}
926-
if (coordinator->nextHardSync < 0 && !coordinator->waiting) {
927-
_hardSync(coordinator, player);
926+
if (coordinator->nextHardSync < 0) {
927+
if (!coordinator->waiting) {
928+
_hardSync(coordinator, player);
929+
}
930+
coordinator->nextHardSync += HARD_SYNC_INTERVAL;
928931
}
929932
}
930933

@@ -1072,7 +1075,6 @@ void GBASIOLockstepCoordinatorAckPlayer(struct GBASIOLockstepCoordinator* coordi
10721075
coordinator->transferActive = false;
10731076
}
10741077

1075-
coordinator->nextHardSync = HARD_SYNC_INTERVAL;
10761078
struct GBASIOLockstepPlayer* runner = TableLookup(&coordinator->players, coordinator->attachedPlayers[0]);
10771079
GBASIOLockstepPlayerWake(runner);
10781080
}

0 commit comments

Comments
 (0)