Skip to content

Commit 0275aed

Browse files
Apply clang-format --style=Google
1 parent 0a11c50 commit 0275aed

File tree

2 files changed

+22
-21
lines changed

2 files changed

+22
-21
lines changed

src/pflib/ECON.cxx

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -256,16 +256,16 @@ std::map<int, std::map<int, uint8_t>> ECON::getRegisters(
256256
// sort the addresses
257257
std::sort(addresses.begin(), addresses.end());
258258
// remove duplicates if any
259-
addresses.erase(std::unique(addresses.begin(), addresses.end()), addresses.end());
260-
261-
for (size_t i = 0; i < addresses.size(); ) {
259+
addresses.erase(std::unique(addresses.begin(), addresses.end()),
260+
addresses.end());
261+
262+
for (size_t i = 0; i < addresses.size();) {
262263
int start_addr = addresses[i];
263264
int end_addr = addresses[i];
264265
size_t j = i + 1;
265-
266+
266267
// Extend batch while addresses are close together
267-
while (j < addresses.size() &&
268-
addresses[j] - end_addr <= MAX_READ_GAP &&
268+
while (j < addresses.size() && addresses[j] - end_addr <= MAX_READ_GAP &&
269269
addresses[j] - start_addr < MAX_BATCH_SIZE) {
270270
end_addr = addresses[j];
271271
j++;
@@ -288,20 +288,19 @@ std::map<int, std::map<int, uint8_t>> ECON::getRegisters(
288288
}
289289
// sort the addresses
290290
std::sort(addresses.begin(), addresses.end());
291-
291+
292292
// Batch read the selected addresses
293-
for (size_t i = 0; i < addresses.size(); ) {
293+
for (size_t i = 0; i < addresses.size();) {
294294
int start_addr = addresses[i];
295295
int end_addr = addresses[i];
296296
size_t j = i + 1;
297-
298-
while (j < addresses.size() &&
299-
addresses[j] - end_addr <= MAX_READ_GAP &&
297+
298+
while (j < addresses.size() && addresses[j] - end_addr <= MAX_READ_GAP &&
300299
addresses[j] - start_addr < MAX_BATCH_SIZE) {
301300
end_addr = addresses[j];
302301
j++;
303302
}
304-
303+
305304
auto batch_result = readRegisterRange(start_addr, end_addr);
306305
for (const auto& [addr, val] : batch_result) {
307306
if (reg_map.find(addr) != reg_map.end()) {
@@ -310,11 +309,11 @@ std::map<int, std::map<int, uint8_t>> ECON::getRegisters(
310309
}
311310
// advance to next batch
312311
i = j;
313-
} // end loop on batches
314-
} // end else selected not empty
312+
} // end loop on batches
313+
} // end else selected not empty
315314

316315
return chip_reg;
317-
} // end of ECON::getRegisters
316+
} // end of ECON::getRegisters
318317

319318
std::map<int, std::map<int, uint8_t>> ECON::applyParameters(
320319
const std::map<std::string, std::map<std::string, uint64_t>>& parameters) {
@@ -416,7 +415,7 @@ uint64_t ECON::readParameter(const std::string& page, const std::string& param,
416415
std::map<int, uint8_t> ECON::readRegisterRange(int start_addr, int end_addr) {
417416
int total_bytes = end_addr - start_addr + 1;
418417
std::vector<uint8_t> values = getValues(start_addr, total_bytes);
419-
418+
420419
std::map<int, uint8_t> result;
421420
for (int i = 0; i < total_bytes; i++) {
422421
result[start_addr + i] = values[i];

src/pflib/bittware/bittware_axilite.cxx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ AxiLite::AxiLite(const uint32_t base_address, const char* dev,
2121
: dev_{dev},
2222
base_{base_address | 0x00c00000},
2323
mask_{mask_space & 0xFFFFFFFCu},
24-
antimask_{0xFFFFFFFFu ^ mask_}, waswrite_{true} {
24+
antimask_{0xFFFFFFFFu ^ mask_},
25+
waswrite_{true} {
2526
auto ptr = handle_map.find(dev);
2627
if (ptr != handle_map.end())
2728
handle_ = ptr->second;
@@ -49,9 +50,10 @@ uint32_t AxiLite::read(uint32_t addr) {
4950
"Address 0x%0x is invalid", addr));
5051
}
5152
uint32_t val;
52-
if (waswrite_) { // seem to need this double read, would be good to fix at firmware level...
53-
dmaReadRegister(handle_, base_ | addr, &val);
54-
waswrite_=false;
53+
if (waswrite_) { // seem to need this double read, would be good to fix at
54+
// firmware level...
55+
dmaReadRegister(handle_, base_ | addr, &val);
56+
waswrite_ = false;
5557
}
5658
dmaReadRegister(handle_, base_ | addr, &val);
5759
return val;
@@ -63,7 +65,7 @@ void AxiLite::write(uint32_t addr, uint32_t val) {
6365
"Address 0x%0x is invalid", addr));
6466
}
6567
dmaWriteRegister(handle_, base_ | addr, val);
66-
waswrite_=true;
68+
waswrite_ = true;
6769
}
6870

6971
static int first_bit_set(uint32_t mask) {

0 commit comments

Comments
 (0)