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 /common/kernel | |
| 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 'common/kernel')
| -rw-r--r-- | common/kernel/arch_api.h | 2 | ||||
| -rw-r--r-- | common/kernel/base_arch.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/common/kernel/arch_api.h b/common/kernel/arch_api.h index 14a30652..49be489b 100644 --- a/common/kernel/arch_api.h +++ b/common/kernel/arch_api.h @@ -93,7 +93,7 @@ template <typename R> struct ArchAPI : BaseCtx virtual void bindPip(PipId pip, NetInfo *net, PlaceStrength strength) = 0; virtual void unbindPip(PipId pip) = 0; virtual bool checkPipAvail(PipId pip) const = 0; - virtual bool checkPipAvailForNet(PipId pip, NetInfo *net) const = 0; + virtual bool checkPipAvailForNet(PipId pip, const NetInfo *net) const = 0; virtual NetInfo *getBoundPipNet(PipId pip) const = 0; virtual WireId getConflictingPipWire(PipId pip) const = 0; virtual NetInfo *getConflictingPipNet(PipId pip) const = 0; diff --git a/common/kernel/base_arch.h b/common/kernel/base_arch.h index 3055619d..55fcf280 100644 --- a/common/kernel/base_arch.h +++ b/common/kernel/base_arch.h @@ -274,7 +274,7 @@ template <typename R> struct BaseArch : ArchAPI<R> p2n_entry = nullptr; } virtual bool checkPipAvail(PipId pip) const override { return getBoundPipNet(pip) == nullptr; } - virtual bool checkPipAvailForNet(PipId pip, NetInfo *net) const override + virtual bool checkPipAvailForNet(PipId pip, const NetInfo *net) const override { NetInfo *bound_net = getBoundPipNet(pip); return bound_net == nullptr || bound_net == net; |