Skip to content

Commit

Permalink
make format all files.
Browse files Browse the repository at this point in the history
Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
  • Loading branch information
mithro committed Dec 14, 2018
1 parent efe1b54 commit a445eed
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 8 deletions.
1 change: 1 addition & 0 deletions fuzzers/074-dump_all/reduce_tile_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

from prxray import xjson


def check_and_strip_prefix(name, prefix):
assert name.startswith(prefix), repr((name, prefix))
return name[len(prefix):]
Expand Down
2 changes: 1 addition & 1 deletion lib/include/prjxray/xilinx/xc7series/configuration_bus.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion lib/include/prjxray/xilinx/xc7series/global_clock_region.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion lib/include/prjxray/xilinx/xc7series/row.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
12 changes: 8 additions & 4 deletions lib/xilinx/xc7series/configuration_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ TEST(ConfigurationTest, ConstructFromPacketsWithSingleFrame) {
{
static_cast<unsigned int>(0x1),
xc7series::ConfigurationPacket::Opcode::Write,
xc7series::ConfigurationRegister::CMD, absl::MakeSpan(cmd),
xc7series::ConfigurationRegister::CMD,
absl::MakeSpan(cmd),
},
{
static_cast<unsigned int>(0x1),
xc7series::ConfigurationPacket::Opcode::Write,
xc7series::ConfigurationRegister::FDRI, absl::MakeSpan(frame),
xc7series::ConfigurationRegister::FDRI,
absl::MakeSpan(frame),
},
};

Expand Down Expand Up @@ -94,12 +96,14 @@ TEST(ConfigurationTest, ConstructFromPacketsWithAutoincrement) {
{
static_cast<unsigned int>(0x1),
xc7series::ConfigurationPacket::Opcode::Write,
xc7series::ConfigurationRegister::CMD, absl::MakeSpan(cmd),
xc7series::ConfigurationRegister::CMD,
absl::MakeSpan(cmd),
},
{
static_cast<unsigned int>(0x1),
xc7series::ConfigurationPacket::Opcode::Write,
xc7series::ConfigurationRegister::FDRI, absl::MakeSpan(frame),
xc7series::ConfigurationRegister::FDRI,
absl::MakeSpan(frame),
},
};

Expand Down
2 changes: 1 addition & 1 deletion tools/xc7patch.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit a445eed

Please sign in to comment.