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

13 files changed, 33 insertions, 36 deletions

diff --git a/testhal/STM32F1xx/ADC/mcuconf.h b/testhal/STM32F1xx/ADC/mcuconf.h
index 8dccb622c..af2c26fe0 100644
--- a/testhal/STM32F1xx/ADC/mcuconf.h
+++ b/testhal/STM32F1xx/ADC/mcuconf.h
@@ -60,7 +60,7 @@
 /*

  * ADC driver system settings.

  */

-#define STM32_ADC_USE_ADC1                  FALSE

+#define STM32_ADC_USE_ADC1                  TRUE

 #define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_ADC1_IRQ_PRIORITY         6

 

diff --git a/testhal/STM32F1xx/CAN/mcuconf.h b/testhal/STM32F1xx/CAN/mcuconf.h
index 8dccb622c..b1e2f3066 100644
--- a/testhal/STM32F1xx/CAN/mcuconf.h
+++ b/testhal/STM32F1xx/CAN/mcuconf.h
@@ -67,7 +67,7 @@
 /*

  * CAN driver system settings.

  */

-#define STM32_CAN_USE_CAN1                  FALSE

+#define STM32_CAN_USE_CAN1                  TRUE

 #define STM32_CAN_CAN1_IRQ_PRIORITY         11

 

 /*

diff --git a/testhal/STM32F1xx/GPT/mcuconf.h b/testhal/STM32F1xx/GPT/mcuconf.h
index 8dccb622c..0759c3a43 100644
--- a/testhal/STM32F1xx/GPT/mcuconf.h
+++ b/testhal/STM32F1xx/GPT/mcuconf.h
@@ -88,10 +88,10 @@
 /*

  * GPT driver system settings.

  */

-#define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  FALSE

-#define STM32_GPT_USE_TIM3                  FALSE

-#define STM32_GPT_USE_TIM4                  FALSE

+#define STM32_GPT_USE_TIM1                  TRUE

+#define STM32_GPT_USE_TIM2                  TRUE

+#define STM32_GPT_USE_TIM3                  TRUE

+#define STM32_GPT_USE_TIM4                  TRUE

 #define STM32_GPT_USE_TIM5                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

diff --git a/testhal/STM32F1xx/I2C/mcuconf.h b/testhal/STM32F1xx/I2C/mcuconf.h
index 8dccb622c..e3cb528d8 100644
--- a/testhal/STM32F1xx/I2C/mcuconf.h
+++ b/testhal/STM32F1xx/I2C/mcuconf.h
@@ -104,8 +104,8 @@
 /*

  * I2C driver system settings.

  */

-#define STM32_I2C_USE_I2C1                  FALSE

-#define STM32_I2C_USE_I2C2                  FALSE

+#define STM32_I2C_USE_I2C1                  TRUE

+#define STM32_I2C_USE_I2C2                  TRUE

 #define STM32_I2C_I2C1_IRQ_PRIORITY         5

 #define STM32_I2C_I2C2_IRQ_PRIORITY         5

 #define STM32_I2C_I2C1_DMA_PRIORITY         3

diff --git a/testhal/STM32F1xx/IRQ_STORM/mcuconf.h b/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
index 8dccb622c..356ec3370 100644
--- a/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F1xx/IRQ_STORM/mcuconf.h
@@ -88,14 +88,14 @@
 /*

  * GPT driver system settings.

  */

-#define STM32_GPT_USE_TIM1                  FALSE

-#define STM32_GPT_USE_TIM2                  FALSE

+#define STM32_GPT_USE_TIM1                  TRUE

+#define STM32_GPT_USE_TIM2                  TRUE

 #define STM32_GPT_USE_TIM3                  FALSE

 #define STM32_GPT_USE_TIM4                  FALSE

 #define STM32_GPT_USE_TIM5                  FALSE

 #define STM32_GPT_USE_TIM8                  FALSE

-#define STM32_GPT_TIM1_IRQ_PRIORITY         7

-#define STM32_GPT_TIM2_IRQ_PRIORITY         7

+#define STM32_GPT_TIM1_IRQ_PRIORITY         6

+#define STM32_GPT_TIM2_IRQ_PRIORITY         10

 #define STM32_GPT_TIM3_IRQ_PRIORITY         7

 #define STM32_GPT_TIM4_IRQ_PRIORITY         7

 #define STM32_GPT_TIM5_IRQ_PRIORITY         7

@@ -155,7 +155,7 @@
  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             FALSE

+#define STM32_SERIAL_USE_USART2             TRUE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

diff --git a/testhal/STM32F1xx/PWM-ICU/mcuconf.h b/testhal/STM32F1xx/PWM-ICU/mcuconf.h
index 8dccb622c..803a90a29 100644
--- a/testhal/STM32F1xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F1xx/PWM-ICU/mcuconf.h
@@ -119,7 +119,7 @@
 #define STM32_ICU_USE_TIM1                  FALSE

 #define STM32_ICU_USE_TIM2                  FALSE

 #define STM32_ICU_USE_TIM3                  FALSE

-#define STM32_ICU_USE_TIM4                  FALSE

+#define STM32_ICU_USE_TIM4                  TRUE

 #define STM32_ICU_USE_TIM5                  FALSE

 #define STM32_ICU_USE_TIM8                  FALSE

 #define STM32_ICU_TIM1_IRQ_PRIORITY         7

@@ -132,8 +132,8 @@
 /*

  * PWM driver system settings.

  */

-#define STM32_PWM_USE_ADVANCED              FALSE

-#define STM32_PWM_USE_TIM1                  FALSE

+#define STM32_PWM_USE_ADVANCED              TRUE

+#define STM32_PWM_USE_TIM1                  TRUE

 #define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_USE_TIM4                  FALSE

diff --git a/testhal/STM32F1xx/RTC/mcuconf.h b/testhal/STM32F1xx/RTC/mcuconf.h
index 8dccb622c..699116d51 100644
--- a/testhal/STM32F1xx/RTC/mcuconf.h
+++ b/testhal/STM32F1xx/RTC/mcuconf.h
@@ -41,7 +41,7 @@
 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_LSI_ENABLED                   FALSE

 #define STM32_HSE_ENABLED                   TRUE

-#define STM32_LSE_ENABLED                   FALSE

+#define STM32_LSE_ENABLED                   TRUE

 #define STM32_SW                            STM32_SW_PLL

 #define STM32_PLLSRC                        STM32_PLLSRC_HSE

 #define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1

@@ -53,7 +53,7 @@
 #define STM32_USB_CLOCK_REQUIRED            TRUE

 #define STM32_USBPRE                        STM32_USBPRE_DIV1P5

 #define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK

-#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV

+#define STM32_RTCSEL                        STM32_RTCSEL_LSE

 #define STM32_PVD_ENABLE                    FALSE

 #define STM32_PLS                           STM32_PLS_LEV0

 

diff --git a/testhal/STM32F1xx/SDC/main.c b/testhal/STM32F1xx/SDC/main.c
index ec1300e6a..9d8c93d8b 100644
--- a/testhal/STM32F1xx/SDC/main.c
+++ b/testhal/STM32F1xx/SDC/main.c
@@ -28,7 +28,7 @@ static const SDCConfig sdccfg = {
   0

 };

 

-static uint8_t blkbuf[SDC_BLOCK_SIZE * 4 + 1];

+static uint8_t blkbuf[MMCSD_BLOCK_SIZE * 4 + 1];

 

 /*

  * Application entry point.

diff --git a/testhal/STM32F1xx/SDC/mcuconf.h b/testhal/STM32F1xx/SDC/mcuconf.h
index 8dccb622c..b3c48a3b2 100644
--- a/testhal/STM32F1xx/SDC/mcuconf.h
+++ b/testhal/STM32F1xx/SDC/mcuconf.h
@@ -155,7 +155,7 @@
  * SERIAL driver system settings.

  */

 #define STM32_SERIAL_USE_USART1             FALSE

-#define STM32_SERIAL_USE_USART2             FALSE

+#define STM32_SERIAL_USE_USART2             TRUE

 #define STM32_SERIAL_USE_USART3             FALSE

 #define STM32_SERIAL_USE_UART4              FALSE

 #define STM32_SERIAL_USE_UART5              FALSE

diff --git a/testhal/STM32F1xx/SPI/mcuconf.h b/testhal/STM32F1xx/SPI/mcuconf.h
index 8dccb622c..30c93e742 100644
--- a/testhal/STM32F1xx/SPI/mcuconf.h
+++ b/testhal/STM32F1xx/SPI/mcuconf.h
@@ -168,8 +168,8 @@
 /*

  * SPI driver system settings.

  */

-#define STM32_SPI_USE_SPI1                  FALSE

-#define STM32_SPI_USE_SPI2                  FALSE

+#define STM32_SPI_USE_SPI1                  TRUE

+#define STM32_SPI_USE_SPI2                  TRUE

 #define STM32_SPI_USE_SPI3                  FALSE

 #define STM32_SPI_SPI1_DMA_PRIORITY         1

 #define STM32_SPI_SPI2_DMA_PRIORITY         1

diff --git a/testhal/STM32F1xx/UART/mcuconf.h b/testhal/STM32F1xx/UART/mcuconf.h
index 8dccb622c..7df0ef00c 100644
--- a/testhal/STM32F1xx/UART/mcuconf.h
+++ b/testhal/STM32F1xx/UART/mcuconf.h
@@ -182,9 +182,9 @@
 /*

  * UART driver system settings.

  */

-#define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               FALSE

-#define STM32_UART_USE_USART3               FALSE

+#define STM32_UART_USE_USART1               TRUE

+#define STM32_UART_USE_USART2               TRUE

+#define STM32_UART_USE_USART3               TRUE

 #define STM32_UART_USART1_IRQ_PRIORITY      12

 #define STM32_UART_USART2_IRQ_PRIORITY      12

 #define STM32_UART_USART3_IRQ_PRIORITY      12

diff --git a/testhal/STM32F1xx/USB_CDC/mcuconf.h b/testhal/STM32F1xx/USB_CDC/mcuconf.h
index 8dccb622c..df4d3fa0c 100644
--- a/testhal/STM32F1xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32F1xx/USB_CDC/mcuconf.h
@@ -196,7 +196,7 @@
 /*

  * USB driver system settings.

  */

-#define STM32_USB_USE_USB1                  FALSE

+#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/testhal/STM32F1xx/USB_MSC/mcuconf.h b/testhal/STM32F1xx/USB_MSC/mcuconf.h
index c49fa23ba..aa0914d75 100644
--- a/testhal/STM32F1xx/USB_MSC/mcuconf.h
+++ b/testhal/STM32F1xx/USB_MSC/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,18 +159,16 @@
 #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                  FALSE

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

@@ -204,3 +200,4 @@
 #define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE

 #define STM32_USB_USB1_HP_IRQ_PRIORITY      13

 #define STM32_USB_USB1_LP_IRQ_PRIORITY      14

+