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

2 files changed, 10 insertions, 27 deletions

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

 */

 

+#define STM32F100_MCUCONF

+

 /*

- * STM32F100 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

@@ -61,12 +63,6 @@
 #define STM32_ADC_ADC1_IRQ_PRIORITY         6

 

 /*

- * CAN driver system settings.

- */

-#define STM32_CAN_USE_CAN1                  TRUE

-#define STM32_CAN_CAN1_IRQ_PRIORITY         11

-

-/*

  * EXT driver system settings.

  */

 #define STM32_EXT_EXTI0_IRQ_PRIORITY        6

@@ -102,16 +98,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.

@@ -157,28 +149,19 @@
 #define STM32_SERIAL_USE_USART1             TRUE

 #define STM32_SERIAL_USE_USART2             FALSE

 #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.

  */

 #define STM32_SPI_USE_SPI1                  TRUE

 #define STM32_SPI_USE_SPI2                  FALSE

-#define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

-#define STM32_SPI_SPI3_DMA_PRIORITY         1

 #define STM32_SPI_SPI1_IRQ_PRIORITY         10

 #define STM32_SPI_SPI2_IRQ_PRIORITY         10

-#define STM32_SPI_SPI3_IRQ_PRIORITY         10

 #define STM32_SPI_DMA_ERROR_HOOK(spip)      chSysHalt()

 

 /*

@@ -195,10 +178,3 @@
 #define STM32_UART_USART3_DMA_PRIORITY      0

 #define STM32_UART_DMA_ERROR_HOOK(uartp)    chSysHalt()

 

-/*

- * USB driver system settings.

- */

-#define STM32_USB_USE_USB1                  TRUE

-#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/os/hal/platforms/STM32F1xx/hal_lld_f100.h b/os/hal/platforms/STM32F1xx/hal_lld_f100.h
index 4cf678935..65b116993 100644
--- a/os/hal/platforms/STM32F1xx/hal_lld_f100.h
+++ b/os/hal/platforms/STM32F1xx/hal_lld_f100.h
@@ -640,6 +640,13 @@
 /*===========================================================================*/

 

 /*

+ * Configuration-related checks.

+ */

+#if !defined(STM32F100_MCUCONF)

+#error "Using a wrong mcuconf.h file, STM32F100_MCUCONF not defined"

+#endif

+

+/*

  * HSI related checks.

  */

 #if STM32_HSI_ENABLED