diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-09-21 10:50:15 +0200 |
commit | 9ee9a20152694f456841eb890b986d42f3c50e26 (patch) | |
tree | 2998678c0f3db391b080318633bc506248542ecb /include/gpu_regs.h | |
parent | 3919b7130b2a8709562b012099947923a16af02d (diff) | |
parent | ed9e0e20547e2c96833cddea67c6b423ef7af7ef (diff) |
fix merge 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 |