diff options
| author | gatecat <gatecat@ds0.me> | 2022-01-19 13:22:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 13:22:40 +0000 |
| commit | fbeef2b8c2734210a70e51a3ac629c2065c06d19 (patch) | |
| tree | 9f0aa005ecfbb5a22a14c377a3d663465639a5a7 /mistral/arch.h | |
| parent | 58a1b473b85ae8bc4312eed14af1829b93958341 (diff) | |
| parent | 27d38de612ce4109723704f863ac82a6cbddf10c (diff) | |
| download | nextpnr-fbeef2b8c2734210a70e51a3ac629c2065c06d19.tar.gz nextpnr-fbeef2b8c2734210a70e51a3ac629c2065c06d19.tar.bz2 nextpnr-fbeef2b8c2734210a70e51a3ac629c2065c06d19.zip | |
Merge pull request #895 from galibert/master
Sync with the current state of mistral
Diffstat (limited to 'mistral/arch.h')
| -rw-r--r-- | mistral/arch.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mistral/arch.h b/mistral/arch.h index 471b5251..e931df2d 100644 --- a/mistral/arch.h +++ b/mistral/arch.h @@ -461,10 +461,9 @@ struct Arch : BaseArch<ArchRanges> void add_bel_pin(BelId bel, IdString pin, PortType dir, WireId wire); - WireId get_port(CycloneV::block_type_t bt, int x, int y, int bi, CycloneV::port_type_t port, int pi = -1) const - { - return WireId(cyclonev->pnode_to_rnode(CycloneV::pnode(bt, x, y, port, bi, pi))); - } + CycloneV::rnode_t find_rnode(CycloneV::block_type_t bt, int x, int y, CycloneV::port_type_t port, int bi = -1, int pi = -1) const; + WireId get_port(CycloneV::block_type_t bt, int x, int y, int bi, CycloneV::port_type_t port, int pi = -1) const; + bool has_port(CycloneV::block_type_t bt, int x, int y, int bi, CycloneV::port_type_t port, int pi = -1) const; void create_lab(int x, int y, bool is_mlab); // lab.cc void create_gpio(int x, int y); // io.cc @@ -562,7 +561,6 @@ struct Arch : BaseArch<ArchRanges> // ------------------------------------------------- - void init_base_bitstream(); // base_bitstream.cc void build_bitstream(); // bitstream.cc }; |