Updated all the STM32F4 mcuconf files because the new OTG options.

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

15 files changed, 30 insertions, 30 deletions

diff --git a/testhal/STM32F4xx/ADC/mcuconf.h b/testhal/STM32F4xx/ADC/mcuconf.h
index ff15bd841..c3a562831 100644
--- a/testhal/STM32F4xx/ADC/mcuconf.h
+++ b/testhal/STM32F4xx/ADC/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/CAN/mcuconf.h b/testhal/STM32F4xx/CAN/mcuconf.h
index 00914281e..2d1b89aef 100644
--- a/testhal/STM32F4xx/CAN/mcuconf.h
+++ b/testhal/STM32F4xx/CAN/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/DMA_STORM/mcuconf.h b/testhal/STM32F4xx/DMA_STORM/mcuconf.h
index b07c081ac..8e47cd7d1 100644
--- a/testhal/STM32F4xx/DMA_STORM/mcuconf.h
+++ b/testhal/STM32F4xx/DMA_STORM/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/EXT/mcuconf.h b/testhal/STM32F4xx/EXT/mcuconf.h
index 000d8de64..0c981ddfe 100644
--- a/testhal/STM32F4xx/EXT/mcuconf.h
+++ b/testhal/STM32F4xx/EXT/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/GPT/mcuconf.h b/testhal/STM32F4xx/GPT/mcuconf.h
index 5f376d699..d117c0814 100644
--- a/testhal/STM32F4xx/GPT/mcuconf.h
+++ b/testhal/STM32F4xx/GPT/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/I2C/mcuconf.h b/testhal/STM32F4xx/I2C/mcuconf.h
index 6dab22170..1f2443e62 100644
--- a/testhal/STM32F4xx/I2C/mcuconf.h
+++ b/testhal/STM32F4xx/I2C/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/IRQ_STORM/mcuconf.h b/testhal/STM32F4xx/IRQ_STORM/mcuconf.h
index 105ed9729..4d30f70ab 100644
--- a/testhal/STM32F4xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F4xx/IRQ_STORM/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h b/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
index 105ed9729..4d30f70ab 100644
--- a/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
+++ b/testhal/STM32F4xx/IRQ_STORM_FPU/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/PWM-ICU/mcuconf.h b/testhal/STM32F4xx/PWM-ICU/mcuconf.h
index 99b538196..8688e3b7c 100644
--- a/testhal/STM32F4xx/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F4xx/PWM-ICU/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/RTC/mcuconf.h b/testhal/STM32F4xx/RTC/mcuconf.h
index a54957846..8dd921914 100644
--- a/testhal/STM32F4xx/RTC/mcuconf.h
+++ b/testhal/STM32F4xx/RTC/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/RTC_FATTIME/mcuconf.h b/testhal/STM32F4xx/RTC_FATTIME/mcuconf.h
index 6be4d2d05..3a1d4f8b8 100755
--- a/testhal/STM32F4xx/RTC_FATTIME/mcuconf.h
+++ b/testhal/STM32F4xx/RTC_FATTIME/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/SDC/mcuconf.h b/testhal/STM32F4xx/SDC/mcuconf.h
index 6be4d2d05..3a1d4f8b8 100755
--- a/testhal/STM32F4xx/SDC/mcuconf.h
+++ b/testhal/STM32F4xx/SDC/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/SPI/mcuconf.h b/testhal/STM32F4xx/SPI/mcuconf.h
index f1bdcdec5..2adc85048 100644
--- a/testhal/STM32F4xx/SPI/mcuconf.h
+++ b/testhal/STM32F4xx/SPI/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/UART/mcuconf.h b/testhal/STM32F4xx/UART/mcuconf.h
index f4fe852cc..2adabddfb 100644
--- a/testhal/STM32F4xx/UART/mcuconf.h
+++ b/testhal/STM32F4xx/UART/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  FALSE

 #define STM32_USB_USE_OTG2                  FALSE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-

diff --git a/testhal/STM32F4xx/USB_CDC/mcuconf.h b/testhal/STM32F4xx/USB_CDC/mcuconf.h
index fe3119b44..01472db80 100644
--- a/testhal/STM32F4xx/USB_CDC/mcuconf.h
+++ b/testhal/STM32F4xx/USB_CDC/mcuconf.h
@@ -257,6 +257,8 @@
  */

 #define STM32_USB_USE_OTG1                  TRUE

 #define STM32_USB_USE_OTG2                  TRUE

+#define STM32_USE_USB_OTG2_HS               FALSE

+#define STM32_USE_USB_OTG2_ULPI             FALSE

 #define STM32_USB_OTG1_IRQ_PRIORITY         14

 #define STM32_USB_OTG2_IRQ_PRIORITY         14

 #define STM32_USB_OTG1_RX_FIFO_SIZE         512

@@ -264,5 +266,3 @@
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO

 #define STM32_USB_OTG_THREAD_STACK_SIZE     128

 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

-

-