aboutsummaryrefslogtreecommitdiff
path: root/02-usart/include
diff options
context:
space:
mode:
Diffstat (limited to '02-usart/include')
-rw-r--r--02-usart/include/arch/arm/arch.h1
-rw-r--r--02-usart/include/arch/x86_64/arch.h1
-rw-r--r--02-usart/include/common.h3
3 files changed, 5 insertions, 0 deletions
diff --git a/02-usart/include/arch/arm/arch.h b/02-usart/include/arch/arm/arch.h
index a136b4a..a3b93dc 100644
--- a/02-usart/include/arch/arm/arch.h
+++ b/02-usart/include/arch/arm/arch.h
@@ -25,6 +25,7 @@
#define SRAM2_BASE (0x2000C000)
#define SYSTEM_CONFIG_BLOCK_BASE (0xE000E008)
+#define NVIC_BASE (0xE000E004)
#include <stdint.h>
#ifndef DRY_RUN
diff --git a/02-usart/include/arch/x86_64/arch.h b/02-usart/include/arch/x86_64/arch.h
index 6723eea..a39df9a 100644
--- a/02-usart/include/arch/x86_64/arch.h
+++ b/02-usart/include/arch/x86_64/arch.h
@@ -20,5 +20,6 @@
#define SRAM2_BASE (load_fake_sram2__() + 0x0)
#define SYSTEM_CONFIG_BLOCK_BASE (load_fake_scb__())
+#define NVIC_BASE (load_fake_nvic__())
#endif /* ARCH_H_ */
diff --git a/02-usart/include/common.h b/02-usart/include/common.h
index 2f14e42..653279e 100644
--- a/02-usart/include/common.h
+++ b/02-usart/include/common.h
@@ -44,4 +44,7 @@ typedef __IO uint32_t bits_t;
#define regset(reg, mask, val) \
((reg) = ((reg) & ~mask) | (val << CTZ(mask)))
+#define regget(reg, mask) \
+ (((reg) & mask) >> (CTZ(mask)))
+
#endif /* COMMON_H */