diff options
author | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-05-29 08:31:47 +0000 |
---|---|---|
committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2017-05-29 08:31:47 +0000 |
commit | 4838806bfec4edfa5f016e0c4fe6637cf3052a74 (patch) | |
tree | 2dc3c5b53a22be3057357904e8a624d175fb7d97 /os/hal/ports/STM32 | |
parent | 0a80e007b010a9b1546c6e19d0cf768d52f6650b (diff) | |
download | ChibiOS-4838806bfec4edfa5f016e0c4fe6637cf3052a74.tar.gz ChibiOS-4838806bfec4edfa5f016e0c4fe6637cf3052a74.tar.bz2 ChibiOS-4838806bfec4edfa5f016e0c4fe6637cf3052a74.zip |
Various fixes thanks to pl4nkton.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@10224 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/hal/ports/STM32')
-rw-r--r-- | os/hal/ports/STM32/LLD/SDMMCv1/hal_sdc_lld.c | 7 | ||||
-rw-r--r-- | os/hal/ports/STM32/STM32F4xx/stm32_registry.h | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/os/hal/ports/STM32/LLD/SDMMCv1/hal_sdc_lld.c b/os/hal/ports/STM32/LLD/SDMMCv1/hal_sdc_lld.c index 791be5750..6fd212d86 100644 --- a/os/hal/ports/STM32/LLD/SDMMCv1/hal_sdc_lld.c +++ b/os/hal/ports/STM32/LLD/SDMMCv1/hal_sdc_lld.c @@ -562,9 +562,10 @@ void sdc_lld_set_data_clk(SDCDriver *sdcp, sdcbusclk_t clk) { (void)clk;
#if STM32_SDC_SDMMC_PWRSAV
-#else
sdcp->sdmmc->CLKCR = (sdcp->sdmmc->CLKCR & 0xFFFFFF00U) | SDMMC_CLKDIV_HS |
SDMMC_CLKCR_PWRSAV;
+#else
+ sdcp->sdmmc->CLKCR = (sdcp->sdmmc->CLKCR & 0xFFFFFF00U) | SDMMC_CLKDIV_HS;
#endif
#endif
}
@@ -583,7 +584,7 @@ void sdc_lld_stop_clk(SDCDriver *sdcp) { }
/**
- * @brief Switches the bus to 4 bits mode.
+ * @brief Switches the bus to 1, 4 or 8 bits mode.
*
* @param[in] sdcp pointer to the @p SDCDriver object
* @param[in] mode bus mode
@@ -750,7 +751,7 @@ bool sdc_lld_read_special(SDCDriver *sdcp, uint8_t *buf, size_t bytes, uint8_t cmd, uint32_t arg) {
uint32_t resp[1];
- if(sdc_lld_prepare_read_bytes(sdcp, buf, bytes))
+ if (sdc_lld_prepare_read_bytes(sdcp, buf, bytes))
goto error;
if (sdc_lld_send_cmd_short_crc(sdcp, cmd, arg, resp)
diff --git a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h index f497dd143..8a54f2a21 100644 --- a/os/hal/ports/STM32/STM32F4xx/stm32_registry.h +++ b/os/hal/ports/STM32/STM32F4xx/stm32_registry.h @@ -769,7 +769,7 @@ /* USB attributes.*/
#define STM32_OTG_STEPPING 2
#define STM32_HAS_OTG1 TRUE
-#define STM32_OTG1_ENDPOINTS 6
+#define STM32_OTG1_ENDPOINTS 5
#define STM32_HAS_OTG2 TRUE
#define STM32_OTG2_ENDPOINTS 7
@@ -1464,7 +1464,7 @@ /* USB attributes.*/
#define STM32_OTG_STEPPING 1
#define STM32_HAS_OTG1 TRUE
-#define STM32_OTG1_ENDPOINTS 4
+#define STM32_OTG1_ENDPOINTS 3
#define STM32_HAS_OTG2 FALSE
#define STM32_HAS_USB FALSE
@@ -1759,7 +1759,7 @@ /* USB attributes.*/
#define STM32_OTG_STEPPING 1
#define STM32_HAS_OTG1 TRUE
-#define STM32_OTG1_ENDPOINTS 4
+#define STM32_OTG1_ENDPOINTS 3
#define STM32_HAS_OTG2 FALSE
#define STM32_HAS_USB FALSE
@@ -2665,7 +2665,7 @@ /* USB attributes.*/
#define STM32_OTG_STEPPING 1
#define STM32_HAS_OTG1 TRUE
-#define STM32_OTG1_ENDPOINTS 4
+#define STM32_OTG1_ENDPOINTS 3
#define STM32_HAS_OTG2 FALSE
#define STM32_HAS_USB FALSE
|