diff options
Diffstat (limited to 'os')
-rw-r--r-- | os/hal/boards/OLIMEX_STM32_E407/board.c | 10 | ||||
-rw-r--r-- | os/hal/boards/OLIMEX_STM32_E407/board.h | 3 | ||||
-rw-r--r-- | os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg | 9 | ||||
-rw-r--r-- | os/hal/boards/OLIMEX_STM32_H407/board.c | 12 | ||||
-rw-r--r-- | os/hal/boards/OLIMEX_STM32_H407/board.h | 1 | ||||
-rw-r--r-- | os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg | 9 | ||||
-rw-r--r-- | os/hal/boards/ST_STM32F429I_DISCOVERY/board.h | 1 | ||||
-rw-r--r-- | os/hal/boards/ST_STM32F4_DISCOVERY/board.h | 1 | ||||
-rw-r--r-- | os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg | 8 |
9 files changed, 31 insertions, 23 deletions
diff --git a/os/hal/boards/OLIMEX_STM32_E407/board.c b/os/hal/boards/OLIMEX_STM32_E407/board.c index 24302cfd6..2e219171f 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/board.c +++ b/os/hal/boards/OLIMEX_STM32_E407/board.c @@ -61,9 +61,9 @@ void __early_init(void) { */
bool sdc_lld_is_card_inserted(SDCDriver *sdcp) {
static bool last_status = FALSE;
-
- if (blkIsTransferring(sdcp))
- return last_status;
+ + if (blkIsTransferring(sdcp)) + return last_status; return last_status = (bool)palReadPad(GPIOC, GPIOC_SD_D3);
}
@@ -71,8 +71,8 @@ bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { * @brief SDC card write protection detection.
*/
bool sdc_lld_is_write_protected(SDCDriver *sdcp) {
-
- (void)sdcp;
+ + (void)sdcp; return FALSE;
}
#endif /* HAL_USE_SDC */
diff --git a/os/hal/boards/OLIMEX_STM32_E407/board.h b/os/hal/boards/OLIMEX_STM32_E407/board.h index fa326a08c..a9a046a81 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/board.h +++ b/os/hal/boards/OLIMEX_STM32_E407/board.h @@ -44,7 +44,6 @@ #define STM32_HSECLK 12000000
#endif
-
/*
* Board voltages.
* Required for performance limits calculation.
@@ -54,7 +53,7 @@ /*
* MCU type as defined in the ST header.
*/
-#define STM32F401xx
+#define STM32F40_41xxx
/*
* IO pins assignments.
diff --git a/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg b/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg index f55bd1471..ff3ab4e3d 100644 --- a/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg +++ b/os/hal/boards/OLIMEX_STM32_E407/cfg/board.chcfg @@ -23,8 +23,13 @@ <bus_type>RMII</bus_type>
</ethernet_phy>
<subtype>STM32F40_41xxx</subtype>
- <clocks HSEFrequency="12000000" HSEBypass="false" LSEFrequency="32768"
- VDD="330" />
+ <clocks
+ HSEFrequency="12000000"
+ HSEBypass="false"
+ LSEFrequency="32768"
+ LSEBypass="false"
+ VDD="330"
+ />
<ports>
<GPIOA>
<pin0 ID="BUTTON_WKUP" Type="PushPull" Speed="Maximum" Resistor="Floating"
diff --git a/os/hal/boards/OLIMEX_STM32_H407/board.c b/os/hal/boards/OLIMEX_STM32_H407/board.c index 8f24f8bc3..989888ac0 100644 --- a/os/hal/boards/OLIMEX_STM32_H407/board.c +++ b/os/hal/boards/OLIMEX_STM32_H407/board.c @@ -60,10 +60,10 @@ void __early_init(void) { * @brief SDC card detection.
*/
bool sdc_lld_is_card_inserted(SDCDriver *sdcp) {
- static bool_t last_status = FALSE; - - if (blkIsTransferring(sdcp)) - return last_status; + static bool_t last_status = FALSE;
+
+ if (blkIsTransferring(sdcp))
+ return last_status;
return last_status = (bool_t)palReadPad(GPIOC, GPIOC_SD_D3);
}
@@ -71,8 +71,8 @@ bool sdc_lld_is_card_inserted(SDCDriver *sdcp) { * @brief SDC card write protection detection.
*/
bool sdc_lld_is_write_protected(SDCDriver *sdcp) {
- - (void)sdcp; +
+ (void)sdcp;
return FALSE;
}
#endif /* HAL_USE_SDC */
diff --git a/os/hal/boards/OLIMEX_STM32_H407/board.h b/os/hal/boards/OLIMEX_STM32_H407/board.h index 37879aa5e..ea7734a14 100644 --- a/os/hal/boards/OLIMEX_STM32_H407/board.h +++ b/os/hal/boards/OLIMEX_STM32_H407/board.h @@ -44,7 +44,6 @@ #define STM32_HSECLK 12000000
#endif
-
/*
* Board voltages.
* Required for performance limits calculation.
diff --git a/os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg b/os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg index edf298a2e..8b4cda0b9 100644 --- a/os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg +++ b/os/hal/boards/OLIMEX_STM32_H407/cfg/board.chcfg @@ -23,8 +23,13 @@ <bus_type>RMII</bus_type>
</ethernet_phy>
<subtype>STM32F40_41xxx</subtype>
- <clocks HSEFrequency="12000000" HSEBypass="false" LSEFrequency="32768"
- VDD="330" />
+ <clocks
+ HSEFrequency="12000000"
+ HSEBypass="false"
+ LSEFrequency="32768"
+ LSEBypass="false"
+ VDD="330"
+ />
<ports>
<GPIOA>
<pin0 ID="BUTTON_WKUP" Type="PushPull" Speed="Maximum" Resistor="Floating"
diff --git a/os/hal/boards/ST_STM32F429I_DISCOVERY/board.h b/os/hal/boards/ST_STM32F429I_DISCOVERY/board.h index b8191e6f7..cde9cdf82 100644 --- a/os/hal/boards/ST_STM32F429I_DISCOVERY/board.h +++ b/os/hal/boards/ST_STM32F429I_DISCOVERY/board.h @@ -40,7 +40,6 @@ #define STM32_HSECLK 8000000
#endif
-
/*
* Board voltages.
* Required for performance limits calculation.
diff --git a/os/hal/boards/ST_STM32F4_DISCOVERY/board.h b/os/hal/boards/ST_STM32F4_DISCOVERY/board.h index c807c1611..900416353 100644 --- a/os/hal/boards/ST_STM32F4_DISCOVERY/board.h +++ b/os/hal/boards/ST_STM32F4_DISCOVERY/board.h @@ -40,7 +40,6 @@ #define STM32_HSECLK 8000000
#endif
-
/*
* Board voltages.
* Required for performance limits calculation.
diff --git a/os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg b/os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg index b42e09289..b0c6406f7 100644 --- a/os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg +++ b/os/hal/boards/ST_STM32L_DISCOVERY/cfg/board.chcfg @@ -11,9 +11,11 @@ <board_id>ST_STM32L_DISCOVERY</board_id> <board_functions></board_functions> <clocks - HSEFrequency="0" - HSEBypass="true" - LSEFrequency="32768" /> + HSEFrequency="0" + HSEBypass="true" + LSEFrequency="32768" + LSEBypass="false" + /> <ports> <GPIOA> <pin0 |