Fix all compiler bugs (linker still unhappy)

7 files changed, 16 insertions, 16 deletions

diff --git a/src/bossa/Device.cpp b/src/bossa/Device.cpp
index 6cfda0be..d3abc9e8 100644
--- a/src/bossa/Device.cpp
+++ b/src/bossa/Device.cpp
@@ -47,7 +47,7 @@ Device::readChipId(uint32_t& chipId, uint32_t& extChipId)
 void
 Device::create() THROWS(GCodeException)
 {
-    Flash* flashPtr;
+	BossaFlash* flashPtr;
 #if ORIGINAL_BOSSA_CODE
     uint32_t chipId = 0;
     uint32_t cpuId = 0;
diff --git a/src/bossa/Device.h b/src/bossa/Device.h
index 9509acb4..f0a2e5b7 100644
--- a/src/bossa/Device.h
+++ b/src/bossa/Device.h
@@ -84,13 +84,13 @@ public:
 
     Family getFamily() noexcept { return _family; }
 
-    Flash* getFlash() noexcept { return _flash; }
+    BossaFlash* getFlash() noexcept { return _flash; }
 
     void reset() THROWS(GCodeException);
 
 private:
     Samba& _samba;
-    Flash* _flash;
+    BossaFlash* _flash;
     Family _family;
 
 #if ORIGINAL_BOSSA_CODE
diff --git a/src/bossa/EefcFlash.cpp b/src/bossa/EefcFlash.cpp
index 346d43e1..153e38b7 100644
--- a/src/bossa/EefcFlash.cpp
+++ b/src/bossa/EefcFlash.cpp
@@ -68,7 +68,7 @@ EefcFlash::EefcFlash(Samba& samba,
                      uint32_t stack,
                      uint32_t regs,
                      bool canBrownout) THROWS(GCodeException)
-    : Flash(samba, name, addr, pages, size, planes, lockRegions, user, stack),
+    : BossaFlash(samba, name, addr, pages, size, planes, lockRegions, user, stack),
       _regs(regs), _canBrownout(canBrownout), _eraseAuto(true)
 {
 
diff --git a/src/bossa/EefcFlash.h b/src/bossa/EefcFlash.h
index cd0f72ee..58ea811c 100644
--- a/src/bossa/EefcFlash.h
+++ b/src/bossa/EefcFlash.h
@@ -33,7 +33,7 @@
 
 #include "Flash.h"
 
-class EefcFlash : public Flash
+class EefcFlash : public BossaFlash
 {
 public:
     EefcFlash(Samba& samba,
diff --git a/src/bossa/Flash.cpp b/src/bossa/Flash.cpp
index 58d7f24d..953a9f5d 100644
--- a/src/bossa/Flash.cpp
+++ b/src/bossa/Flash.cpp
@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 #include "Flash.h"
 
-Flash::Flash(Samba& samba,
+BossaFlash::BossaFlash(Samba& samba,
 			const char* name,
              uint32_t addr,
              uint32_t pages,
@@ -52,7 +52,7 @@ Flash::Flash(Samba& samba,
 }
 
 void
-Flash::setLockRegions(const Vector<bool, 16>& regions) THROWS(GCodeException)
+BossaFlash::setLockRegions(const Vector<bool, 16>& regions) THROWS(GCodeException)
 {
     if (regions.Size() > _lockRegions)
         throw FlashRegionError("Flash::setLockRegions: regions.Size() > _lockRegions");
@@ -61,34 +61,34 @@ Flash::setLockRegions(const Vector<bool, 16>& regions) THROWS(GCodeException)
 }
 
 void
-Flash::setSecurity() noexcept
+BossaFlash::setSecurity() noexcept
 {
     _security.set(true);
 }
 
 void
-Flash::setBor(bool enable) noexcept
+BossaFlash::setBor(bool enable) noexcept
 {
     if (canBor())
         _bor.set(enable);
 }
 
 void
-Flash::setBod(bool enable) noexcept
+BossaFlash::setBod(bool enable) noexcept
 {
     if (canBod())
         _bod.set(enable);
 }
 
 void
-Flash::setBootFlash(bool enable) noexcept
+BossaFlash::setBootFlash(bool enable) noexcept
 {
     if (canBootFlash())
         _bootFlash.set(enable);
 }
 
 void
-Flash::loadBuffer(const uint8_t* data, uint16_t bufferSize) THROWS(GCodeException)
+BossaFlash::loadBuffer(const uint8_t* data, uint16_t bufferSize) THROWS(GCodeException)
 {
     _samba.write(_onBufferA ? _pageBufferA : _pageBufferB, data, bufferSize);
 }
diff --git a/src/bossa/Flash.h b/src/bossa/Flash.h
index 9f7f9b0c..afc03664 100644
--- a/src/bossa/Flash.h
+++ b/src/bossa/Flash.h
@@ -60,10 +60,10 @@ private:
     bool _dirty;
 };
 
-class Flash
+class BossaFlash	// manuel: required to rename to avoid clash with CoreN2G namespace Flash
 {
 public:
-    Flash(Samba& samba,
+	BossaFlash(Samba& samba,
           const char* name,
           uint32_t addr,                 // Flash base address
           uint32_t pages,                // Number of pages
@@ -72,7 +72,7 @@ public:
           uint32_t lockRegions,          // Number of flash lock regions
           uint32_t user,                 // Address in SRAM where the applet and buffers will be placed
           uint32_t stack) THROWS(GCodeException);               // Address in SRAM where the applet stack will be placed
-    virtual ~Flash() {}
+    virtual ~BossaFlash() {}
 
     const char* name() noexcept { return _name; }
 
diff --git a/src/bossa/Flasher.h b/src/bossa/Flasher.h
index b9a4935b..5198e2a0 100644
--- a/src/bossa/Flasher.h
+++ b/src/bossa/Flasher.h
@@ -64,7 +64,7 @@ public:
 
 private:
     Samba& _samba;
-    Flash* _flash;
+    BossaFlash* _flash;
     FlasherObserver& _observer;
 
     uint32_t pageNum;