Skip to content

Commit 7a81783

Browse files
committed
Remove const suffix
1 parent 3664ce9 commit 7a81783

File tree

1 file changed

+9
-10
lines changed
  • features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source

1 file changed

+9
-10
lines changed

features/frameworks/COMPONENT_FPGA_CI_TEST_SHIELD/source/MbedTester.cpp

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,11 @@
2929
namespace {
3030
const auto physical_pins = 128;
3131
const auto logical_pins = 8;
32-
const auto firmware_size_const = 2192012;
3332
const auto firmware_region_size = 0x220000;
3433
const auto firmware_header_size = 0x10000;
3534
const auto flash_sector_size = 0x1000;
3635
const auto length_size = 0x4;
37-
const auto crc_size_const = 0x4;
36+
const auto fixed_crc_size = 0x4;
3837
const auto flash_spi_freq_hz = 2000000;
3938
const auto analog_count = 4;
4039

@@ -694,10 +693,10 @@ bool MbedTester::firmware_dump(mbed::FileHandle *dest, mbed::Callback<void(uint8
694693
(buf[1] << (1 * 8)) |
695694
(buf[2] << (2 * 8)) |
696695
(buf[3] << (3 * 8));
697-
if (data_size > firmware_region_size - length_size - crc_size_const) {
698-
data_size = firmware_region_size - length_size - crc_size_const;
696+
if (data_size > firmware_region_size - length_size - fixed_crc_size) {
697+
data_size = firmware_region_size - length_size - fixed_crc_size;
699698
}
700-
const uint32_t firmware_size = data_size + length_size + crc_size_const;
699+
const uint32_t firmware_size = data_size + length_size + fixed_crc_size;
701700

702701
// Dump firmware
703702
while (offset < firmware_size) {
@@ -809,7 +808,7 @@ bool MbedTester::firmware_update(mbed::FileHandle *src, mbed::Callback<void(uint
809808
sys_pin_mode_disabled();
810809
return false;
811810
}
812-
if (file_size < length_size + crc_size_const) {
811+
if (file_size < length_size + fixed_crc_size) {
813812
// Firmware image too small
814813
sys_pin_mode_disabled();
815814
return false;
@@ -865,7 +864,7 @@ bool MbedTester::firmware_update(mbed::FileHandle *src, mbed::Callback<void(uint
865864
(buf[1] << (1 * 8)) |
866865
(buf[2] << (2 * 8)) |
867866
(buf[3] << (3 * 8));
868-
if (data_size != file_size - length_size - crc_size_const) {
867+
if (data_size != file_size - length_size - fixed_crc_size) {
869868
// Invalid data length
870869
sys_pin_mode_disabled();
871870
return false;
@@ -876,10 +875,10 @@ bool MbedTester::firmware_update(mbed::FileHandle *src, mbed::Callback<void(uint
876875
crc_offset += length_size;
877876
crc_size -= length_size;
878877
}
879-
if (offset + program_size > file_size - crc_size_const) {
878+
if (offset + program_size > file_size - fixed_crc_size) {
880879
// Overlap with the CRC field
881-
for (uint32_t i = 0; i < crc_size_const; i++) {
882-
uint32_t byte_offset = file_size - crc_size_const + i;
880+
for (uint32_t i = 0; i < fixed_crc_size; i++) {
881+
uint32_t byte_offset = file_size - fixed_crc_size + i;
883882
if ((byte_offset >= offset) && (byte_offset < offset + program_size)) {
884883
uint32_t buf_pos = byte_offset - offset;
885884
stored_crc |= buf[buf_pos] << (i * 8);

0 commit comments

Comments
 (0)