diff options
| author | Keith Rothman <537074+litghost@users.noreply.github.com> | 2021-03-15 10:25:46 -0700 |
|---|---|---|
| committer | gatecat <gatecat@ds0.me> | 2021-03-15 18:49:12 +0000 |
| commit | 351ca3b5eac472b4bd08b11a4aa6fb67e545eda3 (patch) | |
| tree | 25817e9ea10d339bf4c127b0a082cc5ac9a51deb /fpga_interchange | |
| parent | a8e35062c6a1a21838346dd7536bb2fcc7f820ed (diff) | |
| download | nextpnr-351ca3b5eac472b4bd08b11a4aa6fb67e545eda3.tar.gz nextpnr-351ca3b5eac472b4bd08b11a4aa6fb67e545eda3.tar.bz2 nextpnr-351ca3b5eac472b4bd08b11a4aa6fb67e545eda3.zip | |
Use NEXTPNR_NAMESPACE macro's now that headers are seperated.
Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
Diffstat (limited to 'fpga_interchange')
| -rw-r--r-- | fpga_interchange/arch.cc | 2 | ||||
| -rw-r--r-- | fpga_interchange/arch.h | 2 | ||||
| -rw-r--r-- | fpga_interchange/luts.cc | 2 | ||||
| -rw-r--r-- | fpga_interchange/luts.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/fpga_interchange/arch.cc b/fpga_interchange/arch.cc index e9dee580..3839f579 100644 --- a/fpga_interchange/arch.cc +++ b/fpga_interchange/arch.cc @@ -1267,7 +1267,7 @@ void Arch::report_invalid_bel(BelId bel, CellInfo *cell) const nameOfBel(bel), mapping); } -void Arch::read_lut_equation(nextpnr::DynamicBitarray<> *equation, const Property &equation_parameter) const +void Arch::read_lut_equation(DynamicBitarray<> *equation, const Property &equation_parameter) const { equation->fill(false); std::string eq_str = equation_parameter.as_string(); diff --git a/fpga_interchange/arch.h b/fpga_interchange/arch.h index a171ba55..05bc1a94 100644 --- a/fpga_interchange/arch.h +++ b/fpga_interchange/arch.h @@ -1737,7 +1737,7 @@ struct Arch : ArchAPI<ArchRanges> std::regex raw_bin_constant; std::regex verilog_bin_constant; std::regex verilog_hex_constant; - void read_lut_equation(nextpnr::DynamicBitarray<> *equation, const Property &equation_parameter) const; + void read_lut_equation(DynamicBitarray<> *equation, const Property &equation_parameter) const; bool route_vcc_to_unused_lut_pins(); }; diff --git a/fpga_interchange/luts.cc b/fpga_interchange/luts.cc index 49f934a4..6e24847f 100644 --- a/fpga_interchange/luts.cc +++ b/fpga_interchange/luts.cc @@ -25,7 +25,7 @@ NEXTPNR_NAMESPACE_BEGIN bool rotate_and_merge_lut_equation(std::vector<LogicLevel> *result, const LutBel &lut_bel, - const nextpnr::DynamicBitarray<> &old_equation, const std::vector<int32_t> &pin_map, + const DynamicBitarray<> &old_equation, const std::vector<int32_t> &pin_map, uint32_t used_pins) { // pin_map maps pin indicies from the old pin to the new pin. diff --git a/fpga_interchange/luts.h b/fpga_interchange/luts.h index 333df36e..3500c9d3 100644 --- a/fpga_interchange/luts.h +++ b/fpga_interchange/luts.h @@ -46,7 +46,7 @@ struct LutCell std::vector<IdString> pins; std::unordered_set<IdString> lut_pins; std::unordered_set<IdString> vcc_pins; - nextpnr::DynamicBitarray<> equation; + DynamicBitarray<> equation; }; struct LutBel @@ -94,7 +94,7 @@ struct LutMapper // // If a conflict arises, return false and result is in an indeterminate state. bool rotate_and_merge_lut_equation(std::vector<LogicLevel> *result, const LutBel &lut_bel, - const nextpnr::DynamicBitarray<> &old_equation, const std::vector<size_t> &pin_map, + const DynamicBitarray<> &old_equation, const std::vector<size_t> &pin_map, uint32_t used_pins); NEXTPNR_NAMESPACE_END |