From 351ca3b5eac472b4bd08b11a4aa6fb67e545eda3 Mon Sep 17 00:00:00 2001 From: Keith Rothman <537074+litghost@users.noreply.github.com> Date: Mon, 15 Mar 2021 10:25:46 -0700 Subject: Use NEXTPNR_NAMESPACE macro's now that headers are seperated. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com> --- fpga_interchange/arch.cc | 2 +- fpga_interchange/arch.h | 2 +- fpga_interchange/luts.cc | 2 +- fpga_interchange/luts.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'fpga_interchange') 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 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 *result, const LutBel &lut_bel, - const nextpnr::DynamicBitarray<> &old_equation, const std::vector &pin_map, + const DynamicBitarray<> &old_equation, const std::vector &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 pins; std::unordered_set lut_pins; std::unordered_set 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 *result, const LutBel &lut_bel, - const nextpnr::DynamicBitarray<> &old_equation, const std::vector &pin_map, + const DynamicBitarray<> &old_equation, const std::vector &pin_map, uint32_t used_pins); NEXTPNR_NAMESPACE_END -- cgit v1.2.3