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

cleanup and formating

Browse Source
This commit is contained in:
Miodrag Milanovic 2019-12-15 10:43:30 +01:00
parent 2872b500e3
commit f2b8e347a9
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ecp5/gfx.cc
View File

@ -1247,7 +1247,6 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
dst_id - TILE_WIRE_H00L0000 + 30); dst_id - TILE_WIRE_H00L0000 + 30);
} }
if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_H00) { if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_H00) {
// toSameSideH1Hor(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_H00L0000);
straightLine(g, el, x, y, w, h, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, w, h, src, src_type, src_id, dst, dst_type, dst_id);
} }
@ -1312,7 +1311,6 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
// To V00 // To V00
if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_V00) { if (src_type == id_WIRE_TYPE_V02 && dst_type == id_WIRE_TYPE_V00) {
// toSameSideH1Hor(g,el,x,y,src,src_type,src_id,dst,dst_type,dst_id,style, dst_id - TILE_WIRE_V00T0000);
straightLine(g, el, x, y, w, h, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, w, h, src, src_type, src_id, dst, dst_type, dst_id);
} }
if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_V00) { if (src_type == id_WIRE_TYPE_H02 && dst_type == id_WIRE_TYPE_V00) {
@ -1398,14 +1396,16 @@ void gfxTilePip(std::vector<GraphicElement> &g, int x, int y, int w, int h, Wire
dst_id - TILE_WIRE_JCE0); dst_id - TILE_WIRE_JCE0);
} }
if ((src_type == id_WIRE_TYPE_H02 || src_type == id_WIRE_TYPE_V00 || src_type == id_WIRE_TYPE_V01 || src_type == id_WIRE_TYPE_V02) if ((src_type == id_WIRE_TYPE_H02 || src_type == id_WIRE_TYPE_V00 || src_type == id_WIRE_TYPE_V01 ||
&& dst_type == id_WIRE_TYPE_NONE && src_type == id_WIRE_TYPE_V02) &&
dst_type == id_WIRE_TYPE_NONE &&
((dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI) || ((dst_id >= TILE_WIRE_FCO && dst_id <= TILE_WIRE_FCI) ||
(dst_id >= TILE_WIRE_JCE0 && dst_id <= TILE_WIRE_JQ7))) { (dst_id >= TILE_WIRE_JCE0 && dst_id <= TILE_WIRE_JQ7))) {
straightLine(g, el, x, y, w, h, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, w, h, src, src_type, src_id, dst, dst_type, dst_id);
} }
if ((dst_type == id_WIRE_TYPE_H02 || dst_type == id_WIRE_TYPE_V00 || dst_type == id_WIRE_TYPE_V01 || dst_type == id_WIRE_TYPE_V02) if ((dst_type == id_WIRE_TYPE_H02 || dst_type == id_WIRE_TYPE_V00 || dst_type == id_WIRE_TYPE_V01 ||
&& src_type == id_WIRE_TYPE_NONE && dst_type == id_WIRE_TYPE_V02) &&
src_type == id_WIRE_TYPE_NONE &&
((src_id >= TILE_WIRE_FCO && src_id <= TILE_WIRE_FCI) || ((src_id >= TILE_WIRE_FCO && src_id <= TILE_WIRE_FCI) ||
(src_id >= TILE_WIRE_JCE0 && src_id <= TILE_WIRE_JQ7))) { (src_id >= TILE_WIRE_JCE0 && src_id <= TILE_WIRE_JQ7))) {
straightLine(g, el, x, y, w, h, src, src_type, src_id, dst, dst_type, dst_id); straightLine(g, el, x, y, w, h, src, src_type, src_id, dst, dst_type, dst_id);