diff options
| author | Miodrag Milanovic <mmicko@gmail.com> | 2018-07-26 18:48:07 +0200 |
|---|---|---|
| committer | Miodrag Milanovic <mmicko@gmail.com> | 2018-07-26 18:48:07 +0200 |
| commit | 8db19778a09954e7c0b4803bdfc40509de0403fd (patch) | |
| tree | ae80d1b80e2ba1c7a8b56adbbed2f1b3051d4236 | |
| parent | ae6eeb9d810c647ca1684459627b8dd20870f993 (diff) | |
| download | nextpnr-8db19778a09954e7c0b4803bdfc40509de0403fd.tar.gz nextpnr-8db19778a09954e7c0b4803bdfc40509de0403fd.tar.bz2 nextpnr-8db19778a09954e7c0b4803bdfc40509de0403fd.zip | |
Fix name clash for ecp5
| -rw-r--r-- | ecp5/arch.h | 2 | ||||
| -rw-r--r-- | ecp5/bitstream.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ecp5/arch.h b/ecp5/arch.h index d9d29c76..b6aac9cf 100644 --- a/ecp5/arch.h +++ b/ecp5/arch.h @@ -752,7 +752,7 @@ struct Arch : BaseCtx return chip_info->tiletype_names[locInfo(pip)->pip_data[pip.index].tile_type].get(); } - int8_t getPipType(PipId pip) const { return locInfo(pip)->pip_data[pip.index].pip_type; } + int8_t getPipClass(PipId pip) const { return locInfo(pip)->pip_data[pip.index].pip_type; } BelId getPackagePinBel(const std::string &pin) const; std::string getBelPackagePin(BelId bel) const; diff --git a/ecp5/bitstream.cc b/ecp5/bitstream.cc index f87b7038..df9b12d5 100644 --- a/ecp5/bitstream.cc +++ b/ecp5/bitstream.cc @@ -174,7 +174,7 @@ void write_bitstream(Context *ctx, std::string base_config_file, std::string tex // Add all set, configurable pips to the config for (auto pip : ctx->getPips()) { if (ctx->getBoundPipNet(pip) != IdString()) { - if (ctx->getPipType(pip) == 0) { // ignore fixed pips + if (ctx->getPipClass(pip) == 0) { // ignore fixed pips std::string tile = empty_chip.get_tile_by_position_and_type(pip.location.y, pip.location.x, ctx->getPipTiletype(pip)); std::string source = get_trellis_wirename(ctx, pip.location, ctx->getPipSrcWire(pip)); |