Board files regenerated with the updated tool. Fixed some errors in demos.

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

2 files changed, 160 insertions, 126 deletions

diff --git a/os/hal/boards/ST_STM32F072B_DISCOVERY/board.h b/os/hal/boards/ST_STM32F072B_DISCOVERY/board.h
index 72b475ee9..aa132cda2 100644
--- a/os/hal/boards/ST_STM32F072B_DISCOVERY/board.h
+++ b/os/hal/boards/ST_STM32F072B_DISCOVERY/board.h
@@ -33,13 +33,13 @@
  * NOTE: HSE not fitted.

  */

 #if !defined(STM32_LSECLK)

-#define STM32_LSECLK                0

+#define STM32_LSECLK                0U

 #endif

 

-#define STM32_LSEDRV                (3 << 3)

+#define STM32_LSEDRV                (3U << 3U)

 

 #if !defined(STM32_HSECLK)

-#define STM32_HSECLK                0

+#define STM32_HSECLK                0U

 #endif

 

 #define STM32_HSE_BYPASS

@@ -52,128 +52,128 @@
 /*

  * IO pins assignments.

  */

-#define GPIOA_BUTTON                0

-#define GPIOA_PIN1                  1

-#define GPIOA_PIN2                  2

-#define GPIOA_PIN3                  3

-#define GPIOA_PIN4                  4

-#define GPIOA_PIN5                  5

-#define GPIOA_PIN6                  6

-#define GPIOA_PIN7                  7

-#define GPIOA_PIN8                  8

-#define GPIOA_PIN9                  9

-#define GPIOA_PIN10                 10

-#define GPIOA_USB_DM                11

-#define GPIOA_USB_DP                12

-#define GPIOA_SWDIO                 13

-#define GPIOA_SWCLK                 14

-#define GPIOA_PIN15                 15

+#define GPIOA_BUTTON                0U

+#define GPIOA_PIN1                  1U

+#define GPIOA_PIN2                  2U

+#define GPIOA_PIN3                  3U

+#define GPIOA_PIN4                  4U

+#define GPIOA_PIN5                  5U

+#define GPIOA_PIN6                  6U

+#define GPIOA_PIN7                  7U

+#define GPIOA_PIN8                  8U

+#define GPIOA_PIN9                  9U

+#define GPIOA_PIN10                 10U

+#define GPIOA_USB_DM                11U

+#define GPIOA_USB_DP                12U

+#define GPIOA_SWDIO                 13U

+#define GPIOA_SWCLK                 14U

+#define GPIOA_PIN15                 15U

 

-#define GPIOB_PIN0                  0

-#define GPIOB_PIN1                  1

-#define GPIOB_PIN2                  2

-#define GPIOB_PIN3                  3

-#define GPIOB_PIN4                  4

-#define GPIOB_PIN5                  5

-#define GPIOB_PIN6                  6

-#define GPIOB_PIN7                  7

-#define GPIOB_PIN8                  8

-#define GPIOB_PIN9                  9

-#define GPIOB_PIN10                 10

-#define GPIOB_PIN11                 11

-#define GPIOB_PIN12                 12

-#define GPIOB_SPI2_SCK              13

-#define GPIOB_SPI2_MISO             14

-#define GPIOB_SPI2_MOSI             15

+#define GPIOB_PIN0                  0U

+#define GPIOB_PIN1                  1U

+#define GPIOB_PIN2                  2U

+#define GPIOB_PIN3                  3U

+#define GPIOB_PIN4                  4U

+#define GPIOB_PIN5                  5U

+#define GPIOB_PIN6                  6U

+#define GPIOB_PIN7                  7U

+#define GPIOB_PIN8                  8U

+#define GPIOB_PIN9                  9U

+#define GPIOB_PIN10                 10U

+#define GPIOB_PIN11                 11U

+#define GPIOB_PIN12                 12U

+#define GPIOB_SPI2_SCK              13U

+#define GPIOB_SPI2_MISO             14U

+#define GPIOB_SPI2_MOSI             15U

 

-#define GPIOC_MEMS_CS               0

-#define GPIOC_PIN1                  1

-#define GPIOC_PIN2                  2

-#define GPIOC_PIN3                  3

-#define GPIOC_PIN4                  4

-#define GPIOC_PIN5                  5

-#define GPIOC_LED_RED               6

-#define GPIOC_LED_BLUE              7

-#define GPIOC_LED_ORANGE            8

-#define GPIOC_LED_GREEN             9

-#define GPIOC_PIN10                 10

-#define GPIOC_PIN11                 11

-#define GPIOC_PIN12                 12

-#define GPIOC_PIN13                 13

-#define GPIOC_OSC32_IN              14

-#define GPIOC_OSC32_OUT             15

+#define GPIOC_MEMS_CS               0U

+#define GPIOC_PIN1                  1U

+#define GPIOC_PIN2                  2U

+#define GPIOC_PIN3                  3U

+#define GPIOC_PIN4                  4U

+#define GPIOC_PIN5                  5U

+#define GPIOC_LED_RED               6U

+#define GPIOC_LED_BLUE              7U

+#define GPIOC_LED_ORANGE            8U

+#define GPIOC_LED_GREEN             9U

+#define GPIOC_PIN10                 10U

+#define GPIOC_PIN11                 11U

+#define GPIOC_PIN12                 12U

+#define GPIOC_PIN13                 13U

+#define GPIOC_OSC32_IN              14U

+#define GPIOC_OSC32_OUT             15U

 

-#define GPIOD_PIN0                  0

-#define GPIOD_PIN1                  1

-#define GPIOD_PIN2                  2

-#define GPIOD_PIN3                  3

-#define GPIOD_PIN4                  4

-#define GPIOD_PIN5                  5

-#define GPIOD_PIN6                  6

-#define GPIOD_PIN7                  7

-#define GPIOD_PIN8                  8

-#define GPIOD_PIN9                  9

-#define GPIOD_PIN10                 10

-#define GPIOD_PIN11                 11

-#define GPIOD_PIN12                 12

-#define GPIOD_PIN13                 13

-#define GPIOD_PIN14                 14

-#define GPIOD_PIN15                 15

+#define GPIOD_PIN0                  0U

+#define GPIOD_PIN1                  1U

+#define GPIOD_PIN2                  2U

+#define GPIOD_PIN3                  3U

+#define GPIOD_PIN4                  4U

+#define GPIOD_PIN5                  5U

+#define GPIOD_PIN6                  6U

+#define GPIOD_PIN7                  7U

+#define GPIOD_PIN8                  8U

+#define GPIOD_PIN9                  9U

+#define GPIOD_PIN10                 10U

+#define GPIOD_PIN11                 11U

+#define GPIOD_PIN12                 12U

+#define GPIOD_PIN13                 13U

+#define GPIOD_PIN14                 14U

+#define GPIOD_PIN15                 15U

 

-#define GPIOE_PIN0                  0

-#define GPIOE_PIN1                  1

-#define GPIOE_PIN2                  2

-#define GPIOE_PIN3                  3

-#define GPIOE_PIN4                  4

-#define GPIOE_PIN5                  5

-#define GPIOE_PIN6                  6

-#define GPIOE_PIN7                  7

-#define GPIOE_PIN8                  8

-#define GPIOE_PIN9                  9

-#define GPIOE_PIN10                 10

-#define GPIOE_PIN11                 11

-#define GPIOE_PIN12                 12

-#define GPIOE_PIN13                 13

-#define GPIOE_PIN14                 14

-#define GPIOE_PIN15                 15

+#define GPIOE_PIN0                  0U

+#define GPIOE_PIN1                  1U

+#define GPIOE_PIN2                  2U

+#define GPIOE_PIN3                  3U

+#define GPIOE_PIN4                  4U

+#define GPIOE_PIN5                  5U

+#define GPIOE_PIN6                  6U

+#define GPIOE_PIN7                  7U

+#define GPIOE_PIN8                  8U

+#define GPIOE_PIN9                  9U

+#define GPIOE_PIN10                 10U

+#define GPIOE_PIN11                 11U

+#define GPIOE_PIN12                 12U

+#define GPIOE_PIN13                 13U

+#define GPIOE_PIN14                 14U

+#define GPIOE_PIN15                 15U

 

-#define GPIOF_OSC_IN                0

-#define GPIOF_OSC_OUT               1

-#define GPIOF_PIN2                  2

-#define GPIOF_PIN3                  3

-#define GPIOF_PIN4                  4

-#define GPIOF_PIN5                  5

-#define GPIOF_PIN6                  6

-#define GPIOF_PIN7                  7

-#define GPIOF_PIN8                  8

-#define GPIOF_PIN9                  9

-#define GPIOF_PIN10                 10

-#define GPIOF_PIN11                 11

-#define GPIOF_PIN12                 12

-#define GPIOF_PIN13                 13

-#define GPIOF_PIN14                 14

-#define GPIOF_PIN15                 15

+#define GPIOF_OSC_IN                0U

+#define GPIOF_OSC_OUT               1U

+#define GPIOF_PIN2                  2U

+#define GPIOF_PIN3                  3U

+#define GPIOF_PIN4                  4U

+#define GPIOF_PIN5                  5U

+#define GPIOF_PIN6                  6U

+#define GPIOF_PIN7                  7U

+#define GPIOF_PIN8                  8U

+#define GPIOF_PIN9                  9U

+#define GPIOF_PIN10                 10U

+#define GPIOF_PIN11                 11U

+#define GPIOF_PIN12                 12U

+#define GPIOF_PIN13                 13U

+#define GPIOF_PIN14                 14U

+#define GPIOF_PIN15                 15U

 

 /*

  * I/O ports initial setup, this configuration is established soon after reset

  * in the initialization code.

  * Please refer to the STM32 Reference Manual for details.

  */

-#define PIN_MODE_INPUT(n)           (0U << ((n) * 2))

-#define PIN_MODE_OUTPUT(n)          (1U << ((n) * 2))

-#define PIN_MODE_ALTERNATE(n)       (2U << ((n) * 2))

-#define PIN_MODE_ANALOG(n)          (3U << ((n) * 2))

+#define PIN_MODE_INPUT(n)           (0U << ((n) * 2U))

+#define PIN_MODE_OUTPUT(n)          (1U << ((n) * 2U))

+#define PIN_MODE_ALTERNATE(n)       (2U << ((n) * 2U))

+#define PIN_MODE_ANALOG(n)          (3U << ((n) * 2U))

 #define PIN_ODR_LOW(n)              (0U << (n))

 #define PIN_ODR_HIGH(n)             (1U << (n))

 #define PIN_OTYPE_PUSHPULL(n)       (0U << (n))

 #define PIN_OTYPE_OPENDRAIN(n)      (1U << (n))

-#define PIN_OSPEED_2M(n)            (0U << ((n) * 2))

-#define PIN_OSPEED_10M(n)           (1U << ((n) * 2))

-#define PIN_OSPEED_40M(n)           (3U << ((n) * 2))

-#define PIN_PUPDR_FLOATING(n)       (0U << ((n) * 2))

-#define PIN_PUPDR_PULLUP(n)         (1U << ((n) * 2))

-#define PIN_PUPDR_PULLDOWN(n)       (2U << ((n) * 2))

-#define PIN_AFIO_AF(n, v)           ((v##U) << (((n) % 8) * 4))

+#define PIN_OSPEED_2M(n)            (0U << ((n) * 2U))

+#define PIN_OSPEED_10M(n)           (1U << ((n) * 2U))

+#define PIN_OSPEED_40M(n)           (3U << ((n) * 2U))

+#define PIN_PUPDR_FLOATING(n)       (0U << ((n) * 2U))

+#define PIN_PUPDR_PULLUP(n)         (1U << ((n) * 2U))

+#define PIN_PUPDR_PULLDOWN(n)       (2U << ((n) * 2U))

+#define PIN_AFIO_AF(n, v)           ((v##U) << (((n) % 8U) * 4U))

 

 /*

  * GPIOA setup:

@@ -646,22 +646,22 @@
 /*

  * GPIOE setup:

  *

- * PF0  - PIN0                      (input pullup).

- * PF1  - PIN1                      (input pullup).

- * PF2  - PIN2                      (input pullup).

- * PF3  - PIN3                      (input pullup).

- * PF4  - PIN4                      (input pullup).

- * PF5  - PIN5                      (input pullup).

- * PF6  - PIN6                      (input pullup).

- * PF7  - PIN7                      (input pullup).

- * PF8  - PIN8                      (input pullup).

- * PF9  - PIN9                      (input pullup).

- * PF10 - PIN10                     (input pullup).

- * PF11 - PIN11                     (input pullup).

- * PF12 - PIN12                     (input pullup).

- * PF13 - PIN13                     (input pullup).

- * PF14 - PIN14                     (input pullup).

- * PF15 - PIN15                     (input pullup).

+ * PE0  - PIN0                      (input pullup).

+ * PE1  - PIN1                      (input pullup).

+ * PE2  - PIN2                      (input pullup).

+ * PE3  - PIN3                      (input pullup).

+ * PE4  - PIN4                      (input pullup).

+ * PE5  - PIN5                      (input pullup).

+ * PE6  - PIN6                      (input pullup).

+ * PE7  - PIN7                      (input pullup).

+ * PE8  - PIN8                      (input pullup).

+ * PE9  - PIN9                      (input pullup).

+ * PE10 - PIN10                     (input pullup).

+ * PE11 - PIN11                     (input pullup).

+ * PE12 - PIN12                     (input pullup).

+ * PE13 - PIN13                     (input pullup).

+ * PE14 - PIN14                     (input pullup).

+ * PE15 - PIN15                     (input pullup).

  */

 #define VAL_GPIOE_MODER             (PIN_MODE_INPUT(GPIOE_PIN0) |           \

                                      PIN_MODE_INPUT(GPIOE_PIN1) |           \

diff --git a/os/hal/boards/ST_STM32F072B_DISCOVERY/cfg/board.chcfg b/os/hal/boards/ST_STM32F072B_DISCOVERY/cfg/board.chcfg
index 7d46f3b63..9c7cf4fd7 100644
--- a/os/hal/boards/ST_STM32F072B_DISCOVERY/cfg/board.chcfg
+++ b/os/hal/boards/ST_STM32F072B_DISCOVERY/cfg/board.chcfg
@@ -535,6 +535,40 @@
         Mode="Input"
         Alternate="0" />
     </GPIOD>
+    <GPIOE>
+    	<pin0 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin1 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin2 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin3 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin4 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin5 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin6 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin7 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin8 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin9 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin10 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin11 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin12 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin13 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin14 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    	<pin15 ID="" Type="PushPull" Speed="Minimum" Resistor="PullUp"
+    		Level="High" Mode="Input" Alternate="0" />
+    </GPIOE>
     <GPIOF>
       <pin0
         ID="OSC_IN"