From 07e858535888534aecd176ecd226315f1898093b Mon Sep 17 00:00:00 2001 From: Russ Butler Date: Thu, 11 Jul 2019 16:13:54 +0100 Subject: [PATCH] Fix FPGA CI Test Shield warnings Fix warnings due to unused variables, comparison between signed and unsigned. This patch also re-enables I2C asserts that were disabled during early development. --- .../COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp b/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp index fe7d4c8089..f84c505afa 100644 --- a/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp +++ b/components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/MbedTester.cpp @@ -536,8 +536,6 @@ static bool _firmware_header_valid(BlockDevice &flash, bool &valid) static bool _firmware_get_active_bank(BlockDevice &flash, bool &second_bank_active) { uint8_t buf[sizeof(SYNC_WORD)]; - size_t pos = 0; - size_t read_size; if (flash.read(buf, FLASH_SECTOR_SIZE - sizeof(SYNC_WORD), sizeof(SYNC_WORD)) != BD_ERROR_OK) { return false; @@ -708,7 +706,7 @@ bool MbedTester::firmware_dump(mbed::FileHandle *dest, mbed::Callbackwrite(buf, read_size); - if (write_size != read_size) { + if ((uint32_t)write_size != read_size) { sys_pin_mode_disabled(); return false; } @@ -761,7 +759,7 @@ bool MbedTester::firmware_dump_all(mbed::FileHandle *dest, mbed::Callbackwrite(buf, read_size); - if (write_size != read_size) { + if ((uint32_t)write_size != read_size) { sys_pin_mode_disabled(); return false; } @@ -1154,7 +1152,7 @@ uint8_t MbedTester::io_expander_read_index(int index, IOExpanderReg reg_type) } int read_success = io_expander_i2c_read(i2c_index, dev_addr, reg, read_byte, 1); - // MBED_ASSERT(read_success == 0); + MBED_ASSERT(read_success == 0); uint8_t bit = (read_byte[0] & (1 << reg_bit)) >> reg_bit; return bit; } @@ -1489,7 +1487,7 @@ uint8_t MbedTester::io_expander_read_bb(PinName pin, IOExpanderReg reg_type) } int read_success = io_expander_i2c_read_bb(sda, scl, dev_addr, reg, read_byte, 1); - // MBED_ASSERT(read_success == 0); + MBED_ASSERT(read_success == 0); uint8_t bit = (read_byte[0] & (1 << reg_bit)) >> reg_bit; return bit; }