summaryrefslogtreecommitdiff
path: root/include/gba/macro.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-01-12 15:39:21 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-01-12 16:03:06 -0500
commitf2763832931127fc24e7cb9f9cdd85e3cf706a5c (patch)
treed23050509231d1d9c6d1694b2755c93fdaf26a4e /include/gba/macro.h
parentaa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 (diff)
parent15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff)
Merge master into sync-script
Diffstat (limited to 'include/gba/macro.h')
-rw-r--r--include/gba/macro.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/gba/macro.h b/include/gba/macro.h
index e416c3577..a3e870210 100644
--- a/include/gba/macro.h
+++ b/include/gba/macro.h
@@ -105,7 +105,7 @@
} \
}
-#define DmaClearLarge(dmaNum, dest, size, block, bit) \
+#define DmaClearLarge(dmaNum, dest, size, block, bit) \
{ \
u32 _size = size; \
while (1) \
@@ -170,4 +170,14 @@
#define DmaFill16Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 16)
#define DmaFill32Defvars(dmaNum, value, dest, size) DmaFillDefvars(dmaNum, value, dest, size, 32)
+#define IntrEnable(flags) \
+{ \
+ u16 imeTemp; \
+ \
+ imeTemp = REG_IME; \
+ REG_IME = 0; \
+ REG_IE |= flags; \
+ REG_IME = imeTemp; \
+}
+
#endif // GUARD_GBA_MACRO_H