all repos — mgba @ b66ce64c4704ab5053457715d296ce05ec9ce67e

mGBA Game Boy Advance Emulator

GBA: Fix timers 2 and 3 updating incorrectly
Jeffrey Pfau jeffrey@endrift.com
Sat, 17 Jan 2015 02:21:49 -0800
commit

b66ce64c4704ab5053457715d296ce05ec9ce67e

parent

56d5fb579d4881b4d4d01df8029489cfa16fd1ab

2 files changed, 1 insertions(+), 2 deletions(-)

jump to
M CHANGESCHANGES

@@ -62,6 +62,7 @@ - GBA BIOS: Fix HuffUnComp boundary conditions

- GBA Video: Fix mode 0 being able to read tiles above appropriate tile range - GBA Audio: Properly initialize audio FIFO channels - Util: Fix SOCKET_FAILED macro + - GBA: Fix timers 2 and 3 updating incorrectly Misc: - Qt: Disable sync to video by default - GBA: Exit cleanly on FATAL if the port supports it
M src/gba/gba.csrc/gba/gba.c

@@ -276,7 +276,6 @@ timer = &gba->timers[2];

if (timer->enable) { timer->nextEvent -= cycles; timer->lastEvent -= cycles; - nextEvent = timer->nextEvent; if (timer->nextEvent <= 0) { timer->lastEvent = timer->nextEvent; timer->nextEvent += timer->overflowInterval;

@@ -308,7 +307,6 @@ timer = &gba->timers[3];

if (timer->enable) { timer->nextEvent -= cycles; timer->lastEvent -= cycles; - nextEvent = timer->nextEvent; if (timer->nextEvent <= 0) { timer->lastEvent = timer->nextEvent; timer->nextEvent += timer->overflowInterval;