diff options
| -rw-r--r-- | ice40/gfx.cc | 10 | ||||
| -rw-r--r-- | ice40/gfx.h | 47 |
2 files changed, 35 insertions, 22 deletions
diff --git a/ice40/gfx.cc b/ice40/gfx.cc index 1006f7b9..6954a9fb 100644 --- a/ice40/gfx.cc +++ b/ice40/gfx.cc @@ -254,6 +254,16 @@ void gfxTileWire(std::vector<GraphicElement> &g, int x, int y, GfxTileWireId id) el.x2 = x3; g.push_back(el); } + + if (id >= TILE_WIRE_LUTFF_0_IN_0 && id <= TILE_WIRE_LUTFF_0_IN_3) { + GraphicElement el; + el.type = GraphicElement::G_LINE; + el.x1 = x + 0.8; + el.x2 = x + 0.82; + el.y1 = y + 0.4675 + (0.005 * (id - TILE_WIRE_LUTFF_0_IN_0)); + el.y2 = el.y1; + g.push_back(el); + } } NEXTPNR_NAMESPACE_END diff --git a/ice40/gfx.h b/ice40/gfx.h index 07643bca..4cd7d081 100644 --- a/ice40/gfx.h +++ b/ice40/gfx.h @@ -78,69 +78,72 @@ enum GfxTileWireId { TILE_WIRE_CARRY_IN, TILE_WIRE_CARRY_IN_MUX, - TILE_WIRE_LUTFF_0_COUT, TILE_WIRE_LUTFF_0_IN_0, TILE_WIRE_LUTFF_0_IN_1, TILE_WIRE_LUTFF_0_IN_2, TILE_WIRE_LUTFF_0_IN_3, - TILE_WIRE_LUTFF_0_LOUT, - TILE_WIRE_LUTFF_0_OUT, - TILE_WIRE_LUTFF_1_COUT, TILE_WIRE_LUTFF_1_IN_0, TILE_WIRE_LUTFF_1_IN_1, TILE_WIRE_LUTFF_1_IN_2, TILE_WIRE_LUTFF_1_IN_3, - TILE_WIRE_LUTFF_1_LOUT, - TILE_WIRE_LUTFF_1_OUT, - TILE_WIRE_LUTFF_2_COUT, TILE_WIRE_LUTFF_2_IN_0, TILE_WIRE_LUTFF_2_IN_1, TILE_WIRE_LUTFF_2_IN_2, TILE_WIRE_LUTFF_2_IN_3, - TILE_WIRE_LUTFF_2_LOUT, - TILE_WIRE_LUTFF_2_OUT, - TILE_WIRE_LUTFF_3_COUT, TILE_WIRE_LUTFF_3_IN_0, TILE_WIRE_LUTFF_3_IN_1, TILE_WIRE_LUTFF_3_IN_2, TILE_WIRE_LUTFF_3_IN_3, - TILE_WIRE_LUTFF_3_LOUT, - TILE_WIRE_LUTFF_3_OUT, - TILE_WIRE_LUTFF_4_COUT, TILE_WIRE_LUTFF_4_IN_0, TILE_WIRE_LUTFF_4_IN_1, TILE_WIRE_LUTFF_4_IN_2, TILE_WIRE_LUTFF_4_IN_3, - TILE_WIRE_LUTFF_4_LOUT, - TILE_WIRE_LUTFF_4_OUT, - TILE_WIRE_LUTFF_5_COUT, TILE_WIRE_LUTFF_5_IN_0, TILE_WIRE_LUTFF_5_IN_1, TILE_WIRE_LUTFF_5_IN_2, TILE_WIRE_LUTFF_5_IN_3, - TILE_WIRE_LUTFF_5_LOUT, - TILE_WIRE_LUTFF_5_OUT, - TILE_WIRE_LUTFF_6_COUT, TILE_WIRE_LUTFF_6_IN_0, TILE_WIRE_LUTFF_6_IN_1, TILE_WIRE_LUTFF_6_IN_2, TILE_WIRE_LUTFF_6_IN_3, - TILE_WIRE_LUTFF_6_LOUT, - TILE_WIRE_LUTFF_6_OUT, - TILE_WIRE_LUTFF_7_COUT, TILE_WIRE_LUTFF_7_IN_0, TILE_WIRE_LUTFF_7_IN_1, TILE_WIRE_LUTFF_7_IN_2, TILE_WIRE_LUTFF_7_IN_3, + + TILE_WIRE_LUTFF_0_LOUT, + TILE_WIRE_LUTFF_1_LOUT, + TILE_WIRE_LUTFF_2_LOUT, + TILE_WIRE_LUTFF_3_LOUT, + TILE_WIRE_LUTFF_4_LOUT, + TILE_WIRE_LUTFF_5_LOUT, + TILE_WIRE_LUTFF_6_LOUT, + + TILE_WIRE_LUTFF_0_OUT, + TILE_WIRE_LUTFF_1_OUT, + TILE_WIRE_LUTFF_2_OUT, + TILE_WIRE_LUTFF_3_OUT, + TILE_WIRE_LUTFF_4_OUT, + TILE_WIRE_LUTFF_5_OUT, + TILE_WIRE_LUTFF_6_OUT, TILE_WIRE_LUTFF_7_OUT, + TILE_WIRE_LUTFF_0_COUT, + TILE_WIRE_LUTFF_1_COUT, + TILE_WIRE_LUTFF_2_COUT, + TILE_WIRE_LUTFF_3_COUT, + TILE_WIRE_LUTFF_4_COUT, + TILE_WIRE_LUTFF_5_COUT, + TILE_WIRE_LUTFF_6_COUT, + TILE_WIRE_LUTFF_7_COUT, + TILE_WIRE_LUTFF_GLOBAL_CEN, TILE_WIRE_LUTFF_GLOBAL_CLK, TILE_WIRE_LUTFF_GLOBAL_S_R, |