Merge branch 'master' into berry_fix_program

2017-09-20 23:18:20 -04:00
parent 54bd2c1781 40c1e81d03
commit 27903a102b
114 changed files with 12388 additions and 5781 deletions
@@ -1,5 +1,6 @@
-#ifndef GUARD_gpu_regs_H
-#define GUARD_gpu_regs_H
+
+#ifndef GUARD_GPU_REGS_H
+#define GUARD_GPU_REGS_H

 // Exported type declarations

@@ -9,5 +10,6 @@
 void DisableInterrupts(u16);
 void EnableInterrupts(u16);
 void SetGpuReg(u8, u16);
+void ClearGpuRegBits(u8 regOffset, u16 mask);

-#endif //GUARD_gpu_regs_H
+#endif //GUARD_GPU_REGS_H