From 23893d9b73ebc28ff111d21827122677c27bee55 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 10 Dec 2014 16:18:29 +0900
Subject: Version 0.04
---
board/board-fst-01-00.h | 4 ++--
board/board-fst-01.h | 4 ++--
board/board-olimex-stm32-h103.h | 4 ++--
board/board-stbee-mini.h | 8 ++++----
board/board-stbee.h | 4 ++--
board/board-stm8s-discovery.h | 4 ++--
6 files changed, 14 insertions(+), 14 deletions(-)
(limited to 'board')
diff --git a/board/board-fst-01-00.h b/board/board-fst-01-00.h
index a2bf9f9..a00995e 100644
--- a/board/board-fst-01-00.h
+++ b/board/board-fst-01-00.h
@@ -25,7 +25,7 @@
#define GPIO_USB_BASE GPIOA_BASE
#define GPIO_LED_BASE GPIOA_BASE
-#define RCC_APB2ENR_IOP_EN RCC_APB2ENR_IOPAEN
-#define RCC_APB2RSTR_IOP_RST RCC_APB2RSTR_IOPARST
+#define RCC_ENR_IOP_EN RCC_APB2ENR_IOPAEN
+#define RCC_RSTR_IOP_RST RCC_APB2RSTR_IOPARST
/* NeuG settings for ADC2 is default (PA0: Analog IN0, PA1: Analog IN1). */
diff --git a/board/board-fst-01.h b/board/board-fst-01.h
index 257ba72..40e98d7 100644
--- a/board/board-fst-01.h
+++ b/board/board-fst-01.h
@@ -58,8 +58,8 @@
#define GPIO_USB_BASE GPIOA_BASE
#define GPIO_LED_BASE GPIOB_BASE
-#define RCC_APB2ENR_IOP_EN (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN)
-#define RCC_APB2RSTR_IOP_RST (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST)
+#define RCC_ENR_IOP_EN (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN)
+#define RCC_RSTR_IOP_RST (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST)
/* NeuG settings for ADC2. */
#define NEUG_ADC_SETTING2_SMPR1 0
diff --git a/board/board-olimex-stm32-h103.h b/board/board-olimex-stm32-h103.h
index a8cb7a0..07edfa5 100644
--- a/board/board-olimex-stm32-h103.h
+++ b/board/board-olimex-stm32-h103.h
@@ -25,8 +25,8 @@
#define GPIO_USB_BASE GPIOC_BASE
#define GPIO_LED_BASE GPIOC_BASE
-#define RCC_APB2ENR_IOP_EN RCC_APB2ENR_IOPCEN
-#define RCC_APB2RSTR_IOP_RST RCC_APB2RSTR_IOPCRST
+#define RCC_ENR_IOP_EN RCC_APB2ENR_IOPCEN
+#define RCC_RSTR_IOP_RST RCC_APB2RSTR_IOPCRST
/* NeuG settings for ADC2. */
#define NEUG_ADC_SETTING2_SMPR1 ADC_SMPR1_SMP_AN10(ADC_SAMPLE_1P5) \
diff --git a/board/board-stbee-mini.h b/board/board-stbee-mini.h
index 5e4acbb..9e92f66 100644
--- a/board/board-stbee-mini.h
+++ b/board/board-stbee-mini.h
@@ -78,9 +78,9 @@
#define GPIOB_7SEG_F 9
#define GPIOB_7SEG_G 8
-#define RCC_APB2ENR_IOP_EN \
+#define RCC_ENR_IOP_EN \
(RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN | RCC_APB2ENR_AFIOEN)
-#define RCC_APB2RSTR_IOP_RST \
+#define RCC_RSTR_IOP_RST \
(RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | RCC_APB2RSTR_AFIORST)
#else
/*
@@ -97,8 +97,8 @@
#define VAL_GPIO_CRL 0x88888888 /* PA7...PA0 */
#define VAL_GPIO_CRH 0x63611888 /* PA15...PA8 */
-#define RCC_APB2ENR_IOP_EN (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_AFIOEN)
-#define RCC_APB2RSTR_IOP_RST (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_AFIORST)
+#define RCC_ENR_IOP_EN (RCC_APB2ENR_IOPAEN | RCC_APB2ENR_AFIOEN)
+#define RCC_RSTR_IOP_RST (RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_AFIORST)
#endif
diff --git a/board/board-stbee.h b/board/board-stbee.h
index 6c1f313..a12ec44 100644
--- a/board/board-stbee.h
+++ b/board/board-stbee.h
@@ -17,8 +17,8 @@
#define VAL_GPIO_OTHER_CRL 0x88888884 /* PA7...PA0 */
#define VAL_GPIO_OTHER_CRH 0x88811888 /* PA15...PA8 */
-#define RCC_APB2ENR_IOP_EN (RCC_APB2ENR_IOPAEN|RCC_APB2ENR_IOPDEN)
-#define RCC_APB2RSTR_IOP_RST (RCC_APB2RSTR_IOPARST|RCC_APB2RSTR_IOPDRST)
+#define RCC_ENR_IOP_EN (RCC_APB2ENR_IOPAEN|RCC_APB2ENR_IOPDEN)
+#define RCC_RSTR_IOP_RST (RCC_APB2RSTR_IOPARST|RCC_APB2RSTR_IOPDRST)
/*
* Port D setup.
diff --git a/board/board-stm8s-discovery.h b/board/board-stm8s-discovery.h
index 25b3e84..c4d52ea 100644
--- a/board/board-stm8s-discovery.h
+++ b/board/board-stm8s-discovery.h
@@ -39,9 +39,9 @@
#define GPIO_USB_BASE GPIOA_BASE
#define GPIO_LED_BASE GPIOA_BASE
-#define RCC_APB2ENR_IOP_EN \
+#define RCC_ENR_IOP_EN \
(RCC_APB2ENR_IOPAEN | RCC_APB2ENR_IOPBEN | RCC_APB2ENR_AFIOEN)
-#define RCC_APB2RSTR_IOP_RST \
+#define RCC_RSTR_IOP_RST \
(RCC_APB2RSTR_IOPARST | RCC_APB2RSTR_IOPBRST | RCC_APB2RSTR_AFIORST)
/* NeuG settings for ADC2 is default (PA0: Analog IN0, PA1: Analog IN1). */
--
cgit v1.2.3