diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-17 19:28:03 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-17 19:28:03 +0200 |
| commit | 0b2345996dd6b0318e5c794c0fcb8921dc6e4427 (patch) | |
| tree | 8927c5e090e36679689345ad1128f4978eb53d07 | |
| parent | 3cfd6841dc2ae0fa0390dd9379c8434e42a12dee (diff) | |
| download | nextpnr-0b2345996dd6b0318e5c794c0fcb8921dc6e4427.tar.gz nextpnr-0b2345996dd6b0318e5c794c0fcb8921dc6e4427.tar.bz2 nextpnr-0b2345996dd6b0318e5c794c0fcb8921dc6e4427.zip | |
Updates from clangformat
Signed-off-by: Clifford Wolf <clifford@clifford.at>
| -rw-r--r-- | frontend/json/jsonparse.cc | 7 | ||||
| -rw-r--r-- | ice40/chip.cc | 15 |
2 files changed, 13 insertions, 9 deletions
diff --git a/frontend/json/jsonparse.cc b/frontend/json/jsonparse.cc index 3c060fd7..0b06f980 100644 --- a/frontend/json/jsonparse.cc +++ b/frontend/json/jsonparse.cc @@ -741,10 +741,9 @@ void json_import(Design *design, string modname, JsonNode *node) netnames.resize(netid + 1); netnames.at(netid) = basename + - (num_bits == 1 - ? "" - : std::string("[") + std::to_string(i) + - std::string("]")); + (num_bits == 1 ? "" : std::string("[") + + std::to_string(i) + + std::string("]")); } } } diff --git a/ice40/chip.cc b/ice40/chip.cc index 23f6ba3a..7074070e 100644 --- a/ice40/chip.cc +++ b/ice40/chip.cc @@ -83,23 +83,28 @@ Chip::Chip(ChipArgs args) : args(args) #ifdef ICE40_HX1K_ONLY if (args.type == ChipArgs::HX1K) { chip_info = - reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_1k)->get(); + reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_1k) + ->get(); } else { log_error("Unsupported iCE40 chip type.\n"); } #else if (args.type == ChipArgs::LP384) { chip_info = - reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_384)->get(); + reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_384) + ->get(); } else if (args.type == ChipArgs::LP1K || args.type == ChipArgs::HX1K) { chip_info = - reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_1k)->get(); + reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_1k) + ->get(); } else if (args.type == ChipArgs::UP5K) { chip_info = - reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_5k)->get(); + reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_5k) + ->get(); } else if (args.type == ChipArgs::LP8K || args.type == ChipArgs::HX8K) { chip_info = - reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_8k)->get(); + reinterpret_cast<const RelPtr<ChipInfoPOD> *>(chipdb_blob_8k) + ->get(); } else { log_error("Unsupported iCE40 chip type.\n"); } |