drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[nostalgia/core/gba] Fix timer addresses

Browse Source
This commit is contained in:
Gary Talent 2020-07-15 22:01:09 -05:00
parent f10d318e54
commit a58467f327
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/nostalgia/core/gba/addresses.hpp
View File

@ -29,17 +29,17 @@ using interrupt_handler = void (*)(void);
/////////////////////////////////////////////////////////////////
// Timers
#define REG_TIMER0CTL *reinterpret_cast<volatile uint16_t*>(0x04000100)
#define REG_TIMER0 *reinterpret_cast<volatile uint16_t*>(0x04000102)
#define REG_TIMER0 *reinterpret_cast<volatile uint16_t*>(0x04000100)
#define REG_TIMER0CTL *reinterpret_cast<volatile uint16_t*>(0x04000102)
#define REG_TIMER1CTL *reinterpret_cast<volatile uint16_t*>(0x04000104)
#define REG_TIMER1 *reinterpret_cast<volatile uint16_t*>(0x04000106)
#define REG_TIMER1 *reinterpret_cast<volatile uint16_t*>(0x04000104)
#define REG_TIMER1CTL *reinterpret_cast<volatile uint16_t*>(0x04000106)
#define REG_TIMER2CTL *reinterpret_cast<volatile uint16_t*>(0x04000108)
#define REG_TIMER2 *reinterpret_cast<volatile uint16_t*>(0x0400010a)
#define REG_TIMER2 *reinterpret_cast<volatile uint16_t*>(0x04000108)
#define REG_TIMER2CTL *reinterpret_cast<volatile uint16_t*>(0x0400010a)
#define REG_TIMER3CTL *reinterpret_cast<volatile uint16_t*>(0x0400010c)
#define REG_TIMER3 *reinterpret_cast<volatile uint16_t*>(0x0400010e)
#define REG_TIMER3 *reinterpret_cast<volatile uint16_t*>(0x0400010c)
#define REG_TIMER3CTL *reinterpret_cast<volatile uint16_t*>(0x0400010e)
/////////////////////////////////////////////////////////////////
// background registers
@ -82,3 +82,6 @@ typedef uint16_t BgMapTile[1024];
#define MEM_OAM reinterpret_cast<uint64_t*>(0x07000000)
#define MEM_ROM reinterpret_cast<char*>(0x08000000)
#define MEM_SRAM reinterpret_cast<char*>(0x0e000000)
#define MEM_SRAM_SIZE 65535