From 03a1d46c0873c0a545c81a9a3acc4d51f0f6d4d4 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 31 May 2016 12:00:25 +0900
Subject: Fix sys-stm32f103.h

---
 mcu/adc-stm32f103.c | 7 +------
 mcu/sys-stm32f103.h | 3 +++
 2 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'mcu')

diff --git a/mcu/adc-stm32f103.c b/mcu/adc-stm32f103.c
index fd40312..728d921 100644
--- a/mcu/adc-stm32f103.c
+++ b/mcu/adc-stm32f103.c
@@ -132,12 +132,7 @@ adc_init (void)
 }
 
 #include "board.h"
-#if defined(USE_SYS3) || defined(USE_SYS_BOARD_ID)
-#include "mcu/sys-stm32f103.h"
-# define SYS_BOARD_ID sys_board_id
-#else
-# define SYS_BOARD_ID BOARD_ID
-#endif
+#include "sys.h"
 
 static void
 get_adc_config (uint32_t config[4])
diff --git a/mcu/sys-stm32f103.h b/mcu/sys-stm32f103.h
index 7685f27..5ebd666 100644
--- a/mcu/sys-stm32f103.h
+++ b/mcu/sys-stm32f103.h
@@ -15,6 +15,9 @@ extern const uint8_t sys_version[8];
 #if defined(USE_SYS3) || defined(USE_SYS_BOARD_ID)
 extern const uint32_t sys_board_id;
 extern const uint8_t sys_board_name[];
+# define SYS_BOARD_ID sys_board_id
+#else
+# define SYS_BOARD_ID BOARD_ID
 #endif
 
 typedef void (*handler)(void);
-- 
cgit v1.2.3