Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice

# Conflicts:
#	demo_functionality.h
#	interrupt_vector.S
#	interrupts.c

1 files changed, 12 insertions, 0 deletions

diff --git a/global.h b/global.h
index f5fe9a6..c461703 100644
--- a/global.h
+++ b/global.h
@@ -1,6 +1,8 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
+#include <stdint.h>
+
 // board type, raspi2
 #define RASPI 2
 
@@ -38,4 +40,14 @@
 #define ARM_DISABLE_IRQS_2     (ARM_BASE + 0x220)
 #define ARM_DISABLE_BASIC_IRQS (ARM_BASE + 0x224)
 
+inline static uint32_t rd32(uint32_t addr)
+{
+  return *(uint32_t volatile*) addr;
+}
+
+inline static void wr32(uint32_t addr, uint32_t value)
+{
+  *(uint32_t volatile*) addr = value;
+}
+
 #endif // GLOBAL_H