git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@4611 35acf78f-673a-0410-8e92-d51de3d6d3f4

4 files changed, 28 insertions, 40 deletions

diff --git a/demos/ARMCM3-STM32F103-FATFS/mcuconf.h b/demos/ARMCM3-STM32F103-FATFS/mcuconf.h
index 22c608cde..c523f51ab 100644
--- a/demos/ARMCM3-STM32F103-FATFS/mcuconf.h
+++ b/demos/ARMCM3-STM32F103-FATFS/mcuconf.h
@@ -18,8 +18,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

+#define STM32F103_MCUCONF

+

 /*

- * STM32F1xx drivers configuration.

+ * STM32F103 drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -58,14 +60,14 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_USE_ADC1                  FALSE

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_ADC1_IRQ_PRIORITY         6

 

 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  TRUE

+#define STM32_CAN_USE_CAN1                  FALSE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

@@ -104,16 +106,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_USE_I2C3                  FALSE

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C3_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C3_DMA_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

 #define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

 

 /*

  * ICU driver system settings.

@@ -161,13 +159,11 @@
 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USE_USART6             FALSE

 #define STM32_SERIAL_USART1_PRIORITY        12

 #define STM32_SERIAL_USART2_PRIORITY        12

 #define STM32_SERIAL_USART3_PRIORITY        12

 #define STM32_SERIAL_UART4_PRIORITY         12

 #define STM32_SERIAL_UART5_PRIORITY         12

-#define STM32_SERIAL_USART6_PRIORITY        12

 

 /*

  * SPI driver system settings.

@@ -200,7 +196,8 @@
 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

+

diff --git a/demos/ARMCM3-STM32F103-G++/mcuconf.h b/demos/ARMCM3-STM32F103-G++/mcuconf.h
index c49fa23ba..b3c48a3b2 100644
--- a/demos/ARMCM3-STM32F103-G++/mcuconf.h
+++ b/demos/ARMCM3-STM32F103-G++/mcuconf.h
@@ -18,8 +18,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

+#define STM32F103_MCUCONF

+

 /*

- * STM32F1xx drivers configuration.

+ * STM32F103 drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -58,14 +60,14 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_USE_ADC1                  FALSE

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_ADC1_IRQ_PRIORITY         6

 

 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  TRUE

+#define STM32_CAN_USE_CAN1                  FALSE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

@@ -104,16 +106,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_USE_I2C3                  FALSE

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C3_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C3_DMA_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

 #define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

 

 /*

  * ICU driver system settings.

@@ -161,13 +159,11 @@
 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USE_USART6             FALSE

 #define STM32_SERIAL_USART1_PRIORITY        12

 #define STM32_SERIAL_USART2_PRIORITY        12

 #define STM32_SERIAL_USART3_PRIORITY        12

 #define STM32_SERIAL_UART4_PRIORITY         12

 #define STM32_SERIAL_UART5_PRIORITY         12

-#define STM32_SERIAL_USART6_PRIORITY        12

 

 /*

  * SPI driver system settings.

@@ -200,7 +196,8 @@
 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

+

diff --git a/demos/ARMCM3-STM32F103/mcuconf.h b/demos/ARMCM3-STM32F103/mcuconf.h
index c49fa23ba..b3c48a3b2 100644
--- a/demos/ARMCM3-STM32F103/mcuconf.h
+++ b/demos/ARMCM3-STM32F103/mcuconf.h
@@ -18,8 +18,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

+#define STM32F103_MCUCONF

+

 /*

- * STM32F1xx drivers configuration.

+ * STM32F103 drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -58,14 +60,14 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_USE_ADC1                  FALSE

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_ADC1_IRQ_PRIORITY         6

 

 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  TRUE

+#define STM32_CAN_USE_CAN1                  FALSE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

@@ -104,16 +106,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_USE_I2C3                  FALSE

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C3_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C3_DMA_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

 #define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

 

 /*

  * ICU driver system settings.

@@ -161,13 +159,11 @@
 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USE_USART6             FALSE

 #define STM32_SERIAL_USART1_PRIORITY        12

 #define STM32_SERIAL_USART2_PRIORITY        12

 #define STM32_SERIAL_USART3_PRIORITY        12

 #define STM32_SERIAL_UART4_PRIORITY         12

 #define STM32_SERIAL_UART5_PRIORITY         12

-#define STM32_SERIAL_USART6_PRIORITY        12

 

 /*

  * SPI driver system settings.

@@ -200,7 +196,8 @@
 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

+

diff --git a/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h b/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
index a9eb9f298..56a5d6a7d 100644
--- a/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
+++ b/demos/ARMCM3-STM32F103ZG-FATFS/mcuconf.h
@@ -18,8 +18,10 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */

 

+#define STM32F103_MCUCONF

+

 /*

- * STM32F1xx drivers configuration.

+ * STM32F103 drivers configuration.

  * The following settings override the default settings present in

  * the various device driver implementation headers.

  * Note that the settings for each driver only have effect if the whole

@@ -58,14 +60,14 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  TRUE

+#define STM32_ADC_USE_ADC1                  FALSE

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_ADC1_IRQ_PRIORITY         6

 

 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  TRUE

+#define STM32_CAN_USE_CAN1                  FALSE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

@@ -104,16 +106,12 @@
  */

 #define STM32_I2C_USE_I2C1                  FALSE

 #define STM32_I2C_USE_I2C2                  FALSE

-#define STM32_I2C_USE_I2C3                  FALSE

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

-#define STM32_I2C_I2C3_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

 #define STM32_I2C_I2C2_DMA_PRIORITY         3

-#define STM32_I2C_I2C3_DMA_PRIORITY         3

 #define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()

 #define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()

-#define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()

 

 /*

  * ICU driver system settings.

@@ -161,13 +159,11 @@
 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

-#define STM32_SERIAL_USE_USART6             FALSE

 #define STM32_SERIAL_USART1_PRIORITY        12

 #define STM32_SERIAL_USART2_PRIORITY        12

 #define STM32_SERIAL_USART3_PRIORITY        12

 #define STM32_SERIAL_UART4_PRIORITY         12

 #define STM32_SERIAL_UART5_PRIORITY         12

-#define STM32_SERIAL_USART6_PRIORITY        12

 

 /*

  * SPI driver system settings.

@@ -200,7 +196,8 @@
 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  TRUE

+#define STM32_USB_USE_USB1                  FALSE

 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

+