mbed official / mbed-dev

mbed library sources. Supersedes mbed-src.

Dependents:   Nucleo_Hello_Encoder BLE_iBeaconScan AM1805_DEMO DISCO-F429ZI_ExportTemplate1 ... more

Files at this revision

API Documentation at this revision

Revision 141:a2b798ec44f6, committed 2016-05-24

Comitter:
mbed_official
Date:
Tue May 24 13:30:14 2016 +0100
Parent:
140:6f18478c63fa
Child:
142:d6373279a6f1
Commit message:
Synchronized with git revision b32f7a9aaf404cba2342b4f3cf268c581046626b

Full URL: https://github.com/mbedmicro/mbed/commit/b32f7a9aaf404cba2342b4f3cf268c581046626b/

Changed in this revision

targets/cmsis/core_caFunc.h Show annotated file Show diff for this revision Revisions of this file
targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/serial_api.c Show annotated file Show diff for this revision Revisions of this file 
--- a/targets/cmsis/core_caFunc.h	Tue May 24 11:30:12 2016 +0100
+++ b/targets/cmsis/core_caFunc.h	Tue May 24 13:30:14 2016 +0100
@@ -811,6 +811,15 @@
 __STATIC_INLINE void __v7_inv_dcache_all(void) {
     __v7_all_cache(0);
 }
+/** \brief  Clean and Invalidate D$ by MVA
+
+    DCCIMVAC. Data cache clean and invalidate by MVA to PoC
+ */
+__STATIC_INLINE void __v7_clean_inv_dcache_mva(void *va) {
+    __MCR(15, 0, (uint32_t)va, 7, 14, 1);
+    __DMB();
+}
+
 #include "core_ca_mmu.h"
 
 #elif (defined (__GNUC__)) /*------------------ GNU Compiler ---------------------*/

--- a/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/serial_api.c	Tue May 24 11:30:12 2016 +0100
+++ b/targets/hal/TARGET_RENESAS/TARGET_RZ_A1H/serial_api.c	Tue May 24 13:30:14 2016 +0100
@@ -524,7 +524,11 @@
         }
         serial_rx_abort_asynch(obj);
         
+#if defined ( __ICCARM__ )
+        was_masked = __disable_irq_iar();
+#else
         was_masked = __disable_irq();
+#endif /* __ICCARM__ */
         if (obj->serial.uart->SCFSR & 0x93) {
             err_read = obj->serial.uart->SCFSR;
             obj->serial.uart->SCFSR = (err_read & ~0x93);