aboutsummaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorGiovanni Di Sirio <gdisirio@gmail.com>2015-10-29 09:20:28 +0000
committerGiovanni Di Sirio <gdisirio@gmail.com>2015-10-29 09:20:28 +0000
commit76574cac9a7d7f104a44ddb2c412e3d1a15ec62d (patch)
tree0ec277dce1635d4b165955165ee8a1a7f0f61067 /os
parent250ad338490952ad0f41c9e1529f7cfdeca49982 (diff)
downloadChibiOS-76574cac9a7d7f104a44ddb2c412e3d1a15ec62d.tar.gz
ChibiOS-76574cac9a7d7f104a44ddb2c412e3d1a15ec62d.tar.bz2
ChibiOS-76574cac9a7d7f104a44ddb2c412e3d1a15ec62d.zip
Fixed bug bug #652.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8404 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
-rw-r--r--os/hal/boards/ST_NUCLEO_F072RB/board.h124
-rw-r--r--os/hal/boards/ST_NUCLEO_F072RB/cfg/board.chcfg66
2 files changed, 95 insertions, 95 deletions
diff --git a/os/hal/boards/ST_NUCLEO_F072RB/board.h b/os/hal/boards/ST_NUCLEO_F072RB/board.h
index e61fb8bcc..c4c5c25f9 100644
--- a/os/hal/boards/ST_NUCLEO_F072RB/board.h
+++ b/os/hal/boards/ST_NUCLEO_F072RB/board.h
@@ -63,8 +63,8 @@
#define GPIOA_PIN8 8U
#define GPIOA_PIN9 9U
#define GPIOA_PIN10 10U
-#define GPIOA_USB_DM 11U
-#define GPIOA_USB_DP 12U
+#define GPIOA_PIN11 11U
+#define GPIOA_PIN12 12U
#define GPIOA_SWDIO 13U
#define GPIOA_SWCLK 14U
#define GPIOA_PIN15 15U
@@ -137,8 +137,8 @@
#define GPIOE_PIN14 14U
#define GPIOE_PIN15 15U
-#define GPIOF_OSC_IN 0U
-#define GPIOF_OSC_OUT 1U
+#define GPIOF_PIN0 0U
+#define GPIOF_PIN1 1U
#define GPIOF_PIN2 2U
#define GPIOF_PIN3 3U
#define GPIOF_PIN4 4U
@@ -189,8 +189,8 @@
* PA8 - PIN8 (input pullup).
* PA9 - PIN9 (input pullup).
* PA10 - PIN10 (input pullup).
- * PA11 - USB_DM (alternate 10).
- * PA12 - USB_DP (alternate 10).
+ * PA11 - PIN11 (input floating).
+ * PA12 - PIN12 (input floating).
* PA13 - SWDIO (alternate 0).
* PA14 - SWCLK (alternate 0).
* PA15 - PIN15 (input pullup).
@@ -206,8 +206,8 @@
PIN_MODE_INPUT(GPIOA_PIN8) | \
PIN_MODE_INPUT(GPIOA_PIN9) | \
PIN_MODE_INPUT(GPIOA_PIN10) | \
- PIN_MODE_ALTERNATE(GPIOA_USB_DM) | \
- PIN_MODE_ALTERNATE(GPIOA_USB_DP) | \
+ PIN_MODE_INPUT(GPIOA_PIN11) | \
+ PIN_MODE_INPUT(GPIOA_PIN12) | \
PIN_MODE_ALTERNATE(GPIOA_SWDIO) | \
PIN_MODE_ALTERNATE(GPIOA_SWCLK) | \
PIN_MODE_INPUT(GPIOA_PIN15))
@@ -222,8 +222,8 @@
PIN_OTYPE_PUSHPULL(GPIOA_PIN8) | \
PIN_OTYPE_PUSHPULL(GPIOA_PIN9) | \
PIN_OTYPE_PUSHPULL(GPIOA_PIN10) | \
- PIN_OTYPE_PUSHPULL(GPIOA_USB_DM) | \
- PIN_OTYPE_PUSHPULL(GPIOA_USB_DP) | \
+ PIN_OTYPE_PUSHPULL(GPIOA_PIN11) | \
+ PIN_OTYPE_PUSHPULL(GPIOA_PIN12) | \
PIN_OTYPE_PUSHPULL(GPIOA_SWDIO) | \
PIN_OTYPE_PUSHPULL(GPIOA_SWCLK) | \
PIN_OTYPE_PUSHPULL(GPIOA_PIN15))
@@ -238,8 +238,8 @@
PIN_OSPEED_40M(GPIOA_PIN8) | \
PIN_OSPEED_40M(GPIOA_PIN9) | \
PIN_OSPEED_40M(GPIOA_PIN10) | \
- PIN_OSPEED_40M(GPIOA_USB_DM) | \
- PIN_OSPEED_40M(GPIOA_USB_DP) | \
+ PIN_OSPEED_40M(GPIOA_PIN11) | \
+ PIN_OSPEED_40M(GPIOA_PIN12) | \
PIN_OSPEED_40M(GPIOA_SWDIO) | \
PIN_OSPEED_40M(GPIOA_SWCLK) | \
PIN_OSPEED_40M(GPIOA_PIN15))
@@ -254,8 +254,8 @@
PIN_PUPDR_PULLUP(GPIOA_PIN8) | \
PIN_PUPDR_PULLUP(GPIOA_PIN9) | \
PIN_PUPDR_PULLUP(GPIOA_PIN10) | \
- PIN_PUPDR_FLOATING(GPIOA_USB_DM) | \
- PIN_PUPDR_FLOATING(GPIOA_USB_DP) | \
+ PIN_PUPDR_FLOATING(GPIOA_PIN11) | \
+ PIN_PUPDR_FLOATING(GPIOA_PIN12) | \
PIN_PUPDR_PULLUP(GPIOA_SWDIO) | \
PIN_PUPDR_PULLDOWN(GPIOA_SWCLK) | \
PIN_PUPDR_PULLUP(GPIOA_PIN15))
@@ -270,8 +270,8 @@
PIN_ODR_HIGH(GPIOA_PIN8) | \
PIN_ODR_HIGH(GPIOA_PIN9) | \
PIN_ODR_HIGH(GPIOA_PIN10) | \
- PIN_ODR_HIGH(GPIOA_USB_DM) | \
- PIN_ODR_HIGH(GPIOA_USB_DP) | \
+ PIN_ODR_HIGH(GPIOA_PIN11) | \
+ PIN_ODR_HIGH(GPIOA_PIN12) | \
PIN_ODR_HIGH(GPIOA_SWDIO) | \
PIN_ODR_HIGH(GPIOA_SWCLK) | \
PIN_ODR_HIGH(GPIOA_PIN15))
@@ -286,8 +286,8 @@
#define VAL_GPIOA_AFRH (PIN_AFIO_AF(GPIOA_PIN8, 0) | \
PIN_AFIO_AF(GPIOA_PIN9, 0) | \
PIN_AFIO_AF(GPIOA_PIN10, 0) | \
- PIN_AFIO_AF(GPIOA_USB_DM, 10) | \
- PIN_AFIO_AF(GPIOA_USB_DP, 10) | \
+ PIN_AFIO_AF(GPIOA_PIN11, 0) | \
+ PIN_AFIO_AF(GPIOA_PIN12, 0) | \
PIN_AFIO_AF(GPIOA_SWDIO, 0) | \
PIN_AFIO_AF(GPIOA_SWCLK, 0) | \
PIN_AFIO_AF(GPIOA_PIN15, 0))
@@ -695,22 +695,22 @@
PIN_OTYPE_PUSHPULL(GPIOE_PIN13) | \
PIN_OTYPE_PUSHPULL(GPIOE_PIN14) | \
PIN_OTYPE_PUSHPULL(GPIOE_PIN15))
-#define VAL_GPIOE_OSPEEDR (PIN_OSPEED_2M(GPIOE_PIN0) | \
- PIN_OSPEED_2M(GPIOE_PIN1) | \
- PIN_OSPEED_2M(GPIOE_PIN2) | \
- PIN_OSPEED_2M(GPIOE_PIN3) | \
- PIN_OSPEED_2M(GPIOE_PIN4) | \
- PIN_OSPEED_2M(GPIOE_PIN5) | \
- PIN_OSPEED_2M(GPIOE_PIN6) | \
- PIN_OSPEED_2M(GPIOE_PIN7) | \
- PIN_OSPEED_2M(GPIOE_PIN8) | \
- PIN_OSPEED_2M(GPIOE_PIN9) | \
- PIN_OSPEED_2M(GPIOE_PIN10) | \
- PIN_OSPEED_2M(GPIOE_PIN11) | \
- PIN_OSPEED_2M(GPIOE_PIN12) | \
- PIN_OSPEED_2M(GPIOE_PIN13) | \
- PIN_OSPEED_2M(GPIOE_PIN14) | \
- PIN_OSPEED_2M(GPIOE_PIN15))
+#define VAL_GPIOE_OSPEEDR (PIN_OSPEED_40M(GPIOE_PIN0) | \
+ PIN_OSPEED_40M(GPIOE_PIN1) | \
+ PIN_OSPEED_40M(GPIOE_PIN2) | \
+ PIN_OSPEED_40M(GPIOE_PIN3) | \
+ PIN_OSPEED_40M(GPIOE_PIN4) | \
+ PIN_OSPEED_40M(GPIOE_PIN5) | \
+ PIN_OSPEED_40M(GPIOE_PIN6) | \
+ PIN_OSPEED_40M(GPIOE_PIN7) | \
+ PIN_OSPEED_40M(GPIOE_PIN8) | \
+ PIN_OSPEED_40M(GPIOE_PIN9) | \
+ PIN_OSPEED_40M(GPIOE_PIN10) | \
+ PIN_OSPEED_40M(GPIOE_PIN11) | \
+ PIN_OSPEED_40M(GPIOE_PIN12) | \
+ PIN_OSPEED_40M(GPIOE_PIN13) | \
+ PIN_OSPEED_40M(GPIOE_PIN14) | \
+ PIN_OSPEED_40M(GPIOE_PIN15))
#define VAL_GPIOE_PUPDR (PIN_PUPDR_PULLUP(GPIOE_PIN0) | \
PIN_PUPDR_PULLUP(GPIOE_PIN1) | \
PIN_PUPDR_PULLUP(GPIOE_PIN2) | \
@@ -763,8 +763,8 @@
/*
* GPIOF setup:
*
- * PF0 - OSC_IN (input floating).
- * PF1 - OSC_OUT (input floating).
+ * PF0 - PIN0 (input pullup).
+ * PF1 - PIN1 (input pullup).
* PF2 - PIN2 (input pullup).
* PF3 - PIN3 (input pullup).
* PF4 - PIN4 (input pullup).
@@ -780,8 +780,8 @@
* PF14 - PIN14 (input pullup).
* PF15 - PIN15 (input pullup).
*/
-#define VAL_GPIOF_MODER (PIN_MODE_INPUT(GPIOF_OSC_IN) | \
- PIN_MODE_INPUT(GPIOF_OSC_OUT) | \
+#define VAL_GPIOF_MODER (PIN_MODE_INPUT(GPIOF_PIN0) | \
+ PIN_MODE_INPUT(GPIOF_PIN1) | \
PIN_MODE_INPUT(GPIOF_PIN2) | \
PIN_MODE_INPUT(GPIOF_PIN3) | \
PIN_MODE_INPUT(GPIOF_PIN4) | \
@@ -796,8 +796,8 @@
PIN_MODE_INPUT(GPIOF_PIN13) | \
PIN_MODE_INPUT(GPIOF_PIN14) | \
PIN_MODE_INPUT(GPIOF_PIN15))
-#define VAL_GPIOF_OTYPER (PIN_OTYPE_PUSHPULL(GPIOF_OSC_IN) | \
- PIN_OTYPE_PUSHPULL(GPIOF_OSC_OUT) | \
+#define VAL_GPIOF_OTYPER (PIN_OTYPE_PUSHPULL(GPIOF_PIN0) | \
+ PIN_OTYPE_PUSHPULL(GPIOF_PIN1) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN2) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN3) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN4) | \
@@ -812,24 +812,24 @@
PIN_OTYPE_PUSHPULL(GPIOF_PIN13) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN14) | \
PIN_OTYPE_PUSHPULL(GPIOF_PIN15))
-#define VAL_GPIOF_OSPEEDR (PIN_OSPEED_2M(GPIOF_OSC_IN) | \
- PIN_OSPEED_2M(GPIOF_OSC_OUT) | \
- PIN_OSPEED_2M(GPIOF_PIN2) | \
- PIN_OSPEED_2M(GPIOF_PIN3) | \
- PIN_OSPEED_2M(GPIOF_PIN4) | \
- PIN_OSPEED_2M(GPIOF_PIN5) | \
- PIN_OSPEED_2M(GPIOF_PIN6) | \
- PIN_OSPEED_2M(GPIOF_PIN7) | \
- PIN_OSPEED_2M(GPIOF_PIN8) | \
- PIN_OSPEED_2M(GPIOF_PIN9) | \
- PIN_OSPEED_2M(GPIOF_PIN10) | \
- PIN_OSPEED_2M(GPIOF_PIN11) | \
- PIN_OSPEED_2M(GPIOF_PIN12) | \
- PIN_OSPEED_2M(GPIOF_PIN13) | \
- PIN_OSPEED_2M(GPIOF_PIN14) | \
- PIN_OSPEED_2M(GPIOF_PIN15))
-#define VAL_GPIOF_PUPDR (PIN_PUPDR_FLOATING(GPIOF_OSC_IN) | \
- PIN_PUPDR_FLOATING(GPIOF_OSC_OUT) | \
+#define VAL_GPIOF_OSPEEDR (PIN_OSPEED_40M(GPIOF_PIN0) | \
+ PIN_OSPEED_40M(GPIOF_PIN1) | \
+ PIN_OSPEED_40M(GPIOF_PIN2) | \
+ PIN_OSPEED_40M(GPIOF_PIN3) | \
+ PIN_OSPEED_40M(GPIOF_PIN4) | \
+ PIN_OSPEED_40M(GPIOF_PIN5) | \
+ PIN_OSPEED_40M(GPIOF_PIN6) | \
+ PIN_OSPEED_40M(GPIOF_PIN7) | \
+ PIN_OSPEED_40M(GPIOF_PIN8) | \
+ PIN_OSPEED_40M(GPIOF_PIN9) | \
+ PIN_OSPEED_40M(GPIOF_PIN10) | \
+ PIN_OSPEED_40M(GPIOF_PIN11) | \
+ PIN_OSPEED_40M(GPIOF_PIN12) | \
+ PIN_OSPEED_40M(GPIOF_PIN13) | \
+ PIN_OSPEED_40M(GPIOF_PIN14) | \
+ PIN_OSPEED_40M(GPIOF_PIN15))
+#define VAL_GPIOF_PUPDR (PIN_PUPDR_PULLUP(GPIOF_PIN0) | \
+ PIN_PUPDR_PULLUP(GPIOF_PIN1) | \
PIN_PUPDR_PULLUP(GPIOF_PIN2) | \
PIN_PUPDR_PULLUP(GPIOF_PIN3) | \
PIN_PUPDR_PULLUP(GPIOF_PIN4) | \
@@ -844,8 +844,8 @@
PIN_PUPDR_PULLUP(GPIOF_PIN13) | \
PIN_PUPDR_PULLUP(GPIOF_PIN14) | \
PIN_PUPDR_PULLUP(GPIOF_PIN15))
-#define VAL_GPIOF_ODR (PIN_ODR_HIGH(GPIOF_OSC_IN) | \
- PIN_ODR_HIGH(GPIOF_OSC_OUT) | \
+#define VAL_GPIOF_ODR (PIN_ODR_HIGH(GPIOF_PIN0) | \
+ PIN_ODR_HIGH(GPIOF_PIN1) | \
PIN_ODR_HIGH(GPIOF_PIN2) | \
PIN_ODR_HIGH(GPIOF_PIN3) | \
PIN_ODR_HIGH(GPIOF_PIN4) | \
@@ -860,8 +860,8 @@
PIN_ODR_HIGH(GPIOF_PIN13) | \
PIN_ODR_HIGH(GPIOF_PIN14) | \
PIN_ODR_HIGH(GPIOF_PIN15))
-#define VAL_GPIOF_AFRL (PIN_AFIO_AF(GPIOF_OSC_IN, 0) | \
- PIN_AFIO_AF(GPIOF_OSC_OUT, 0) | \
+#define VAL_GPIOF_AFRL (PIN_AFIO_AF(GPIOF_PIN0, 0) | \
+ PIN_AFIO_AF(GPIOF_PIN1, 0) | \
PIN_AFIO_AF(GPIOF_PIN2, 0) | \
PIN_AFIO_AF(GPIOF_PIN3, 0) | \
PIN_AFIO_AF(GPIOF_PIN4, 0) | \
diff --git a/os/hal/boards/ST_NUCLEO_F072RB/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO_F072RB/cfg/board.chcfg
index 3e0ef720d..c75910505 100644
--- a/os/hal/boards/ST_NUCLEO_F072RB/cfg/board.chcfg
+++ b/os/hal/boards/ST_NUCLEO_F072RB/cfg/board.chcfg
@@ -8,11 +8,11 @@
<output_path>..</output_path>
<hal_version>3.0.x</hal_version>
</configuration_settings>
- <board_name>STMicroelectronics NUCLEO-F091RC</board_name>
- <board_id>ST_NUCLEO_F091RC</board_id>
+ <board_name>STMicroelectronics NUCLEO-F072RB</board_name>
+ <board_id>ST_NUCLEO_F072RB</board_id>
<board_functions></board_functions>
- <subtype>STM32F091xC</subtype>
- <clocks HSEFrequency="0" HSEBypass="false" LSEFrequency="0"
+ <subtype>STM32F072xB</subtype>
+ <clocks HSEFrequency="0" HSEBypass="true" LSEFrequency="0"
LSEBypass="false" LSEDrive="3 High Drive (default)" />
<ports>
<GPIOA>
@@ -557,7 +557,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin3
@@ -573,7 +573,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
@@ -581,7 +581,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin6
@@ -589,7 +589,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin7
@@ -597,7 +597,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin8
@@ -605,7 +605,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
@@ -613,7 +613,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
@@ -621,7 +621,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin11
@@ -629,7 +629,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin12
@@ -637,7 +637,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin13
@@ -645,7 +645,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin14
@@ -653,7 +653,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin15
@@ -661,7 +661,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
</GPIOE>
@@ -671,7 +671,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin1
@@ -679,7 +679,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin2
@@ -687,7 +687,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin3
@@ -695,7 +695,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin4
@@ -703,7 +703,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin5
@@ -711,7 +711,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin6
@@ -719,7 +719,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin7
@@ -727,7 +727,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin8
@@ -735,7 +735,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin9
@@ -743,7 +743,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin10
@@ -751,7 +751,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin11
@@ -759,7 +759,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin12
@@ -767,7 +767,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin13
@@ -775,7 +775,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin14
@@ -783,7 +783,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
<pin15
@@ -791,7 +791,7 @@
Type="PushPull"
Level="High"
Speed="Maximum"
- Resistor="Floating"
+ Resistor="PullUp"
Mode="Input"
Alternate="0" />
</GPIOF>