Added support for the SAMD51. Rewrote most of the D21 support since the

existing code was not working.  Refactored the flash options to defer
writing them until an explicit write is called which avoids writing the
same user page over and over for the D21 and D51.

Author: shumatech

README.md

@@ -22,10 +22,15 @@ Supported Device Families
  * SAM4E
  * SAM4S
  * SAMD21
+ * SAMD51
  * SAM3X\*
  * SAM3A\*
  * SAM7L\*
  * SAM9XE\*
+ * SAME51\*
+ * SAME52\*
+ * SAME53\*
+ * SAME54\*
  * SAME70\*
 
 \* Device families which are not tested for each release and could stop working.

src/BossaInfo.cpp

@@ -54,11 +54,11 @@ BossaInfo::BossaInfo(wxWindow* parent) : InfoDialog(parent)
     _bodCheckBox->SetValue(flash->getBod());
     _borCheckBox->SetValue(flash->getBor());
 
-    uint32_t lockRegions = flash->lockRegions();
+    std::vector<bool> lockRegions = flash->getLockRegions();
     bool hasLockRegion = false;
-    for (uint32_t i = 0; i < lockRegions; i++)
+    for (uint32_t i = 0; i < lockRegions.size(); i++)
     {
-        if (flash->getLockRegion(i))
+        if (lockRegions[i])
         {
             _lockTextCtrl->AppendText(wxString::Format(wxT("%s%d"), hasLockRegion ? "," : "", i));
             hasLockRegion = true;

src/BossaThread.cpp

@@ -140,9 +140,10 @@ WriteThread::Entry()
         if (flash->canBor())
             flash->setBor(_bor);
         if (_lock)
-            flash->lockAll();
+            flash->setLockRegions(std::vector<bool>(flash->lockRegions(), true));
         if (_security)
             flash->setSecurity();
+        flash->writeOptions();
     }
     catch(exception& e)
     {

src/BossaWindow.cpp

@@ -34,6 +34,7 @@
 #include "Device.h"
 
 #include <string>
+#include <algorithm>
 
 
 using namespace std;
@@ -333,12 +334,14 @@ BossaWindow::OnWrite(wxCommandEvent& event)
 
     try
     {
-        if (flash->isLocked())
+        std::vector<bool> regions = flash->getLockRegions();
+
+        if (std::find(regions.begin(), regions.end(), true) != regions.end())
         {
             if (!Question(wxT("The flash is currently locked. Do you want to unlock it and proceed with the write?")))
                 return;
 
-            flash->unlockAll();
+            flash->setLockRegions(std::vector<bool>(regions.size(), false));
         }
     }
     catch(exception& e)

src/Command.cpp

@@ -28,7 +28,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 #define __STDC_LIMIT_MACROS
 #include <stdio.h>
-#include <stdlib.h>
 #include <stdarg.h>
 #include <errno.h>
 #include <string.h>
@@ -416,30 +415,25 @@ CommandDump::invoke(char* argv[], int argc)
 {
     uint32_t addr;
     uint32_t count;
-    uint8_t* buf;
 
     if (!argNum(argc, 3) ||
         !argUint32(argv[1], &addr) ||
         !argUint32(argv[2], &count) ||
         !connected())
         return;
 
-    buf = (uint8_t*) malloc(count);
-    if (!buf)
-        return;
+    std::unique_ptr<uint8_t[]> buf(new uint8_t[count]);
 
     try
     {
-        _samba.read(addr, buf, count);
+        _samba.read(addr, buf.get(), count);
     }
     catch (...)
     {
-        free(buf);
         throw;
     }
 
-    hexdump(addr, buf, count);
-    free(buf);
+    hexdump(addr, buf.get(), count);
 }
 
 CommandErase::CommandErase() :
@@ -580,7 +574,7 @@ CommandLock::invoke(char* argv[], int argc)
         bits += argv[argn];
 
     _flasher.lock(bits, true);
-    printf("Locked regions %s", bits.c_str());
+    printf("Locked regions %s\n", bits.c_str());
 }
 
 CommandMrb::CommandMrb() :
@@ -1235,3 +1229,15 @@ CommandReset::invoke(char* argv[], int argc)
     _device.reset();
 }
 
+CommandOptions::CommandOptions() :
+    Command("options",
+            "Write options to flash.",
+            "options\n")
+{}
+
+void
+CommandOptions::invoke(char* argv[], int argc)
+{
+    _flash->writeOptions();
+}
+

src/Command.h

@@ -276,4 +276,11 @@ class CommandReset : public Command
     virtual void invoke(char* argv[], int argc);
 };
 
+class CommandOptions : public Command
+{
+public:
+    CommandOptions();
+    virtual void invoke(char* argv[], int argc);
+};
+
 #endif // _COMMAND_H