3 files changed, 17 insertions, 21 deletions
diff --git a/armclock.h b/armclock.h
index bf225b0..3e65d27 100644
--- a/armclock.h
+++ b/armclock.h
@@ -16,9 +16,6 @@
 #define ARMCLK_LOAD_PRE_DRIVER           (ARM_BASE + 0x41C)
 #define ARMCLK_LOAD_FREE_RUNNING_COUNTER (ARM_BASE + 0x420)
 
-#define BCMCLK_ENABLE_BASIC_IRQS  (ARM_BASE + 0x218)
-#define BCMCLK_DISABLE_BASIC_IRQS (ARM_BASE + 0x224)
-
 typedef union armclk_control
 {
   uint32_t raw;
@@ -50,12 +47,12 @@ static inline void armclk_init(void)
 
 static inline void armclk_enable_timer_irq(void)
 {
-  *(uint32_t volatile*) BCMCLK_ENABLE_BASIC_IRQS = 1;
+  *(uint32_t volatile*) ARM_ENABLE_BASIC_IRQS = 1;
 }
 
 static inline void armclk_disable_timer_irq(void)
 {
-  *(uint32_t volatile*) BCMCLK_DISABLE_BASIC_IRQS = 1;
+  *(uint32_t volatile*) ARM_DISABLE_BASIC_IRQS = 1;
 }
 
 static inline void armclk_irq_settimeout(uint32_t timeout)
diff --git a/bcmclock.h b/bcmclock.h
index 75a3b07..b54c39a 100644
--- a/bcmclock.h
+++ b/bcmclock.h
@@ -15,28 +15,16 @@
 #define ST_C2  (ST_BASE + 0x14) // System Timer Compare 2
 #define ST_C3  (ST_BASE + 0x18) // System Timer Compare 3
 
-#define BCMCLK_IRQ_BASIC_PENDING  (ARM_BASE + 0x200)
-#define BCMCLK_IRQ_PENDING_1      (ARM_BASE + 0x204)
-#define BCMCLK_IRQ_PENDING_2      (ARM_BASE + 0x208)
-#define BCMCLK_FIQ_CONTROL        (ARM_BASE + 0x20C)
-#define BCMCLK_ENABLE_IRQS_1      (ARM_BASE + 0x210)
-#define BCMCLK_ENABLE_IRQS_2      (ARM_BASE + 0x214)
-#define BCMCLK_ENABLE_BASIC_IRQS  (ARM_BASE + 0x218)
-#define BCMCLK_DISABLE_IRQS_1     (ARM_BASE + 0x21C)
-#define BCMCLK_DISABLE_IRQS_2     (ARM_BASE + 0x220)
-#define BCMCLK_DISABLE_BASIC_IRQS (ARM_BASE + 0x224)
-
-
 static inline void bcmclk_enable_timer_irq(void)
 {
-  *(uint32_t volatile*) BCMCLK_ENABLE_BASIC_IRQS = 1;
-  *(uint32_t volatile*) BCMCLK_ENABLE_IRQS_1 = 1 << 2;
+  *(uint32_t volatile*) ARM_ENABLE_BASIC_IRQS = 1;
+  *(uint32_t volatile*) ARM_ENABLE_IRQS_1 = 1 << 2;
 }
 
 static inline void bcmclk_disable_timer_irq(void)
 {
-  *(uint32_t volatile*) BCMCLK_DISABLE_BASIC_IRQS = 1;
-  *(uint32_t volatile*) BCMCLK_DISABLE_IRQS_1 = 1 << 2;
+  *(uint32_t volatile*) ARM_DISABLE_BASIC_IRQS = 1;
+  *(uint32_t volatile*) ARM_DISABLE_IRQS_1 = 1 << 2;
 }
 
 static inline void bcmclk_irq_settimeout(uint32_t timeout)
diff --git a/global.h b/global.h
index 34867a1..f5fe9a6 100644
--- a/global.h
+++ b/global.h
@@ -27,4 +27,15 @@
 // called "base address for the ARM interrupt register" elsewhere
 #define ARM_BASE (PERIF_BASE + 0xB000)
 
+#define ARM_IRQ_BASIC_PENDING  (ARM_BASE + 0x200)
+#define ARM_IRQ_PENDING_1      (ARM_BASE + 0x204)
+#define ARM_IRQ_PENDING_2      (ARM_BASE + 0x208)
+#define ARM_FIQ_CONTROL        (ARM_BASE + 0x20C)
+#define ARM_ENABLE_IRQS_1      (ARM_BASE + 0x210)
+#define ARM_ENABLE_IRQS_2      (ARM_BASE + 0x214)
+#define ARM_ENABLE_BASIC_IRQS  (ARM_BASE + 0x218)
+#define ARM_DISABLE_IRQS_1     (ARM_BASE + 0x21C)
+#define ARM_DISABLE_IRQS_2     (ARM_BASE + 0x220)
+#define ARM_DISABLE_BASIC_IRQS (ARM_BASE + 0x224)
+
 #endif // GLOBAL_H