diff options
| author | YRabbit <rabbit@yrabbit.cyou> | 2022-12-04 21:33:36 +1000 |
|---|---|---|
| committer | YRabbit <rabbit@yrabbit.cyou> | 2022-12-04 21:33:36 +1000 |
| commit | e6a8d0f4fce4ce0c50ec5705ef75ad6982213d4e (patch) | |
| tree | 4065a6dbc408bd4b76563ab6c86a1e84fc388394 /generic | |
| parent | 2e68962a025999ec85276f6362540c13ccfcd752 (diff) | |
| parent | db25c5c88998aa73725f2a4625d74f38615aaa82 (diff) | |
| download | nextpnr-e6a8d0f4fce4ce0c50ec5705ef75ad6982213d4e.tar.gz nextpnr-e6a8d0f4fce4ce0c50ec5705ef75ad6982213d4e.tar.bz2 nextpnr-e6a8d0f4fce4ce0c50ec5705ef75ad6982213d4e.zip | |
Merge branch 'master' into pll-pins
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/arch.cc | 2 | ||||
| -rw-r--r-- | generic/arch.h | 2 | ||||
| -rw-r--r-- | generic/viaduct_api.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/generic/arch.cc b/generic/arch.cc index 9992e1cd..a1d98200 100644 --- a/generic/arch.cc +++ b/generic/arch.cc @@ -468,7 +468,7 @@ bool Arch::checkPipAvail(PipId pip) const return (!uarch || uarch->checkPipAvail(pip)) && (pip_info(pip).bound_net == nullptr); } -bool Arch::checkPipAvailForNet(PipId pip, NetInfo *net) const +bool Arch::checkPipAvailForNet(PipId pip, const NetInfo *net) const { if (uarch && !uarch->checkPipAvailForNet(pip, net)) return false; diff --git a/generic/arch.h b/generic/arch.h index 688392da..6b34c289 100644 --- a/generic/arch.h +++ b/generic/arch.h @@ -294,7 +294,7 @@ struct Arch : BaseArch<ArchRanges> void bindPip(PipId pip, NetInfo *net, PlaceStrength strength) override; void unbindPip(PipId pip) override; bool checkPipAvail(PipId pip) const override; - bool checkPipAvailForNet(PipId pip, NetInfo *net) const override; + bool checkPipAvailForNet(PipId pip, const NetInfo *net) const override; NetInfo *getBoundPipNet(PipId pip) const override; WireId getConflictingPipWire(PipId pip) const override; NetInfo *getConflictingPipNet(PipId pip) const override; diff --git a/generic/viaduct_api.h b/generic/viaduct_api.h index bc9b4311..6f8adb3e 100644 --- a/generic/viaduct_api.h +++ b/generic/viaduct_api.h @@ -77,7 +77,7 @@ struct ViaductAPI // it's bound (which the base arch will deal with) virtual bool checkWireAvail(WireId wire) const { return true; } virtual bool checkPipAvail(PipId pip) const { return true; } - virtual bool checkPipAvailForNet(PipId pip, NetInfo *net) const { return checkPipAvail(pip); }; + virtual bool checkPipAvailForNet(PipId pip, const NetInfo *net) const { return checkPipAvail(pip); }; // --- Route lookahead --- virtual delay_t estimateDelay(WireId src, WireId dst) const; |