diff --git a/os/hal/ports/STM32/LLD/RTCv2/hal_rtc_lld.c b/os/hal/ports/STM32/LLD/RTCv2/hal_rtc_lld.c index aa8bb5e8b..3c0632ce2 100644 --- a/os/hal/ports/STM32/LLD/RTCv2/hal_rtc_lld.c +++ b/os/hal/ports/STM32/LLD/RTCv2/hal_rtc_lld.c @@ -212,10 +212,10 @@ static ps_error_t _read(void *instance, ps_offset_t offset, volatile uint32_t *bkpr = &((RTCDriver *)instance)->rtc->BKP0R; unsigned i; - chDbgCheck((instance != NULL) && (rp != NULL)); - chDbgCheck((n > 0U) && (n <= STM32_RTC_STORAGE_SIZE)); - chDbgCheck((offset < STM32_RTC_STORAGE_SIZE) && - (offset + n <= STM32_RTC_STORAGE_SIZE)); + osalDbgCheck((instance != NULL) && (rp != NULL)); + osalDbgCheck((n > 0U) && (n <= STM32_RTC_STORAGE_SIZE)); + osalDbgCheck((offset < STM32_RTC_STORAGE_SIZE) && + (offset + n <= STM32_RTC_STORAGE_SIZE)); for (i = 0; i < (unsigned)n; i++) { unsigned index = ((unsigned)offset + i) / sizeof (uint32_t); @@ -231,10 +231,10 @@ static ps_error_t _write(void *instance, ps_offset_t offset, volatile uint32_t *bkpr = &((RTCDriver *)instance)->rtc->BKP0R; unsigned i; - chDbgCheck((instance != NULL) && (wp != NULL)); - chDbgCheck((n > 0U) && (n <= STM32_RTC_STORAGE_SIZE)); - chDbgCheck((offset < STM32_RTC_STORAGE_SIZE) && - (offset + n <= STM32_RTC_STORAGE_SIZE)); + osalDbgCheck((instance != NULL) && (wp != NULL)); + osalDbgCheck((n > 0U) && (n <= STM32_RTC_STORAGE_SIZE)); + osalDbgCheck((offset < STM32_RTC_STORAGE_SIZE) && + (offset + n <= STM32_RTC_STORAGE_SIZE)); for (i = 0; i < (unsigned)n; i++) { unsigned index = ((unsigned)offset + i) / sizeof (uint32_t); diff --git a/os/hal/ports/STM32/LLD/RTCv3/hal_rtc_lld.c b/os/hal/ports/STM32/LLD/RTCv3/hal_rtc_lld.c index ecc822951..10768add2 100644 --- a/os/hal/ports/STM32/LLD/RTCv3/hal_rtc_lld.c +++ b/os/hal/ports/STM32/LLD/RTCv3/hal_rtc_lld.c @@ -212,10 +212,10 @@ static ps_error_t _read(void *instance, ps_offset_t offset, volatile uint32_t *bkpr = &((RTCDriver *)instance)->tamp->BKP0R; unsigned i; - chDbgCheck((instance != NULL) && (rp != NULL)); - chDbgCheck((n > 0U) && (n <= STM32_RTC_STORAGE_SIZE)); - chDbgCheck((offset < STM32_RTC_STORAGE_SIZE) && - (offset + n <= STM32_RTC_STORAGE_SIZE)); + osalDbgCheck((instance != NULL) && (rp != NULL)); + osalDbgCheck((n > 0U) && (n <= STM32_RTC_STORAGE_SIZE)); + osalDbgCheck((offset < STM32_RTC_STORAGE_SIZE) && + (offset + n <= STM32_RTC_STORAGE_SIZE)); for (i = 0; i < (unsigned)n; i++) { unsigned index = ((unsigned)offset + i) / sizeof (uint32_t); @@ -231,10 +231,10 @@ static ps_error_t _write(void *instance, ps_offset_t offset, volatile uint32_t *bkpr = &((RTCDriver *)instance)->tamp->BKP0R; unsigned i; - chDbgCheck((instance != NULL) && (wp != NULL)); - chDbgCheck((n > 0U) && (n <= STM32_RTC_STORAGE_SIZE)); - chDbgCheck((offset < STM32_RTC_STORAGE_SIZE) && - (offset + n <= STM32_RTC_STORAGE_SIZE)); + osalDbgCheck((instance != NULL) && (wp != NULL)); + osalDbgCheck((n > 0U) && (n <= STM32_RTC_STORAGE_SIZE)); + osalDbgCheck((offset < STM32_RTC_STORAGE_SIZE) && + (offset + n <= STM32_RTC_STORAGE_SIZE)); for (i = 0; i < (unsigned)n; i++) { unsigned index = ((unsigned)offset + i) / sizeof (uint32_t); diff --git a/readme.txt b/readme.txt index 887e3bbac..1ddbff25f 100644 --- a/readme.txt +++ b/readme.txt @@ -77,11 +77,14 @@ - NEW: EFL driver and demo for STM32F3xx. - NEW: New unit test subsystem under /os/test. Now it is officially ChibiOS/TEST. +- FIX: Fixed direct calls to RT in STM32 RTCv2 and RTCv3 (bug #1179) + (TBP)(backported to 20.3.4). - FIX: Fixed STM32G071 mcuconf.h template not showing TIM14/15/16/17 (bug #1178)(TBP). - FIX: Fixed path ambiguity between STM32 USARTv2 and USARTv3 drivers (bug #1177)(TBP). -- FIX: Fixed invalid DMAMUX settings in DMAv1 for some devices (bug #1176)(TBP). +- FIX: Fixed invalid DMAMUX settings in DMAv1 for some devices (bug #1176) + (TBP)(backported to 20.3.4). - FIX: Fixed wrong macro in the demo STM32F7xx-SPI-ADXL355 (bug #1175) (backported to 21.6.1). - FIX: Fixed problem with RC initialization mask of the GPIO for the