diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-23 20:36:00 +0200 |
commit | 7bb0fcf182e5a760ab9e08878a381566819dc8f2 (patch) | |
tree | bbb0603d41fa6d0d71a838c7e2fde85fe346fbe1 /include/gpu_regs.h | |
parent | 601fc9e85b383792819768c31728e4855e854f32 (diff) | |
parent | a57915fa5bd8c2e68bc291a371e66e3cafd7e195 (diff) |
merge with master and fix conflicts
Diffstat (limited to 'include/gpu_regs.h')
-rw-r--r-- | include/gpu_regs.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/gpu_regs.h b/include/gpu_regs.h index 2675571f4..89e0cb64b 100644 --- a/include/gpu_regs.h +++ b/include/gpu_regs.h @@ -1,6 +1,11 @@ #ifndef GUARD_GPU_REGS_H #define GUARD_GPU_REGS_H +// Exported type declarations + +// Exported RAM declarations + +// Exported ROM declarations void InitGpuRegManager(void); void CopyBufferedValuesToGpuRegs(void); void SetGpuReg(u8 regOffset, u16 value); @@ -11,4 +16,4 @@ void ClearGpuRegBits(u8 regOffset, u16 mask); void EnableInterrupts(u16 mask); void DisableInterrupts(u16 mask); -#endif // GUARD_GPU_REGS_H +#endif //GUARD_GPU_REGS_H |