aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiodrag Milanovic <mmicko@gmail.com>2019-12-28 14:27:14 +0100
committerMiodrag Milanovic <mmicko@gmail.com>2019-12-28 14:27:14 +0100
commit6cca93543bb9177f3ead83590c0d835c0bb8a3eb (patch)
tree9471e660adb37fbb56b2bebf82b48d13d1d4c871
parent6ebe2fd03471e9f5511086f4726dc31a35d537dc (diff)
downloadnextpnr-6cca93543bb9177f3ead83590c0d835c0bb8a3eb.tar.gz
nextpnr-6cca93543bb9177f3ead83590c0d835c0bb8a3eb.tar.bz2
nextpnr-6cca93543bb9177f3ead83590c0d835c0bb8a3eb.zip
move constants to gfx.cc
-rw-r--r--ecp5/gfx.cc18
-rw-r--r--ecp5/gfx.h18
2 files changed, 18 insertions, 18 deletions
diff --git a/ecp5/gfx.cc b/ecp5/gfx.cc
index 884388a8..c1c08377 100644
--- a/ecp5/gfx.cc
+++ b/ecp5/gfx.cc
@@ -22,6 +22,24 @@
NEXTPNR_NAMESPACE_BEGIN
+const float slice_x1 = 0.92;
+const float slice_x2 = 0.94;
+const float slice_y1 = 0.71;
+const float slice_y2 = 0.745 + 0.0068;
+const float slice_pitch = 0.0374 + 0.0068;
+
+const float io_cell_v_x1 = 0.76;
+const float io_cell_v_x2 = 0.95;
+const float io_cell_v_y1 = 0.05;
+const float io_cell_v_y2 = 0.15;
+const float io_cell_v_pitch = 0.125;
+
+const float io_cell_h_x1 = 0.05;
+const float io_cell_h_x2 = 0.14;
+const float io_cell_h_y1 = 0.05;
+const float io_cell_h_y2 = 0.24;
+const float io_cell_h_pitch = 0.125;
+
void gfxTileBel(std::vector<GraphicElement> &g, int x, int y, int z, int w, int h, IdString bel_type,
GraphicElement::style_t style)
{
diff --git a/ecp5/gfx.h b/ecp5/gfx.h
index db618679..947b5551 100644
--- a/ecp5/gfx.h
+++ b/ecp5/gfx.h
@@ -29,24 +29,6 @@ const float switchbox_x2 = 0.90;
const float switchbox_y1 = 0.51;
const float switchbox_y2 = 0.90;
-const float slice_x1 = 0.92;
-const float slice_x2 = 0.94;
-const float slice_y1 = 0.71;
-const float slice_y2 = 0.745 + 0.0068;
-const float slice_pitch = 0.0374 + 0.0068;
-
-const float io_cell_v_x1 = 0.76;
-const float io_cell_v_x2 = 0.95;
-const float io_cell_v_y1 = 0.05;
-const float io_cell_v_y2 = 0.15;
-const float io_cell_v_pitch = 0.125;
-
-const float io_cell_h_x1 = 0.05;
-const float io_cell_h_x2 = 0.14;
-const float io_cell_h_y1 = 0.05;
-const float io_cell_h_y2 = 0.24;
-const float io_cell_h_pitch = 0.125;
-
enum GfxTileWireId
{
TILE_WIRE_NONE,