Merge pull request #10944 from maciejbocianski/i2c_fpga_test_update

Update I2CTester for fpga-ci-test-shield

Author: 0xc0170

components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/I2CTester.cpp

@@ -62,6 +62,14 @@ uint32_t I2CTester::get_receive_checksum()
     return to_slave_checksum;
 }
 
+uint32_t I2CTester::get_send_checksum()
+{
+    uint32_t from_slave_checksum = 0;
+    MBED_ASSERT(sizeof(from_slave_checksum) == TESTER_I2C_FROM_SLAVE_CHECKSUM_SIZE);
+    read(TESTER_I2C_FROM_SLAVE_CHECKSUM, (uint8_t *)&from_slave_checksum, sizeof(from_slave_checksum));
+    return from_slave_checksum;
+}
+
 uint8_t I2CTester::state_num()
 {
     uint8_t state_num = 0;
@@ -71,9 +79,16 @@ uint8_t I2CTester::state_num()
 
 uint8_t I2CTester::num_dev_addr_matches()
 {
-    uint8_t num_correct = 0;
-    read(TESTER_I2C_NUMBER_DEV_ADDR_MATCHES, &num_correct, sizeof(num_correct));
-    return num_correct;
+    uint8_t num_dev_addr_matches = 0;
+    read(TESTER_I2C_NUMBER_DEV_ADDR_MATCHES, &num_dev_addr_matches, sizeof(num_dev_addr_matches));
+    return num_dev_addr_matches;
+}
+
+uint8_t I2CTester::num_dev_addr_mismatches()
+{
+    uint8_t num_dev_addr_mismatches = 0;
+    read(TESTER_I2C_NUMBER_DEV_ADDR_MISMATCHES, &num_dev_addr_mismatches, sizeof(num_dev_addr_mismatches));
+    return num_dev_addr_mismatches;
 }
 
 void I2CTester::set_device_address(uint16_t addr)

components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/I2CTester.h

@@ -61,10 +61,10 @@ class I2CTester: public MbedTester {
     uint16_t num_nacks();
 
     /**
-     * Read the number of transfers which have occurred, not including the device address byte
+     * Read the number of transfers which have occurred
      *
      * @return The number of I2C transfers that have completed since
-     *         i2c was reset, not including the device address byte
+     *         i2c was reset, including the device address byte.
      */
     uint16_t transfer_count();
 
@@ -75,6 +75,13 @@ class I2CTester: public MbedTester {
      */
     uint32_t get_receive_checksum();
 
+    /**
+     * Read a checksum the tester calculated for data it has already sent
+     *
+     * @return The sum of all bytes the tester has sent since reset
+     */
+    uint32_t get_send_checksum();
+
     /**
      * Get the I2C slave state number
      *
@@ -89,6 +96,13 @@ class I2CTester: public MbedTester {
      */
     uint8_t num_dev_addr_matches();
 
+    /**
+     * Get the number of times the device address has been sent incorrectly
+     *
+     * @return The number of times the device address has been sent incorrectly
+     */
+    uint8_t num_dev_addr_mismatches();
+
     /**
      * Set the I2C slave device address
      *
@@ -153,7 +167,7 @@ class I2CTester: public MbedTester {
     uint8_t get_next_from_slave();
 
     /**
-     * Read the number of writes which have occurred, not including the device address byte
+     * Read the number of writes which have occurred
      *
      * @return The number of I2C writes that have completed since
      *         i2c was reset, not including the device address byte
@@ -164,7 +178,7 @@ class I2CTester: public MbedTester {
      * Read the number of reads which have occurred
      *
      * @return The number of I2C reads that have completed since
-     *         i2c was reset
+     *         i2c was reset, not including the device address byte
      */
     uint16_t num_reads();
 

components/testing/COMPONENT_FPGA_CI_TEST_SHIELD/fpga_config.h

@@ -192,3 +192,7 @@
 #define TESTER_I2C_NEXT_FROM_SLAVE                    (0x015 + 0x00105000)
 #define TESTER_I2C_NUM_WRITES                         (0x016 + 0x00105000)
 #define TESTER_I2C_NUM_READS                          (0x018 + 0x00105000)
+#define TESTER_I2C_FROM_SLAVE_CHECKSUM                (0x01A + 0x00105000)
+#define TESTER_I2C_FROM_SLAVE_CHECKSUM_SIZE           4
+#define TESTER_I2C_NUMBER_DEV_ADDR_MISMATCHES         (0x01E + 0x00105000)
+#define TESTER_I2C_NUMBER_DEV_ADDR_MISMATCHES_SIZE    1