From bc35bc81cff142f1be29ec239bf4f807933a6c59 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Thu, 14 Dec 2017 19:04:16 +0900 Subject: [PATCH] APB -> APB1. --- example-fsm-55/debian-logo.c | 2 +- example-fsm-55/hh.c | 2 +- example-fsm-55/hiroshi-ayumi.c | 2 +- example-primer2/lcd.c | 2 +- example-primer2/primer2-switches.c | 2 +- mcu/clk_gpio_init-stm32.c | 2 +- mcu/stm32.h | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/example-fsm-55/debian-logo.c b/example-fsm-55/debian-logo.c index 2b68b9c..4129b13 100644 --- a/example-fsm-55/debian-logo.c +++ b/example-fsm-55/debian-logo.c @@ -7,7 +7,7 @@ static uint8_t main_finished; #define PERIPH_BASE 0x40000000 -#define APBPERIPH_BASE PERIPH_BASE +#define APB1PERIPH_BASE PERIPH_BASE #define APB2PERIPH_BASE (PERIPH_BASE + 0x10000) #define AHBPERIPH_BASE (PERIPH_BASE + 0x20000) #define AHB2PERIPH_BASE (PERIPH_BASE + 0x08000000) diff --git a/example-fsm-55/hh.c b/example-fsm-55/hh.c index 1ca9eaa..d6578b0 100644 --- a/example-fsm-55/hh.c +++ b/example-fsm-55/hh.c @@ -7,7 +7,7 @@ static uint8_t main_finished; #define PERIPH_BASE 0x40000000 -#define APBPERIPH_BASE PERIPH_BASE +#define APB1PERIPH_BASE PERIPH_BASE #define APB2PERIPH_BASE (PERIPH_BASE + 0x10000) #define AHBPERIPH_BASE (PERIPH_BASE + 0x20000) #define AHB2PERIPH_BASE (PERIPH_BASE + 0x08000000) diff --git a/example-fsm-55/hiroshi-ayumi.c b/example-fsm-55/hiroshi-ayumi.c index 1d21d41..4261a5f 100644 --- a/example-fsm-55/hiroshi-ayumi.c +++ b/example-fsm-55/hiroshi-ayumi.c @@ -6,7 +6,7 @@ #include "board.h" #define PERIPH_BASE 0x40000000 -#define APBPERIPH_BASE PERIPH_BASE +#define APB1PERIPH_BASE PERIPH_BASE #define APB2PERIPH_BASE (PERIPH_BASE + 0x10000) #define AHBPERIPH_BASE (PERIPH_BASE + 0x20000) #define AHB2PERIPH_BASE (PERIPH_BASE + 0x08000000) diff --git a/example-primer2/lcd.c b/example-primer2/lcd.c index effbe24..9dab1d3 100644 --- a/example-primer2/lcd.c +++ b/example-primer2/lcd.c @@ -6,7 +6,7 @@ #include "board.h" #define PERIPH_BASE 0x40000000 -#define APBPERIPH_BASE PERIPH_BASE +#define APB1PERIPH_BASE PERIPH_BASE #define APB2PERIPH_BASE (PERIPH_BASE + 0x10000) struct GPIO { diff --git a/example-primer2/primer2-switches.c b/example-primer2/primer2-switches.c index 5ab73ac..9b4a3cb 100644 --- a/example-primer2/primer2-switches.c +++ b/example-primer2/primer2-switches.c @@ -4,7 +4,7 @@ #include "board.h" #define PERIPH_BASE 0x40000000 -#define APBPERIPH_BASE PERIPH_BASE +#define APB1PERIPH_BASE PERIPH_BASE #define APB2PERIPH_BASE (PERIPH_BASE + 0x10000) struct GPIO { diff --git a/mcu/clk_gpio_init-stm32.c b/mcu/clk_gpio_init-stm32.c index 496c8a7..ab74cdf 100644 --- a/mcu/clk_gpio_init-stm32.c +++ b/mcu/clk_gpio_init-stm32.c @@ -62,7 +62,7 @@ struct SYSCFG { }; #define SYSCFG_CFGR1_MEM_MODE 0x03 -#define SYSCFG_BASE (APBPERIPH_BASE + 0x00010000) +#define SYSCFG_BASE (APB1PERIPH_BASE + 0x00010000) static struct SYSCFG *const SYSCFG = (struct SYSCFG *)SYSCFG_BASE; #endif diff --git a/mcu/stm32.h b/mcu/stm32.h index 965019e..1132d26 100644 --- a/mcu/stm32.h +++ b/mcu/stm32.h @@ -1,5 +1,5 @@ #define PERIPH_BASE 0x40000000 -#define APBPERIPH_BASE PERIPH_BASE +#define APB1PERIPH_BASE PERIPH_BASE #define APB2PERIPH_BASE (PERIPH_BASE + 0x10000) #define AHBPERIPH_BASE (PERIPH_BASE + 0x20000) #define AHB2PERIPH_BASE (PERIPH_BASE + 0x08000000)