From 2113d5b7516b3ad10828dfd6fbfeb14a459cc28f Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Fri, 25 May 2012 15:36:09 +0900
Subject: [PATCH] boards changes

---
 ChangeLog                        | 20 ++++++++++++++++++++
 boards/FST_01/board.h            |  7 +++++++
 boards/FST_01_00/board.c         | 19 -------------------
 boards/FST_01_00/board.h         |  7 +++++++
 boards/OLIMEX_STM32_H103/board.c | 18 ------------------
 boards/OLIMEX_STM32_H103/board.h |  7 +++++++
 boards/STM32_PRIMER2/board.c     | 18 ------------------
 boards/STM32_PRIMER2/board.h     |  7 +++++++
 8 files changed, 48 insertions(+), 55 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d42d18a..5389f24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,25 @@
 2012-05-25  Niibe Yutaka  <gniibe@fsij.org>
 
+	* boards/OLIMEX_STM32_H103/board.h (SET_USB_CONDITION)
+	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
+	* boards/OLIMEX_STM32_H103/board.c (USB_Cable_Config, set_led):
+	Remove.
+
+	* boards/STM32_PRIMER2/board.h (SET_USB_CONDITION) 
+	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
+	* boards/STM32_PRIMER2/board.c (USB_Cable_Config, set_led):
+	Remove.
+
+	* boards/FST_01_00/board.h (SET_USB_CONDITION)
+	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
+	* boards/FST_01_00/board.c (USB_Cable_Config, set_led): Remove.
+
+	* boards/FST_01/board.h (SET_USB_CONDITION)
+	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
+	* boards/FST_01/board.c (USB_Cable_Config, set_led): Remove.
+
+	* regnual/sys-stm8s-discovery.h, sys-stbee.h: Remove.
+
 	* boards/STM8S_DISCOVERY/board.h (SET_USB_CONDITION)
 	(SET_LED_CONDITION, GPIO_LED, IOPORT_LED, FLASH_PAGE_SIZE): New.
 	* boards/STM8S_DISCOVERY/board.c (USB_Cable_Config, set_led):
diff --git a/boards/FST_01/board.h b/boards/FST_01/board.h
index df3f3bf..a8332f3 100644
--- a/boards/FST_01/board.h
+++ b/boards/FST_01/board.h
@@ -30,6 +30,13 @@
 /*
  * Setup for the FST-01 board.
  */
+#define	SET_USB_CONDITION(en) en	/* To connect USB, call palSetPad */
+#define	SET_LED_CONDITION(on) on	/* To emit light, call palSetPad */
+#define GPIO_USB	GPIOA_USB_ENABLE
+#define IOPORT_USB	GPIOA
+#define GPIO_LED	GPIOB_LED
+#define IOPORT_LED	GPIOB
+#define FLASH_PAGE_SIZE 1024
 
 /*
  * Board identifier.
diff --git a/boards/FST_01_00/board.c b/boards/FST_01_00/board.c
index 2425ffe..a9e918d 100644
--- a/boards/FST_01_00/board.c
+++ b/boards/FST_01_00/board.c
@@ -15,22 +15,3 @@ hwinit1 (void)
 {
   hwinit1_common ();
 }
-
-
-void
-USB_Cable_Config (int NewState)
-{
-  if (NewState != DISABLE)
-    palSetPad (IOPORT1, GPIOA_USB_ENABLE);
-  else
-    palClearPad (IOPORT1, GPIOA_USB_ENABLE);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palSetPad (IOPORT1, GPIOA_LED);
-  else
-    palClearPad (IOPORT1, GPIOA_LED);
-}
diff --git a/boards/FST_01_00/board.h b/boards/FST_01_00/board.h
index a938218..59c4531 100644
--- a/boards/FST_01_00/board.h
+++ b/boards/FST_01_00/board.h
@@ -30,6 +30,13 @@
 /*
  * Setup for the FST-01 board (experimental version 00).
  */
+#define	SET_USB_CONDITION(en) en	/* To connect USB, call palSetPad */
+#define	SET_LED_CONDITION(on) on	/* To emit light, call palSetPad */
+#define GPIO_USB	GPIOA_USB_ENABLE
+#define IOPORT_USB	GPIOA
+#define GPIO_LED	GPIOA_LED
+#define IOPORT_LED	GPIOA
+#define FLASH_PAGE_SIZE 1024
 
 /*
  * Board identifier.
diff --git a/boards/OLIMEX_STM32_H103/board.c b/boards/OLIMEX_STM32_H103/board.c
index 0e22542..a9e918d 100644
--- a/boards/OLIMEX_STM32_H103/board.c
+++ b/boards/OLIMEX_STM32_H103/board.c
@@ -15,21 +15,3 @@ hwinit1 (void)
 {
   hwinit1_common ();
 }
-
-void
-USB_Cable_Config (FunctionalState NewState)
-{
-  if (NewState != DISABLE)
-    palClearPad (IOPORT3, GPIOC_DISC);
-  else
-    palSetPad (IOPORT3, GPIOC_DISC);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palClearPad (IOPORT3, GPIOC_LED);
-  else
-    palSetPad (IOPORT3, GPIOC_LED);
-}
diff --git a/boards/OLIMEX_STM32_H103/board.h b/boards/OLIMEX_STM32_H103/board.h
index 9554c51..1e7df8d 100644
--- a/boards/OLIMEX_STM32_H103/board.h
+++ b/boards/OLIMEX_STM32_H103/board.h
@@ -30,6 +30,13 @@
 /*
  * Setup for the Olimex STM32-H103 proto board.
  */
+#define	SET_USB_CONDITION(en) (!en)	/* To connect USB, call palClearPad */
+#define	SET_LED_CONDITION(on) (!on)	/* To emit light, call palClearPad */
+#define GPIO_USB	GPIOC_DISC
+#define IOPORT_USB	GPIOC
+#define GPIO_LED	GPIOC_LED
+#define IOPORT_LED	GPIOC
+#define FLASH_PAGE_SIZE 1024
 
 /*
  * Board identifier.
diff --git a/boards/STM32_PRIMER2/board.c b/boards/STM32_PRIMER2/board.c
index b75d3eb..95baddb 100644
--- a/boards/STM32_PRIMER2/board.c
+++ b/boards/STM32_PRIMER2/board.c
@@ -21,21 +21,3 @@ hwinit1(void)
   palClearPad (IOPORT5, GPIOE_LED);
   palClearPad (IOPORT3, GPIOC_SHUTDOWN);
 }
-
-void
-USB_Cable_Config (FunctionalState NewState)
-{
-  if (NewState != DISABLE)
-    palClearPad (IOPORT4, GPIOD_DISC);
-  else
-    palSetPad (IOPORT4, GPIOD_DISC);
-}
-
-void
-set_led (int value)
-{
-  if (value)
-    palClearPad (IOPORT5, GPIOE_LEDR);
-  else
-    palSetPad (IOPORT5, GPIOE_LEDR);
-}
diff --git a/boards/STM32_PRIMER2/board.h b/boards/STM32_PRIMER2/board.h
index b295095..89f79c4 100644
--- a/boards/STM32_PRIMER2/board.h
+++ b/boards/STM32_PRIMER2/board.h
@@ -30,6 +30,13 @@
 /*
  * Setup for the STM32 Primer2.
  */
+#define	SET_USB_CONDITION(en) (!en)	/* To connect USB, call palClearPad */
+#define	SET_LED_CONDITION(on) (!on)	/* To emit light, call palClearPad */
+#define GPIO_USB	GPIOD_DISC
+#define IOPORT_USB	GPIOD
+#define GPIO_LED	GPIOE_LEDR
+#define IOPORT_LED	GPIOE
+#define FLASH_PAGE_SIZE 2048
 
 /*
  * Board identifier.