Skip to content

Commit 935111f

Browse files
committed
Merge branch 'master_branch2' of https://github.com/TomoYamanaka/mbed into TomoYamanaka-master_branch2
2 parents 39fa25d + 829b422 commit 935111f

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

hal/targets/cmsis/core_caFunc.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,15 @@ __asm(
811811
__STATIC_INLINE void __v7_inv_dcache_all(void) {
812812
__v7_all_cache(0);
813813
}
814+
/** \brief Clean and Invalidate D$ by MVA
815+
816+
DCCIMVAC. Data cache clean and invalidate by MVA to PoC
817+
*/
818+
__STATIC_INLINE void __v7_clean_inv_dcache_mva(void *va) {
819+
__MCR(15, 0, (uint32_t)va, 7, 14, 1);
820+
__DMB();
821+
}
822+
814823
#include "core_ca_mmu.h"
815824

816825
#elif (defined (__GNUC__)) /*------------------ GNU Compiler ---------------------*/

hal/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/serial_api.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,11 @@ static void uart_err_irq(IRQn_Type irq_num, uint32_t index) {
524524
}
525525
serial_rx_abort_asynch(obj);
526526

527+
#if defined ( __ICCARM__ )
528+
was_masked = __disable_irq_iar();
529+
#else
527530
was_masked = __disable_irq();
531+
#endif /* __ICCARM__ */
528532
if (obj->serial.uart->SCFSR & 0x93) {
529533
err_read = obj->serial.uart->SCFSR;
530534
obj->serial.uart->SCFSR = (err_read & ~0x93);

0 commit comments

Comments
 (0)