aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2011-11-16 18:05:45 -0800
committerPiotr Esden-Tempski2011-11-16 18:41:48 -0800
commit679f39426f4806b32fbdc66164575bbfe8347555 (patch)
tree4ba827eef34733f6c797f78a6fa9cdd80d1ec052 /include
parentbf4f8480a6f77413f44adc1e7ce1fde5f45ec341 (diff)
Cleaned up header inclusion selection macros.
Diffstat (limited to 'include')
-rw-r--r--include/libopencm3/stm32/memorymap.h20
-rw-r--r--include/libopencm3/stm32/nvic.h18
2 files changed, 15 insertions, 23 deletions
diff --git a/include/libopencm3/stm32/memorymap.h b/include/libopencm3/stm32/memorymap.h
index 4700e4e..3423867 100644
--- a/include/libopencm3/stm32/memorymap.h
+++ b/include/libopencm3/stm32/memorymap.h
@@ -20,18 +20,14 @@
#ifndef LIBOPENCM3_MEMORYMAP_COMMON_H
#define LIBOPENCM3_MEMORYMAP_COMMON_H
-#ifdef STM32F1
-#include <libopencm3/stm32/f1/memorymap.h>
+#if defined(STM32F1)
+# include <libopencm3/stm32/f1/memorymap.h>
+#elif defined(STM32F2)
+# include <libopencm3/stm32/f2/memorymap.h>
+#elif defined(STM32F4)
+# include <libopencm3/stm32/f4/memorymap.h>
#else
-#ifdef STM32F2
-#include <libopencm3/stm32/f2/memorymap.h>
-#else
-#ifdef STM32F4
-#include <libopencm3/stm32/f4/memorymap.h>
-#else
-#error "stm32 family not defined."
-#endif
-#endif
+# error "stm32 family not defined."
#endif
-#endif
+#endif /* LIBOPENCM3_MEMORYMAP_COMMON_H */
diff --git a/include/libopencm3/stm32/nvic.h b/include/libopencm3/stm32/nvic.h
index 1db5153..8dfc294 100644
--- a/include/libopencm3/stm32/nvic.h
+++ b/include/libopencm3/stm32/nvic.h
@@ -82,18 +82,14 @@
* specific header file in the corresponding subfolder.
*/
-#ifdef STM32F1
-#include <libopencm3/stm32/f1/nvic_f1.h>
+#if defined(STM32F1)
+# include <libopencm3/stm32/f1/nvic_f1.h>
+#elif defined(STM32F2)
+# include <libopencm3/stm32/f2/nvic_f2.h>
+#elif defined(STM32F4)
+# include <libopencm3/stm32/f4/nvic_f4.h>
#else
-#ifdef STM32F2
-#include <libopencm3/stm32/f2/nvic_f2.h>
-#else
-#ifdef STM32F4
-#include <libopencm3/stm32/f4/nvic_f4.h>
-#else
-#error "stm32 family not defined."
-#endif
-#endif
+# error "stm32 family not defined."
#endif