From 29dd98420b3dfc949a8bc73ea978a6f05ca70d50 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 1 Aug 2018 11:19:43 +0200
Subject: [PATCH] Remove getFrameDecal() API

Signed-off-by: Clifford Wolf <clifford@clifford.at>
---
 ecp5/arch.cc     | 12 ------------
 ecp5/arch.h      |  1 -
 ecp5/archdefs.h  |  2 +-
 generic/arch.cc  |  2 --
 generic/arch.h   |  2 --
 ice40/arch.cc    | 12 ------------
 ice40/arch.h     |  1 -
 ice40/archdefs.h |  1 -
 ice40/main.cc    |  2 --
 9 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/ecp5/arch.cc b/ecp5/arch.cc
index a305e57b..6c3714cc 100644
--- a/ecp5/arch.cc
+++ b/ecp5/arch.cc
@@ -436,10 +436,6 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
 {
     std::vector<GraphicElement> ret;
 
-    if (decal.type == DecalId::TYPE_FRAME) {
-        /* nothing */
-    }
-
     if (decal.type == DecalId::TYPE_BEL) {
         BelId bel;
         bel.index = decal.z;
@@ -473,14 +469,6 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
     return ret;
 }
 
-DecalXY Arch::getFrameDecal() const
-{
-    DecalXY decalxy;
-    decalxy.decal.type = DecalId::TYPE_FRAME;
-    decalxy.decal.active = true;
-    return decalxy;
-}
-
 DecalXY Arch::getBelDecal(BelId bel) const
 {
     DecalXY decalxy;
diff --git a/ecp5/arch.h b/ecp5/arch.h
index e4d67e0f..2e54276b 100644
--- a/ecp5/arch.h
+++ b/ecp5/arch.h
@@ -793,7 +793,6 @@ struct Arch : BaseCtx
 
     std::vector<GraphicElement> getDecalGraphics(DecalId decal) const;
 
-    DecalXY getFrameDecal() const;
     DecalXY getBelDecal(BelId bel) const;
     DecalXY getWireDecal(WireId wire) const;
     DecalXY getPipDecal(PipId pip) const;
diff --git a/ecp5/archdefs.h b/ecp5/archdefs.h
index 829db683..1e115478 100644
--- a/ecp5/archdefs.h
+++ b/ecp5/archdefs.h
@@ -122,7 +122,7 @@ struct DecalId
 {
     enum
     {
-        TYPE_FRAME,
+        TYPE_NONE,
         TYPE_BEL
     } type;
     Location location;
diff --git a/generic/arch.cc b/generic/arch.cc
index b1905e6f..66fbd1ff 100644
--- a/generic/arch.cc
+++ b/generic/arch.cc
@@ -426,8 +426,6 @@ bool Arch::route() { return router1(getCtx()); }
 
 const std::vector<GraphicElement> &Arch::getDecalGraphics(DecalId decal) const { return decal_graphics.at(decal); }
 
-DecalXY Arch::getFrameDecal() const { return frame_decalxy; }
-
 DecalXY Arch::getBelDecal(BelId bel) const { return bels.at(bel).decalxy; }
 
 DecalXY Arch::getWireDecal(WireId wire) const { return wires.at(wire).decalxy; }
diff --git a/generic/arch.h b/generic/arch.h
index 17d62ec3..0c756d3a 100644
--- a/generic/arch.h
+++ b/generic/arch.h
@@ -89,7 +89,6 @@ struct Arch : BaseCtx
     std::vector<std::vector<std::vector<BelId>>> bels_by_tile;
 
     std::unordered_map<DecalId, std::vector<GraphicElement>> decal_graphics;
-    DecalXY frame_decalxy;
 
     int gridDimX, gridDimY;
     std::vector<std::vector<int>> tileDimZ;
@@ -206,7 +205,6 @@ struct Arch : BaseCtx
     bool route();
 
     const std::vector<GraphicElement> &getDecalGraphics(DecalId decal) const;
-    DecalXY getFrameDecal() const;
     DecalXY getBelDecal(BelId bel) const;
     DecalXY getWireDecal(WireId wire) const;
     DecalXY getPipDecal(PipId pip) const;
diff --git a/ice40/arch.cc b/ice40/arch.cc
index 5545ddf4..b3d514b5 100644
--- a/ice40/arch.cc
+++ b/ice40/arch.cc
@@ -665,14 +665,6 @@ bool Arch::route() { return router1(getCtx()); }
 
 // -----------------------------------------------------------------------
 
-DecalXY Arch::getFrameDecal() const
-{
-    DecalXY decalxy;
-    decalxy.decal.type = DecalId::TYPE_FRAME;
-    decalxy.decal.active = true;
-    return decalxy;
-}
-
 DecalXY Arch::getBelDecal(BelId bel) const
 {
     DecalXY decalxy;
@@ -713,10 +705,6 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
 {
     std::vector<GraphicElement> ret;
 
-    if (decal.type == DecalId::TYPE_FRAME) {
-        /* nothing */
-    }
-
     if (decal.type == DecalId::TYPE_GROUP) {
         int type = (decal.index >> 16) & 255;
         int x = (decal.index >> 8) & 255;
diff --git a/ice40/arch.h b/ice40/arch.h
index 07a8070a..bfec7c16 100644
--- a/ice40/arch.h
+++ b/ice40/arch.h
@@ -714,7 +714,6 @@ struct Arch : BaseCtx
 
     std::vector<GraphicElement> getDecalGraphics(DecalId decal) const;
 
-    DecalXY getFrameDecal() const;
     DecalXY getBelDecal(BelId bel) const;
     DecalXY getWireDecal(WireId wire) const;
     DecalXY getPipDecal(PipId pip) const;
diff --git a/ice40/archdefs.h b/ice40/archdefs.h
index 8a7449a8..9329609e 100644
--- a/ice40/archdefs.h
+++ b/ice40/archdefs.h
@@ -140,7 +140,6 @@ struct DecalId
     enum : int8_t
     {
         TYPE_NONE,
-        TYPE_FRAME,
         TYPE_BEL,
         TYPE_WIRE,
         TYPE_PIP,
diff --git a/ice40/main.cc b/ice40/main.cc
index 6e8385e6..0724acdf 100644
--- a/ice40/main.cc
+++ b/ice40/main.cc
@@ -317,8 +317,6 @@ int main(int argc, char *argv[])
                 std::cout << "<!-- " << ctx->getBelName(bel).str(ctx.get()) << " -->\n";
                 svg_dump_decal(ctx.get(), ctx->getBelDecal(bel));
             }
-            std::cout << "<!-- Frame -->\n";
-            svg_dump_decal(ctx.get(), ctx->getFrameDecal());
             std::cout << "</svg>\n";
         }