diff --git a/firmware/ec/src/devices/ocmp_wrappers/ocmp_cat24c04.c b/firmware/ec/src/devices/ocmp_wrappers/ocmp_cat24c04.c index 96615119e9..4e6e3fe9bc 100644 --- a/firmware/ec/src/devices/ocmp_wrappers/ocmp_cat24c04.c +++ b/firmware/ec/src/devices/ocmp_wrappers/ocmp_cat24c04.c @@ -49,7 +49,7 @@ static bool _sid_get_status_parameters_data(void *driver, unsigned int param, status = RETURN_NOTOK; } } - return status; + return (status == RETURN_OK); } /***************************************************************************** diff --git a/firmware/ec/test/include/test_PCA9557.h b/firmware/ec/test/include/test_PCA9557.h index c8dc9c658b..ba16c76bf1 100644 --- a/firmware/ec/test/include/test_PCA9557.h +++ b/firmware/ec/test/include/test_PCA9557.h @@ -10,7 +10,6 @@ #define _TEST_PCA9557_H #include "drivers/GpioPCA9557.h" -#include typedef enum PCA9557Regs { PCA9557_REGS_INPUT_VALUE = 0x00, diff --git a/firmware/ec/test/include/test_eeprom.h b/firmware/ec/test/include/test_eeprom.h index f1ba7a8ba3..13d926d1d1 100644 --- a/firmware/ec/test/include/test_eeprom.h +++ b/firmware/ec/test/include/test_eeprom.h @@ -50,7 +50,7 @@ #define EEPROM_ASCII_VAL_11 0x3131 #define EEPROM_BIG_WRITE_SIZE 0xCA #define EEPROM_BOARD_SIZE 36 -#define EEPROM_DEFUALT_VALUE_NULL 0x0000 +#define EEPROM_DEFAULT_VALUE_NULL 0x0000 #define EEPROM_DEVICE_SIZE 10 #define EEPROM_DISABLE 0x00 #define EEPROM_DISABLE_FE_WRITE 0x01 diff --git a/firmware/ec/test/suites/Test_eeprom.c b/firmware/ec/test/suites/Test_eeprom.c index 1650ce5dcf..1d731201f6 100644 --- a/firmware/ec/test/suites/Test_eeprom.c +++ b/firmware/ec/test/suites/Test_eeprom.c @@ -99,28 +99,28 @@ void test_eeprom_read(void) TEST_ASSERT_EQUAL_HEX(EEPROM_READ_WRITE_VALUE, buffer); /* Checking for NULL cfg */ - buffer = EEPROM_DEFUALT_VALUE_NULL; + buffer = EEPROM_DEFAULT_VALUE_NULL; EEPROM_regs[EEPROM_REG_SERIAL_INFO_1] = EEPROM_READ_WRITE_VALUE; TEST_ASSERT_EQUAL(RETURN_NOTOK, eeprom_read(e_invalid_cfg, OC_CONNECT1_SERIAL_INFO, &buffer, sizeof(buffer))); /* Checking with invalid slave address */ - buffer = EEPROM_DEFUALT_VALUE_NULL; + buffer = EEPROM_DEFAULT_VALUE_NULL; EEPROM_regs[EEPROM_REG_SERIAL_INFO_1] = EEPROM_READ_WRITE_VALUE; TEST_ASSERT_EQUAL(RETURN_NOTOK, eeprom_read(&e_invalid_dev, OC_CONNECT1_SERIAL_INFO, &buffer, sizeof(buffer))); /* Checking with invalid bus address */ - buffer = EEPROM_DEFUALT_VALUE_NULL; + buffer = EEPROM_DEFAULT_VALUE_NULL; EEPROM_regs[EEPROM_REG_SERIAL_INFO_1] = EEPROM_READ_WRITE_VALUE; TEST_ASSERT_EQUAL(RETURN_NOTOK, eeprom_read(&e_invalid_bus, OC_CONNECT1_SERIAL_INFO, &buffer, sizeof(buffer))); /* Checking with 0xFFFF register */ - buffer = EEPROM_DEFUALT_VALUE_NULL; + buffer = EEPROM_DEFAULT_VALUE_NULL; EEPROM_regs[EEPROM_REG_FFFF] = EEPROM_READ_WRITE_VALUE; TEST_ASSERT_EQUAL(RETURN_OK, eeprom_read(&eeprom_gbc_sid, EEPROM_REG_FFFF, &buffer, sizeof(buffer))); @@ -130,7 +130,7 @@ void test_eeprom_read(void) void test_eeprom_write(void) { uint16_t buffer = EEPROM_READ_WRITE_VALUE; - EEPROM_regs[EEPROM_REG_SERIAL_INFO_1] = EEPROM_DEFUALT_VALUE_NULL; + EEPROM_regs[EEPROM_REG_SERIAL_INFO_1] = EEPROM_DEFAULT_VALUE_NULL; TEST_ASSERT_EQUAL(RETURN_OK, eeprom_write(&eeprom_gbc_inv, OC_CONNECT1_SERIAL_INFO, @@ -139,7 +139,7 @@ void test_eeprom_write(void) EEPROM_regs[EEPROM_REG_SERIAL_INFO_1]); /* Test with size > page_size */ - EEPROM_regs[EEPROM_REG_SERIAL_INFO_1] = EEPROM_DEFUALT_VALUE_NULL; + EEPROM_regs[EEPROM_REG_SERIAL_INFO_1] = EEPROM_DEFAULT_VALUE_NULL; TEST_ASSERT_EQUAL(RETURN_OK, eeprom_write(&eeprom_gbc_inv, OC_CONNECT1_SERIAL_INFO, &buffer, EEPROM_BIG_WRITE_SIZE)); @@ -201,7 +201,7 @@ void test_eeprom_read_board_info(void) EEPROM_regs[EEPROM_REG_BOARD_INFO_7] = EEPROM_ASCII_VAL_BC; EEPROM_regs[EEPROM_REG_BOARD_INFO_8] = EEPROM_ASCII_VAL_00; EEPROM_regs[EEPROM_REG_BOARD_INFO_9] = EEPROM_ASCII_VAL_41; - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(RETURN_OK, eeprom_read_board_info(&eeprom_gbc_inv, buffer)); @@ -216,7 +216,7 @@ void test_eeprom_read_board_info(void) EEPROM_regs[EEPROM_REG_BOARD_INFO_7] = EEPROM_ASCII_VAL_DR; EEPROM_regs[EEPROM_REG_BOARD_INFO_8] = EEPROM_ASCII_VAL_00; EEPROM_regs[EEPROM_REG_BOARD_INFO_9] = EEPROM_ASCII_VAL_32; - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(RETURN_OK, eeprom_read_board_info(&eeprom_sdr_inv, buffer)); TEST_ASSERT_EQUAL_STRING(EEPROM_SDR_BOARD_INFO, buffer); @@ -230,31 +230,31 @@ void test_eeprom_read_board_info(void) EEPROM_regs[EEPROM_REG_BOARD_INFO_7] = EEPROM_ASCII_VAL_E0; EEPROM_regs[EEPROM_REG_BOARD_INFO_8] = EEPROM_ASCII_VAL_00; EEPROM_regs[EEPROM_REG_BOARD_INFO_9] = EEPROM_ASCII_VAL_05; - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(RETURN_OK, eeprom_read_board_info(&eeprom_fe_inv, buffer)); TEST_ASSERT_EQUAL_STRING(EEPROM_FE_BOARD_INFO, buffer); /* Checking for invalid subsystem cfg */ - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(RETURN_NOTOK, eeprom_read_board_info(&e_invalid_ss_cfg, buffer)); TEST_ASSERT_EQUAL_STRING("\0", buffer); /* Checking for NULL cfg */ - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(RETURN_NOTOK, eeprom_read_board_info(e_invalid_cfg, buffer)); TEST_ASSERT_EQUAL_STRING("\0", buffer); /* Checking with invalid slave address */ - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(RETURN_NOTOK, eeprom_read_board_info(&e_invalid_dev, buffer)); TEST_ASSERT_EQUAL_STRING("\0", buffer); /* Checking with invalid bus address */ - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(RETURN_NOTOK, eeprom_read_board_info(&e_invalid_bus, buffer)); TEST_ASSERT_EQUAL_STRING("\0", buffer); @@ -272,7 +272,7 @@ void test_eeprom_read_oc_info(void) EEPROM_regs[EEPROM_REG_SERIAL_INFO_7] = EEPROM_ASCII_VAL_10; EEPROM_regs[EEPROM_REG_SERIAL_INFO_8] = EEPROM_ASCII_VAL_04; EEPROM_regs[EEPROM_REG_SERIAL_INFO_9] = EEPROM_ASCII_VAL_11; - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(RETURN_OK, eeprom_read_oc_info(buffer)); TEST_ASSERT_EQUAL_STRING(EEPROM_SERIAL_INFO, buffer); } diff --git a/firmware/ec/test/suites/Test_ocmp_cat24c04.c b/firmware/ec/test/suites/Test_ocmp_cat24c04.c index 97694fc72e..6bf76146d4 100644 --- a/firmware/ec/test/suites/Test_ocmp_cat24c04.c +++ b/firmware/ec/test/suites/Test_ocmp_cat24c04.c @@ -88,9 +88,9 @@ void test_init_eeprom(void) Eeprom_GpioConfig[0x02] = OCGPIO_CFG_OUT_HIGH; EEPROM_regs[EEPROM_REG_DEF_INIT] = EEPROM_READ_WRITE_VALUE; EEPROM_regs[EEPROM_REG_FFFF] = EEPROM_FFFF_REG_VALUE; - PCA9557_regs[PCA9557_REGS_OUTPUT_VALUE] = EEPROM_DEFUALT_VALUE_NULL; - SX1509_regs[SX1509_REG_DATA_B] = EEPROM_DEFUALT_VALUE_NULL; - SX1509_regs[SX1509_REG_DATA_A] = EEPROM_DEFUALT_VALUE_NULL; + PCA9557_regs[PCA9557_REGS_OUTPUT_VALUE] = EEPROM_DEFAULT_VALUE_NULL; + SX1509_regs[SX1509_REG_DATA_B] = EEPROM_DEFAULT_VALUE_NULL; + SX1509_regs[SX1509_REG_DATA_A] = EEPROM_DEFAULT_VALUE_NULL; AlertData alert_data = { .subsystem = 0, @@ -150,7 +150,7 @@ void test_RFFE_InventoryGetStatus(void) EEPROM_regs[EEPROM_REG_BOARD_INFO_7] = EEPROM_ASCII_VAL_E0; EEPROM_regs[EEPROM_REG_BOARD_INFO_8] = EEPROM_ASCII_VAL_00; EEPROM_regs[EEPROM_REG_BOARD_INFO_9] = EEPROM_ASCII_VAL_05; - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL( true, CAT24C04_fe_inv_fxnTable.cb_get_status( @@ -158,7 +158,7 @@ void test_RFFE_InventoryGetStatus(void) TEST_ASSERT_EQUAL_STRING(EEPROM_FE_BOARD_INFO, buffer); /* Invalid Param ID */ - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(false, CAT24C04_fe_inv_fxnTable.cb_get_status( &eeprom_fe_inv, EEPROM_INVALID_PARAM_ID, buffer)); @@ -186,14 +186,14 @@ void test_Sdr_InventoryGetStatus(void) EEPROM_regs[EEPROM_REG_BOARD_INFO_7] = EEPROM_ASCII_VAL_DR; EEPROM_regs[EEPROM_REG_BOARD_INFO_8] = EEPROM_ASCII_VAL_00; EEPROM_regs[EEPROM_REG_BOARD_INFO_9] = EEPROM_ASCII_VAL_32; - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL( true, CAT24C04_sdr_inv_fxnTable.cb_get_status( &eeprom_sdr_inv, EEPROM_SDR_INVENTORY_PARAM_ID, buffer)); TEST_ASSERT_EQUAL_STRING(EEPROM_SDR_BOARD_INFO, buffer); /* Invalid Param ID*/ - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); TEST_ASSERT_EQUAL(false, CAT24C04_sdr_inv_fxnTable.cb_get_status( &eeprom_sdr_inv, EEPROM_INVALID_PARAM_ID, buffer)); @@ -223,15 +223,15 @@ void test_sid_get_status_parameters_data(void) EEPROM_regs[EEPROM_REG_SERIAL_INFO_7] = EEPROM_ASCII_VAL_10; EEPROM_regs[EEPROM_REG_SERIAL_INFO_8] = EEPROM_ASCII_VAL_04; EEPROM_regs[EEPROM_REG_SERIAL_INFO_9] = EEPROM_ASCII_VAL_11; - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); - TEST_ASSERT_EQUAL(RETURN_OK, + TEST_ASSERT_EQUAL(true, CAT24C04_gbc_sid_fxnTable.cb_get_status( &eeprom_gbc_sid, OC_STAT_SYS_SERIAL_ID, buffer)); TEST_ASSERT_EQUAL_STRING(EEPROM_SERIAL_INFO, buffer); /* For OC_STAT_SYS_GBC_BOARD_ID */ - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); EEPROM_regs[EEPROM_REG_BOARD_INFO_1] = EEPROM_ASCII_VAL_SA; EEPROM_regs[EEPROM_REG_BOARD_INFO_2] = EEPROM_ASCII_VAL_17; EEPROM_regs[EEPROM_REG_BOARD_INFO_3] = EEPROM_ASCII_VAL_18; @@ -241,15 +241,15 @@ void test_sid_get_status_parameters_data(void) EEPROM_regs[EEPROM_REG_BOARD_INFO_7] = EEPROM_ASCII_VAL_BC; EEPROM_regs[EEPROM_REG_BOARD_INFO_8] = EEPROM_ASCII_VAL_00; EEPROM_regs[EEPROM_REG_BOARD_INFO_9] = EEPROM_ASCII_VAL_41; - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); - TEST_ASSERT_EQUAL(RETURN_OK, + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); + TEST_ASSERT_EQUAL(true, CAT24C04_gbc_sid_fxnTable.cb_get_status( &eeprom_gbc_sid, OC_STAT_SYS_GBC_BOARD_ID, buffer)); TEST_ASSERT_EQUAL_STRING(EEPROM_GBC_BOARD_INFO, buffer); /* Invalid ParamID */ - memset(buffer, EEPROM_DEFUALT_VALUE_NULL, EEPROM_BOARD_SIZE); - TEST_ASSERT_EQUAL(RETURN_NOTOK, + memset(buffer, EEPROM_DEFAULT_VALUE_NULL, EEPROM_BOARD_SIZE); + TEST_ASSERT_EQUAL(false, CAT24C04_gbc_sid_fxnTable.cb_get_status( &eeprom_gbc_sid, OC_STAT_SYS_STATE, buffer)); TEST_ASSERT_EQUAL_STRING("\0", buffer);