cc1111: Wait for internal flash write to complete

[fw/altos] / src / cc1111 / ao_intflash.c

diff --git a/src/cc1111/ao_intflash.c b/src/cc1111/ao_intflash.c
index d76d954e16a071f2cf7f924fd8ac676964f0673e..eb3535c6933f4b42797a6ee0a5932858159a80ec 100644 (file)
--- a/src/cc1111/ao_intflash.c
+++ b/src/cc1111/ao_intflash.c
@@ -129,6 +129,8 @@ ao_intflash_write_aligned(uint16_t pos, __xdata void *d, uint16_t len) __reentra
                nop
                _endasm;
        }
+       __critical while (!ao_intflash_dma_done)
+                          ao_sleep(&ao_intflash_dma_done);
 }
 
 static void
@@ -180,7 +182,7 @@ ao_storage_device_read(uint32_t pos, __xdata void *d, uint16_t len) __reentrant
 {
        if (pos >= ao_storage_total || pos + len > ao_storage_total)
                return 0;
-       memcpy(d, ao_intflash+pos, len);
+       ao_xmemcpy(d, ao_intflash+pos, len);
        return 1;
 }