From 679f39426f4806b32fbdc66164575bbfe8347555 Mon Sep 17 00:00:00 2001
From: Piotr Esden-Tempski <piotr@esden.net>
Date: Wed, 16 Nov 2011 18:05:45 -0800
Subject: [PATCH] Cleaned up header inclusion selection macros.

---
 include/libopencm3/stm32/memorymap.h | 20 ++++++++------------
 include/libopencm3/stm32/nvic.h      | 18 +++++++-----------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/include/libopencm3/stm32/memorymap.h b/include/libopencm3/stm32/memorymap.h
index 4700e4e7..3423867f 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 1db51535..8dfc294d 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