diff options
| author | David Shah <dave@ds0.me> | 2019-10-09 14:35:16 +0100 |
|---|---|---|
| committer | David Shah <dave@ds0.me> | 2019-10-09 14:35:16 +0100 |
| commit | f2fd1bf80a96e1964c37a657146b6101b1a2e4ab (patch) | |
| tree | 656274236170854fb12771506ac032332fab1bc0 | |
| parent | c6401413a4511de7faf56254ea27a85b5dc55ca0 (diff) | |
| download | nextpnr-f2fd1bf80a96e1964c37a657146b6101b1a2e4ab.tar.gz nextpnr-f2fd1bf80a96e1964c37a657146b6101b1a2e4ab.tar.bz2 nextpnr-f2fd1bf80a96e1964c37a657146b6101b1a2e4ab.zip | |
ecp5: Fix tristate IO registers
Signed-off-by: David Shah <dave@ds0.me>
| -rw-r--r-- | ecp5/pack.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/ecp5/pack.cc b/ecp5/pack.cc index 0aa69952..559345fa 100644 --- a/ecp5/pack.cc +++ b/ecp5/pack.cc @@ -2265,7 +2265,10 @@ class Ecp5Packer if (str_or_default(ci->params, ctx->id("CEMUX"), "CE") == "CE") { iol->params[ctx->id("CEIMUX")] = std::string("CEMUX"); iol->params[ctx->id("CEMUX")] = std::string("CE"); - replace_port(ci, ctx->id("CE"), iol, ctx->id("CE")); + if (get_net_or_empty(ci, ctx->id("CE")) == nullptr) + replace_port(ci, ctx->id("CE"), iol, ctx->id("CE")); + else + disconnect_port(ctx, ci, ctx->id("CE")); } else { iol->params[ctx->id("CEIMUX")] = std::string("1"); } @@ -2301,7 +2304,7 @@ class Ecp5Packer pio->ports[id_IOLTO].type = PORT_IN; } pio->params[ctx->id("TRIMUX_TSREG")] = std::string("IOLTO"); - replace_port(pio, id_I, pio, id_IOLTO); + replace_port(pio, id_T, pio, id_IOLTO); } else { if (!pio->ports.count(id_IOLDO)) { pio->ports[id_IOLDO].name = id_IOLDO; @@ -2320,7 +2323,10 @@ class Ecp5Packer if (str_or_default(ci->params, ctx->id("CEMUX"), "CE") == "CE") { iol->params[ctx->id("CEOMUX")] = std::string("CEMUX"); iol->params[ctx->id("CEMUX")] = std::string("CE"); - replace_port(ci, ctx->id("CE"), iol, ctx->id("CE")); + if (get_net_or_empty(ci, ctx->id("CE")) == nullptr) + replace_port(ci, ctx->id("CE"), iol, ctx->id("CE")); + else + disconnect_port(ctx, ci, ctx->id("CE")); } else { iol->params[ctx->id("CEOMUX")] = std::string("1"); } |