aboutsummaryrefslogtreecommitdiff
path: root/armclock.h
diff options
context:
space:
mode:
authorWojtek Kosior <kwojtus@protonmail.com>2020-01-02 13:45:41 +0100
committerWojtek Kosior <kwojtus@protonmail.com>2020-01-02 13:45:41 +0100
commit03e9c87115527eeb21d5c7c554c3a1b6f8211e54 (patch)
tree602190ded1f65961336e0ed12b9261f5bdc178bc /armclock.h
parent7da46d099e1d1909bf5d09ecedfea21481a7a3b9 (diff)
downloadrpi-MMU-example-03e9c87115527eeb21d5c7c554c3a1b6f8211e54.tar.gz
rpi-MMU-example-03e9c87115527eeb21d5c7c554c3a1b6f8211e54.zip
fix/improve arm timer register definitions
Diffstat (limited to 'armclock.h')
-rw-r--r--armclock.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/armclock.h b/armclock.h
index 3e65d27..2b2aec9 100644
--- a/armclock.h
+++ b/armclock.h
@@ -5,16 +5,15 @@
#include "global.h"
-#define ARMCLK_LOAD (ARM_BASE + 0x400)
-#define ARMCLK_VALUE (ARM_BASE + 0x404)
-#define ARMCLK_CONTROL (ARM_BASE + 0x408)
-#define ARMCLK_IRQ_CLR_ACK (ARM_BASE + 0x40C)
-#define ARMCLK_LOAD_RAW_IRQ (ARM_BASE + 0x410)
-#define ARMCLK_LOAD_MASKED_IRQ (ARM_BASE + 0x414)
-#define ARMCLK_LOAD_RELOAD (ARM_BASE + 0x418)
-// the last 2 are said to not exist on the actual Pi
-#define ARMCLK_LOAD_PRE_DRIVER (ARM_BASE + 0x41C)
-#define ARMCLK_LOAD_FREE_RUNNING_COUNTER (ARM_BASE + 0x420)
+#define ARMCLK_LOAD (ARM_BASE + 0x400)
+#define ARMCLK_VALUE (ARM_BASE + 0x404)
+#define ARMCLK_CONTROL (ARM_BASE + 0x408)
+#define ARMCLK_IRQ_CLR_ACK (ARM_BASE + 0x40C)
+#define ARMCLK_RAW_IRQ (ARM_BASE + 0x410)
+#define ARMCLK_MASKED_IRQ (ARM_BASE + 0x414)
+#define ARMCLK_RELOAD (ARM_BASE + 0x418)
+#define ARMCLK_PRE_DRIVER (ARM_BASE + 0x41C)
+#define ARMCLK_FREE_RUNNING_COUNTER (ARM_BASE + 0x420)
typedef union armclk_control
{
@@ -63,7 +62,7 @@ static inline void armclk_irq_settimeout(uint32_t timeout)
static inline _Bool armclk_irq_pending(void)
{
- return *(uint32_t volatile*) ARMCLK_LOAD_RAW_IRQ;
+ return *(uint32_t volatile*) ARMCLK_RAW_IRQ;
}
#endif // ARMCLOCK_H