diff options
| author | NIIBE Yutaka <gniibe@fsij.org> | 2016-05-31 12:00:25 +0900 |
|---|---|---|
| committer | NIIBE Yutaka <gniibe@fsij.org> | 2016-05-31 12:00:25 +0900 |
| commit | 03a1d46c0873c0a545c81a9a3acc4d51f0f6d4d4 (patch) | |
| tree | c9b867fb49835ad2c96b7b5e38274358b98e60ef /mcu | |
| parent | 3a4e1f2bd59a5185e638a2552c64344d78e0f54f (diff) | |
Fix sys-stm32f103.h
Diffstat (limited to 'mcu')
| -rw-r--r-- | mcu/adc-stm32f103.c | 7 | ||||
| -rw-r--r-- | mcu/sys-stm32f103.h | 3 |
2 files changed, 4 insertions, 6 deletions
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); |