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

2 files changed, 92 insertions, 92 deletions

diff --git a/os/hal/boards/ST_NUCLEO_L476RG/board.h b/os/hal/boards/ST_NUCLEO_L476RG/board.h
index fc203aa73..f22f44c83 100644
--- a/os/hal/boards/ST_NUCLEO_L476RG/board.h
+++ b/os/hal/boards/ST_NUCLEO_L476RG/board.h
@@ -345,7 +345,7 @@
  * PB10 - PIN10                     (input pullup).

  * PB11 - PIN11                     (input pullup).

  * PB12 - PIN12                     (input pullup).

- * PB13 - PIN13                     (input floating).

+ * PB13 - PIN13                     (input pullup).

  * PB14 - PIN14                     (input pullup).

  * PB15 - PIN15                     (input pullup).

  */

@@ -410,7 +410,7 @@
                                      PIN_PUPDR_PULLUP(GPIOB_PIN10) |        \

                                      PIN_PUPDR_PULLUP(GPIOB_PIN11) |        \

                                      PIN_PUPDR_PULLUP(GPIOB_PIN12) |        \

-                                     PIN_PUPDR_FLOATING(GPIOB_PIN13) |      \

+                                     PIN_PUPDR_PULLUP(GPIOB_PIN13) |        \

                                      PIN_PUPDR_PULLUP(GPIOB_PIN14) |        \

                                      PIN_PUPDR_PULLUP(GPIOB_PIN15))

 #define VAL_GPIOB_ODR               (PIN_ODR_HIGH(GPIOB_PIN0) |             \

@@ -685,20 +685,20 @@
  *

  * PE0  - PIN0                      (input pullup).

  * PE1  - PIN1                      (input pullup).

- * PE2  - PIN2                      (input floating).

+ * PE2  - PIN2                      (input pullup).

  * PE3  - PIN3                      (input pullup).

- * PE4  - PIN4                      (input floating).

- * PE5  - PIN5                      (input floating).

- * PE6  - PIN6                      (input floating).

- * PE7  - PIN7                      (input floating).

- * PE8  - PIN8                      (input floating).

- * PE9  - PIN9                      (input floating).

- * PE10 - PIN10                     (input floating).

- * PE11 - PIN11                     (input floating).

- * PE12 - PIN12                     (input floating).

- * PE13 - PIN13                     (input floating).

- * PE14 - PIN14                     (input floating).

- * PE15 - PIN15                     (input floating).

+ * 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) |           \

@@ -750,20 +750,20 @@
                                      PIN_OSPEED_HS(GPIOE_PIN15))

 #define VAL_GPIOE_PUPDR             (PIN_PUPDR_PULLUP(GPIOE_PIN0) |         \

                                      PIN_PUPDR_PULLUP(GPIOE_PIN1) |         \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN2) |       \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN2) |         \

                                      PIN_PUPDR_PULLUP(GPIOE_PIN3) |         \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN4) |       \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN5) |       \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN6) |       \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN7) |       \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN8) |       \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN9) |       \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN10) |      \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN11) |      \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN12) |      \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN13) |      \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN14) |      \

-                                     PIN_PUPDR_FLOATING(GPIOE_PIN15))

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN4) |         \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN5) |         \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN6) |         \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN7) |         \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN8) |         \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN9) |         \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN10) |        \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN11) |        \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN12) |        \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN13) |        \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN14) |        \

+                                     PIN_PUPDR_PULLUP(GPIOE_PIN15))

 #define VAL_GPIOE_ODR               (PIN_ODR_HIGH(GPIOE_PIN0) |             \

                                      PIN_ODR_HIGH(GPIOE_PIN1) |             \

                                      PIN_ODR_HIGH(GPIOE_PIN2) |             \

@@ -800,22 +800,22 @@
 /*

  * GPIOF setup:

  *

- * PF0  - PIN0                      (input floating).

- * PF1  - PIN1                      (input floating).

- * PF2  - PIN2                      (input floating).

- * PF3  - PIN3                      (input floating).

- * PF4  - PIN4                      (input floating).

- * PF5  - PIN5                      (input floating).

- * PF6  - PIN6                      (input floating).

- * PF7  - PIN7                      (input floating).

- * PF8  - PIN8                      (input floating).

- * PF9  - PIN9                      (input floating).

- * PF10 - PIN10                     (input floating).

- * PF11 - PIN11                     (input floating).

- * PF12 - PIN12                     (input floating).

- * PF13 - PIN13                     (input floating).

- * PF14 - PIN14                     (input floating).

- * PF15 - PIN15                     (input floating).

+ * 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).

  */

 #define VAL_GPIOF_MODER             (PIN_MODE_INPUT(GPIOF_PIN0) |           \

                                      PIN_MODE_INPUT(GPIOF_PIN1) |           \

@@ -865,22 +865,22 @@
                                      PIN_OSPEED_HS(GPIOF_PIN13) |           \

                                      PIN_OSPEED_HS(GPIOF_PIN14) |           \

                                      PIN_OSPEED_HS(GPIOF_PIN15))

-#define VAL_GPIOF_PUPDR             (PIN_PUPDR_FLOATING(GPIOF_PIN0) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN1) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN2) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN3) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN4) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN5) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN6) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN7) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN8) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN9) |       \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN10) |      \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN11) |      \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN12) |      \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN13) |      \

-                                     PIN_PUPDR_FLOATING(GPIOF_PIN14) |      \

-                                     PIN_PUPDR_FLOATING(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) |         \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN5) |         \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN6) |         \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN7) |         \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN8) |         \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN9) |         \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN10) |        \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN11) |        \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN12) |        \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN13) |        \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN14) |        \

+                                     PIN_PUPDR_PULLUP(GPIOF_PIN15))

 #define VAL_GPIOF_ODR               (PIN_ODR_HIGH(GPIOF_PIN0) |             \

                                      PIN_ODR_HIGH(GPIOF_PIN1) |             \

                                      PIN_ODR_HIGH(GPIOF_PIN2) |             \

diff --git a/os/hal/boards/ST_NUCLEO_L476RG/cfg/board.chcfg b/os/hal/boards/ST_NUCLEO_L476RG/cfg/board.chcfg
index 4c4b3927d..0e6feb232 100644
--- a/os/hal/boards/ST_NUCLEO_L476RG/cfg/board.chcfg
+++ b/os/hal/boards/ST_NUCLEO_L476RG/cfg/board.chcfg
@@ -52,7 +52,7 @@
         Speed="High"
         Resistor="Floating"
         Mode="Alternate"
-        Alternate="7" ></pin3>
+        Alternate="7" />
       <pin4
         ID=""
         Type="PushPull"
@@ -260,7 +260,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin14
@@ -562,7 +562,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin3
@@ -578,7 +578,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin5
@@ -586,7 +586,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin6
@@ -594,7 +594,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin7
@@ -602,7 +602,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin8
@@ -610,7 +610,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin9
@@ -618,7 +618,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin10
@@ -626,7 +626,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin11
@@ -634,7 +634,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin12
@@ -642,7 +642,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin13
@@ -650,7 +650,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin14
@@ -658,7 +658,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin15
@@ -666,7 +666,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
     </GPIOE>
@@ -676,7 +676,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin1
@@ -684,7 +684,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin2
@@ -692,7 +692,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin3
@@ -700,7 +700,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin4
@@ -708,7 +708,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin5
@@ -716,7 +716,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin6
@@ -724,7 +724,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin7
@@ -732,7 +732,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin8
@@ -740,7 +740,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin9
@@ -748,7 +748,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin10
@@ -756,7 +756,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin11
@@ -764,7 +764,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin12
@@ -772,7 +772,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin13
@@ -780,7 +780,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin14
@@ -788,7 +788,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
       <pin15
@@ -796,7 +796,7 @@
         Type="PushPull"
         Level="High"
         Speed="Maximum"
-        Resistor="Floating"
+        Resistor="PullUp"
         Mode="Input"
         Alternate="0" />
     </GPIOF>
@@ -938,7 +938,7 @@
         Resistor="Floating"
         Level="High"
         Mode="Input"
-        Alternate="0"></pin0>
+        Alternate="0" />
       <pin1
         ID="OSC_OUT"
         Type="PushPull"