From b52fe6b5480ec8fdef388ca2273b038e3d2b334c Mon Sep 17 00:00:00 2001
From: Manuel Coenen <manuel@duet3d.com>
Date: Tue, 19 Jan 2021 16:09:51 +0100
Subject: Restore compilability for SAM4E/4S builds

---
 src/Hardware/NonVolatileMemory.cpp | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src/Hardware/NonVolatileMemory.cpp')

diff --git a/src/Hardware/NonVolatileMemory.cpp b/src/Hardware/NonVolatileMemory.cpp
index 45aee49e..e0ef6d85 100644
--- a/src/Hardware/NonVolatileMemory.cpp
+++ b/src/Hardware/NonVolatileMemory.cpp
@@ -27,7 +27,11 @@ void NonVolatileMemory::EnsureRead() noexcept
 # error		//TODO
 #elif SAM4E || SAM4S || SAME70
 		const bool cacheEnabled = Cache::Disable();
+# if SAME70
 		Flash::ReadUserSignature(reinterpret_cast<uint32_t*>(&buffer), sizeof(buffer)/sizeof(uint32_t));
+# else
+		flash_read_user_signature(reinterpret_cast<uint32_t*>(&buffer), sizeof(buffer)/sizeof(uint32_t));
+# endif
 		if (cacheEnabled)
 		{
 			Cache::Enable();
@@ -66,7 +70,11 @@ void NonVolatileMemory::EnsureWritten() noexcept
 	{
 		// Erase the page
 # if SAM4E || SAM4S || SAME70
+#  if SAME70
 		Flash::EraseUserSignature();
+#  else
+		flash_erase_user_signature();
+#  endif
 # elif defined(__LPC17xx__)
 		LPC_EraseSoftwareResetDataSlots();	// erase the last flash sector
 # endif
@@ -77,7 +85,11 @@ void NonVolatileMemory::EnsureWritten() noexcept
 	{
 # if SAM4E || SAM4S || SAME70
 		const bool cacheEnabled = Cache::Disable();
+#  if SAME70
 		Flash::WriteUserSignature(reinterpret_cast<const uint32_t*>(&buffer));
+#  else
+		flash_write_user_signature(reinterpret_cast<const uint32_t*>(&buffer));
+#  endif
 		if (cacheEnabled)
 		{
 			Cache::Enable();
-- 
cgit v1.2.3