Removed ChipInfo structure

Author: cmaglie

src/BossaWindow.cpp

@@ -262,11 +262,11 @@ BossaWindow::CreateFlash()
     Samba& samba = wxGetApp().samba;
     Flash::Ptr& flash = wxGetApp().flash;
     FlashFactory flashFactory;
-    ChipInfo info;
+    uint32_t chipId;
 
     try
     {
-        info = samba.chipInfo();
+        chipId = samba.chipId();
     }
     catch (exception& e)
     {
@@ -275,11 +275,11 @@ BossaWindow::CreateFlash()
         return;
     }
 
-    flash = flashFactory.create(samba, info);
+    flash = flashFactory.create(samba, chipId);
     if (flash.get() == NULL)
     {
         Disconnected();
-        Error(wxString::Format(wxT("Chip ID 0x%08x is not supported"), info.chipId));
+        Error(wxString::Format(wxT("Chip ID 0x%08x is not supported"), chipId));
         return;
     }
 

src/Command.cpp

@@ -162,12 +162,12 @@ Command::flashable()
 bool
 Command::createFlash()
 {
-    ChipInfo info = _samba.chipInfo();
+    uint32_t chipId = _samba.chipId();
 
-    _flash = _flashFactory.create(_samba, info);
+    _flash = _flashFactory.create(_samba, chipId);
     if (_flash.get() == NULL)
     {
-        printf("Flash for chip ID %08x is not supported\n", info.chipId);
+        printf("Flash for chip ID %08x is not supported\n", chipId);
         return false;
     }
 

src/FlashFactory.cpp

@@ -41,32 +41,24 @@ FlashFactory::~FlashFactory()
 }
 
 Flash::Ptr
-FlashFactory::create(Samba& samba, ChipInfo info)
+FlashFactory::create(Samba& samba, uint32_t chipId)
 {
     Flash* flash;
-    uint32_t chipId = info.chipId;
 
-    ///CORTEX M0+
-    if(info.arch == M0_PLUS)
+    switch (chipId)
     {
-        switch(chipId)
-        {
-	
-	//SAMD21J18A
-        case 0x10010000:
-            flash = new NvmFlash(samba, "ATSAMD21J18A", 0x000000, 4096, 64, 1, 16, 0x804000, 0x20008000, 0x41004000 /*Base address for the NVMCTRL module */, true);
+    //
+    // SAMD21
+    //
+    case 0x10010000:
+        flash = new NvmFlash(samba, "ATSAMD21J18A", 0x000000, 4096, 64, 1, 16, 0x804000, 0x20008000, 0x41004000, true);
+        // 0x41004000 == Base address for the NVMCTRL module
         break;
 
-        case 0x10010005:
-            flash = new NvmFlash(samba, "ATSAMD21G18A", 0x000000, 4096, 64, 1, 16, 0x804000, 0x20008000, 0x41004000, true);
+    case 0x10010005:
+        flash = new NvmFlash(samba, "ATSAMD21G18A", 0x000000, 4096, 64, 1, 16, 0x804000, 0x20008000, 0x41004000, true);
         break;
-	}
 
-        return Flash::Ptr(flash);
-    }
-    
-    switch (chipId & 0x7fffffe0)
-    {
     //
     // SAM7SE
     //

src/FlashFactory.h

@@ -40,7 +40,7 @@ class FlashFactory
     FlashFactory();
     virtual ~FlashFactory();
 
-    Flash::Ptr create(Samba& samba, ChipInfo info);
+    Flash::Ptr create(Samba& samba, uint32_t chipId);
 };
 
 #endif // _FLASHFACTORY_H

src/Samba.cpp

@@ -96,11 +96,9 @@ Samba::init()
     _port->read(cmd, 2);
 
     // Read the chip ID
-    ChipInfo info;
     try
     {
-        info = chipInfo();
-        cid = info.chipId;
+        cid = chipId();
     }
     catch (SambaError)
     {
@@ -112,18 +110,6 @@ Samba::init()
     if (_debug)
         printf("chipId=%#08x\n", cid);
 
-    //Check for M0+ processors.
-    if(info.arch == M0_PLUS)
-    {
-       int arch = -1;
-       arch = cid >> ((sizeof(int)*8) - 4); //see the 4 bits from MSB
-       if(arch == 1)
-          return true;
-       if(_debug)
-          printf("Unsupported M0+ architecture\n");
-    }
-
-
     uint8_t eproc = (cid >> 5) & 0x7;
     uint8_t arch = (cid >> 20) & 0xff;
 
@@ -579,50 +565,35 @@ Samba::version()
 uint32_t
 Samba::chipId()
 {
-    ChipInfo info = chipInfo();
-    return info.chipId;
-}
-
-ChipInfo
-Samba::chipInfo()
-{
-    uint32_t cid;
     uint32_t vector;
-    ChipInfo info;
+    uint32_t cid;
 
     // Read the ARM reset vector
     vector = readWord(0x0);
 
     // If the vector is a ARM7TDMI branch, then assume Atmel SAM7 registers
     if ((vector & 0xff000000) == 0xea000000)
     {
-      info.chipId = readWord(0xfffff240);
-      info.arch = ARM7TDMI;
+        cid = readWord(0xfffff240);
     }
     // Else use the Atmel SAM3 or SAM4 or M0+ registers 
     else 
     {
-      //Check if it is Cortex M0+
-      cid = readWord(0x41002018); //This is DSU_DID register
-      if(cid !=0)
-      {
-        //M0+ device cid will be 0x10010000.
-        info.chipId = cid;
-        info.arch = M0_PLUS;
-      }
-      else
-      {
-      //M3 or M4
-      cid = readWord(0x400e0740);
-      if (cid == 0)
-        cid = readWord(0x400e0940);
-
-      info.chipId = cid;
-      info.arch = M3_M4;
-      }
+        // Check if it is Cortex M0+
+        cid = readWord(0x41002018); // This is DSU_DID register
+        if (cid != 0)
+        {
+            // M0+ device cid will be 0x10010000.
+        }
+        else
+        {
+            // M3 or M4
+            cid = readWord(0x400e0740);
+            if (cid == 0)
+                cid = readWord(0x400e0940);
+        }
     }
-    return info;
-   
+    return cid;
 }
 
 void

src/Samba.h

@@ -37,24 +37,6 @@
 
 #include "SerialPort.h"
 
-
-
-
-enum CHIP_ARCH
-{
-   M0_PLUS,
-   M3_M4,
-   ARM7TDMI,
-   ARM9
-};
- 
-
-typedef struct
-{
-  uint32_t chipId;
-  CHIP_ARCH arch;
-}ChipInfo;
-
 class SambaError : public std::exception
 {
 public:
@@ -87,8 +69,6 @@ class Samba
 
     uint32_t chipId();
 
-    ChipInfo chipInfo();
-
     void setDebug(bool debug) { _debug = debug; }
 
     const SerialPort& getSerialPort() { return *_port; }

src/bossac.cpp

@@ -321,12 +321,11 @@ main(int argc, char* argv[])
             printf("Device found on %s\n", port.c_str());
         }
 
- 
-        ChipInfo info = samba.chipInfo();
-        Flash::Ptr flash = flashFactory.create(samba, info);
+        uint32_t chipId = samba.chipId();
+        Flash::Ptr flash = flashFactory.create(samba, chipId);
         if (flash.get() == NULL)
         {
-            fprintf(stderr, "Flash for chip ID %08x is not supported\n", info.chipId);
+            fprintf(stderr, "Flash for chip ID %08x is not supported\n", chipId);
             return 1;
         }