caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clk and lsr muxes

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-10-12 09:27:55 +02:00
parent 0b4ced96ec
commit 3da7af9f02
2 changed files with 93 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ecp5/arch.cc
View File

@ -701,7 +701,68 @@ std::vector<GraphicElement> Arch::getDecalGraphics(DecalId decal) const
ret.push_back(el);
}
}
}
if (tilewire >= TILE_WIRE_LSR1 && tilewire <=TILE_WIRE_CLK0)
{
GraphicElement el;
el.type = GraphicElement::TYPE_LINE;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
el.x1 = x + switchbox_x2;
el.x2 = x + switchbox_x2 + 0.0017f * (6-(tilewire-TILE_WIRE_LSR1));
el.y1 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_LSR1 - 5) + 3*slice_pitch;
el.y2 = y + slice_y2 - 0.0017f * (tilewire - TILE_WIRE_LSR1 - 5) + 3*slice_pitch;
ret.push_back(el);
if (tilewire == TILE_WIRE_LSR1 || tilewire==TILE_WIRE_LSR0) {
el.x1 = el.x2;
el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 + 1) + 3*slice_pitch;
ret.push_back(el);
if (tilewire == TILE_WIRE_LSR1) {
for (int i=0;i<2;i++){
el.x2 = x + slice_x1 - 0.005f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 - 2) + (3+i)*slice_pitch;
el.y2 = el.y1;
ret.push_back(el);
}
}
} else {
el.x1 = el.x2;
el.y2 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 -5 + 2) + 3*slice_pitch;
ret.push_back(el);
if (tilewire == TILE_WIRE_CLK1) {
for (int i=0;i<2;i++){
el.x2 = x + slice_x1 - 0.005f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 - 1) + (3+i)*slice_pitch;
el.y2 = el.y1;
ret.push_back(el);
}
}
}
}
if (tilewire >= TILE_WIRE_MUXCLK3 && tilewire <=TILE_WIRE_MUXCLK0)
{
GraphicElement el;
el.type = GraphicElement::TYPE_LINE;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
el.x1 = x + switchbox_x2 + 0.0017f * 3;
el.x2 = x + slice_x1 - 0.005f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 + 2) + (3 + tilewire - TILE_WIRE_MUXCLK3)*slice_pitch;
el.y2 = el.y1;
ret.push_back(el);
}
if (tilewire >= TILE_WIRE_MUXLSR3 && tilewire <=TILE_WIRE_MUXLSR0)
{
GraphicElement el;
el.type = GraphicElement::TYPE_LINE;
el.style = decal.active ? GraphicElement::STYLE_ACTIVE : GraphicElement::STYLE_INACTIVE;
el.x1 = x + switchbox_x2 + 0.0017f * 5;
el.x2 = x + slice_x1 - 0.005f;
el.y1 = y + slice_y2 - 0.0017f * (TILE_WIRE_CE0 - TILE_WIRE_LSR1 - 5 + 1) + (3 + tilewire - TILE_WIRE_MUXLSR3)*slice_pitch;
el.y2 = el.y1;
ret.push_back(el);
}
}
if (decal.type == DecalId::TYPE_BEL) {
BelId bel;
bel.index = decal.z;

31
ecp5/gfx.h
View File

@ -346,6 +346,37 @@ enum GfxTileWireId
TILE_WIRE_DUMMY_526,
TILE_WIRE_FCI,
TILE_WIRE_MUXLSR3,
TILE_WIRE_MUXLSR2,
TILE_WIRE_MUXLSR1,
TILE_WIRE_MUXLSR0,
TILE_WIRE_MUXCLK3,
TILE_WIRE_MUXCLK2,
TILE_WIRE_MUXCLK1,
TILE_WIRE_MUXCLK0,
TILE_WIRE_F7,
TILE_WIRE_Q7,
TILE_WIRE_Q6,
TILE_WIRE_F6,
TILE_WIRE_F5,
TILE_WIRE_Q5,
TILE_WIRE_Q4,
TILE_WIRE_F4,
TILE_WIRE_F3,
TILE_WIRE_Q3,
TILE_WIRE_Q2,
TILE_WIRE_F2,
TILE_WIRE_F1,
TILE_WIRE_Q1,
TILE_WIRE_Q0,
TILE_WIRE_F0,
};
NEXTPNR_NAMESPACE_END