diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-08-08 19:36:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-08 19:36:05 +0200 |
| commit | b326b03a5261a824f428fe0811a5376c8758b929 (patch) | |
| tree | a13673a636ddbea3b5fd5585e3bb109b56b69435 /ice40/pack.cc | |
| parent | cd4e761bb799ca99f02d3aa177961af28a93f2d8 (diff) | |
| parent | f6189e4677c7bdaeaa5b9b796a67d750e6c7d49d (diff) | |
| download | nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.tar.gz nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.tar.bz2 nextpnr-b326b03a5261a824f428fe0811a5376c8758b929.zip | |
Merge pull request #45 from YosysHQ/constids
Get rid of PortPin and BelType
Diffstat (limited to 'ice40/pack.cc')
| -rw-r--r-- | ice40/pack.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ice40/pack.cc b/ice40/pack.cc index e7fdc627..05338713 100644 --- a/ice40/pack.cc +++ b/ice40/pack.cc @@ -755,13 +755,13 @@ static void pack_special(Context *ctx) bool constrained = false; if (packed->attrs.find(ctx->id("BEL")) == packed->attrs.end()) { for (auto bel : ctx->getBels()) { - if (ctx->getBelType(bel) != TYPE_ICESTORM_PLL) + if (ctx->getBelType(bel) != id_ICESTORM_PLL) continue; // A PAD PLL must have its' PACKAGEPIN on the SB_IO that's shared // with PLLOUT_A. if (is_pad) { - auto pll_sb_io_belpin = ctx->getIOBSharingPLLPin(bel, PIN_PLLOUT_A); + auto pll_sb_io_belpin = ctx->getIOBSharingPLLPin(bel, id_PLLOUT_A); NPNR_ASSERT(pad_packagepin_net != nullptr); auto pll_packagepin_driver = pad_packagepin_net->driver; NPNR_ASSERT(pll_packagepin_driver.cell != nullptr); @@ -846,7 +846,7 @@ static void pack_special(Context *ctx) } // Find wire that will be driven by this port. - const auto pll_out_wire = ctx->getBelPinWire(pll_bel, ctx->portPinFromId(port.name)); + const auto pll_out_wire = ctx->getBelPinWire(pll_bel, port.name); NPNR_ASSERT(pll_out_wire.index != -1); // Now, constrain all LUTs on the output of the signal to be at |