From 66f28161469730582bbc98c89bc5ae3b8a1d8ff5 Mon Sep 17 00:00:00 2001 From: John McMaster Date: Mon, 10 Dec 2018 17:20:11 -0800 Subject: [PATCH] make format deltas Signed-off-by: John McMaster --- .../prjxray/xilinx/xc7series/configuration_bus.h | 2 +- .../prjxray/xilinx/xc7series/global_clock_region.h | 2 +- lib/include/prjxray/xilinx/xc7series/row.h | 2 +- lib/xilinx/xc7series/configuration_test.cc | 12 ++++-------- tools/xc7patch.cc | 2 +- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/lib/include/prjxray/xilinx/xc7series/configuration_bus.h b/lib/include/prjxray/xilinx/xc7series/configuration_bus.h index 8b3e9bdf..06ab3454 100644 --- a/lib/include/prjxray/xilinx/xc7series/configuration_bus.h +++ b/lib/include/prjxray/xilinx/xc7series/configuration_bus.h @@ -60,7 +60,7 @@ ConfigurationBus::ConfigurationBus(T first, T last) { std::sort(first, last, [](const FrameAddress& lhs, const FrameAddress& rhs) { return lhs.column() < rhs.column(); - }); + }); for (auto col_first = first; col_first != last;) { auto col_last = std::upper_bound( diff --git a/lib/include/prjxray/xilinx/xc7series/global_clock_region.h b/lib/include/prjxray/xilinx/xc7series/global_clock_region.h index 39747f3b..9372948a 100644 --- a/lib/include/prjxray/xilinx/xc7series/global_clock_region.h +++ b/lib/include/prjxray/xilinx/xc7series/global_clock_region.h @@ -61,7 +61,7 @@ GlobalClockRegion::GlobalClockRegion(T first, T last) { std::sort(first, last, [](const FrameAddress& lhs, const FrameAddress& rhs) { return lhs.row() < rhs.row(); - }); + }); for (auto row_first = first; row_first != last;) { auto row_last = std::upper_bound( diff --git a/lib/include/prjxray/xilinx/xc7series/row.h b/lib/include/prjxray/xilinx/xc7series/row.h index 8dd8d9cc..d5b30215 100644 --- a/lib/include/prjxray/xilinx/xc7series/row.h +++ b/lib/include/prjxray/xilinx/xc7series/row.h @@ -58,7 +58,7 @@ Row::Row(T first, T last) { std::sort(first, last, [](const FrameAddress& lhs, const FrameAddress& rhs) { return lhs.block_type() < rhs.block_type(); - }); + }); for (auto bus_first = first; bus_first != last;) { auto bus_last = std::upper_bound( diff --git a/lib/xilinx/xc7series/configuration_test.cc b/lib/xilinx/xc7series/configuration_test.cc index 4b94e583..914b42fe 100644 --- a/lib/xilinx/xc7series/configuration_test.cc +++ b/lib/xilinx/xc7series/configuration_test.cc @@ -43,14 +43,12 @@ TEST(ConfigurationTest, ConstructFromPacketsWithSingleFrame) { { static_cast(0x1), xc7series::ConfigurationPacket::Opcode::Write, - xc7series::ConfigurationRegister::CMD, - absl::MakeSpan(cmd), + xc7series::ConfigurationRegister::CMD, absl::MakeSpan(cmd), }, { static_cast(0x1), xc7series::ConfigurationPacket::Opcode::Write, - xc7series::ConfigurationRegister::FDRI, - absl::MakeSpan(frame), + xc7series::ConfigurationRegister::FDRI, absl::MakeSpan(frame), }, }; @@ -96,14 +94,12 @@ TEST(ConfigurationTest, ConstructFromPacketsWithAutoincrement) { { static_cast(0x1), xc7series::ConfigurationPacket::Opcode::Write, - xc7series::ConfigurationRegister::CMD, - absl::MakeSpan(cmd), + xc7series::ConfigurationRegister::CMD, absl::MakeSpan(cmd), }, { static_cast(0x1), xc7series::ConfigurationPacket::Opcode::Write, - xc7series::ConfigurationRegister::FDRI, - absl::MakeSpan(frame), + xc7series::ConfigurationRegister::FDRI, absl::MakeSpan(frame), }, }; diff --git a/tools/xc7patch.cc b/tools/xc7patch.cc index d82b2869..318b193f 100644 --- a/tools/xc7patch.cc +++ b/tools/xc7patch.cc @@ -84,7 +84,7 @@ int patch_frames( frame_data_strings.end(), frame_data.begin(), [](const std::string& val) -> uint32_t { return std::stoul(val, nullptr, 16); - }); + }); uint32_t ecc = 0; for (size_t ii = 0; ii < frame_data.size(); ++ii) {