diff options
-rw-r--r-- | board/amenia/board.c | 2 | ||||
-rw-r--r-- | board/chell/board.c | 2 | ||||
-rw-r--r-- | board/elm/board.c | 2 | ||||
-rw-r--r-- | board/glados/board.c | 2 | ||||
-rw-r--r-- | board/lucid/board.c | 2 | ||||
-rw-r--r-- | board/oak/board.c | 2 | ||||
-rw-r--r-- | board/pyro/board.c | 2 | ||||
-rw-r--r-- | board/rambi/board.c | 2 | ||||
-rw-r--r-- | board/reef/board.c | 2 | ||||
-rw-r--r-- | board/samus/board.c | 2 | ||||
-rw-r--r-- | board/strago/board.c | 2 | ||||
-rw-r--r-- | board/wheatley/board.c | 2 | ||||
-rw-r--r-- | common/charge_state_v1.c | 2 | ||||
-rw-r--r-- | common/charge_state_v2.c | 2 | ||||
-rw-r--r-- | include/charge_state.h | 2 | ||||
-rw-r--r-- | test/sbs_charging_v2.c | 2 |
16 files changed, 16 insertions, 16 deletions
diff --git a/board/amenia/board.c b/board/amenia/board.c index 77c5343daa..536210bd3e 100644 --- a/board/amenia/board.c +++ b/board/amenia/board.c @@ -224,7 +224,7 @@ const struct temp_sensor_t temp_sensors[] = { G78X_IDX_EXTERNAL1, 4}, {"G782_Sensor_2", TEMP_SENSOR_TYPE_BOARD, g78x_get_val, G78X_IDX_EXTERNAL2, 4}, - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/chell/board.c b/board/chell/board.c index e16801b546..a930e45051 100644 --- a/board/chell/board.c +++ b/board/chell/board.c @@ -209,7 +209,7 @@ void board_rtc_reset(void) } const struct temp_sensor_t temp_sensors[] = { - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 4}, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, /* These BD99992GW temp sensors are only readable in S0 */ {"Ambient", TEMP_SENSOR_TYPE_BOARD, bd99992gw_get_val, diff --git a/board/elm/board.c b/board/elm/board.c index 133f6b25af..9a9c70918f 100644 --- a/board/elm/board.c +++ b/board/elm/board.c @@ -150,7 +150,7 @@ const struct temp_sensor_t temp_sensors[] = { {"TMP432_Sensor_2", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, TMP432_IDX_REMOTE2, 4}, #endif - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/glados/board.c b/board/glados/board.c index 3689276fe5..96e19fc6d6 100644 --- a/board/glados/board.c +++ b/board/glados/board.c @@ -182,7 +182,7 @@ void board_reset_pd_mcu(void) } const struct temp_sensor_t temp_sensors[] = { - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 4}, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, /* These BD99992GW temp sensors are only readable in S0 */ {"Ambient", TEMP_SENSOR_TYPE_BOARD, bd99992gw_get_val, diff --git a/board/lucid/board.c b/board/lucid/board.c index 51eb4ec06c..298c072440 100644 --- a/board/lucid/board.c +++ b/board/lucid/board.c @@ -144,7 +144,7 @@ const struct i2c_port_t i2c_ports[] = { const unsigned int i2c_ports_used = ARRAY_SIZE(i2c_ports); const struct temp_sensor_t temp_sensors[] = { - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 4}, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/oak/board.c b/board/oak/board.c index 2621d98f91..73e0ca02eb 100644 --- a/board/oak/board.c +++ b/board/oak/board.c @@ -147,7 +147,7 @@ const struct temp_sensor_t temp_sensors[] = { TMP432_IDX_REMOTE1, 4}, {"TMP432_Sensor_2", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, TMP432_IDX_REMOTE2, 4}, - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/pyro/board.c b/board/pyro/board.c index 1d14da72f6..ee419b1449 100644 --- a/board/pyro/board.c +++ b/board/pyro/board.c @@ -414,7 +414,7 @@ int board_get_ambient_temp(int idx, int *temp_ptr) const struct temp_sensor_t temp_sensors[] = { /* FIXME(dhendrix): tweak action_delay_sec */ - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 1}, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 1}, {"Ambient", TEMP_SENSOR_TYPE_BOARD, board_get_ambient_temp, 0, 5}, {"Charger", TEMP_SENSOR_TYPE_BOARD, board_get_charger_temp, 1, 1}, }; diff --git a/board/rambi/board.c b/board/rambi/board.c index 452838adfe..0063e56b0f 100644 --- a/board/rambi/board.c +++ b/board/rambi/board.c @@ -100,6 +100,6 @@ const struct temp_sensor_t temp_sensors[] = { TMP432_IDX_REMOTE1, 4}, {"TMP432_CPU_bottom", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, TMP432_IDX_REMOTE2, 4}, - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 4}, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/reef/board.c b/board/reef/board.c index 4592828d9a..e0c7ba9dff 100644 --- a/board/reef/board.c +++ b/board/reef/board.c @@ -398,7 +398,7 @@ int board_get_ambient_temp(int idx, int *temp_ptr) const struct temp_sensor_t temp_sensors[] = { /* FIXME(dhendrix): tweak action_delay_sec */ - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 1}, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 1}, {"Ambient", TEMP_SENSOR_TYPE_BOARD, board_get_ambient_temp, 0, 5}, {"Charger", TEMP_SENSOR_TYPE_BOARD, board_get_charger_temp, 1, 1}, }; diff --git a/board/samus/board.c b/board/samus/board.c index b5d0a9830b..53c56c9070 100644 --- a/board/samus/board.c +++ b/board/samus/board.c @@ -164,7 +164,7 @@ const struct temp_sensor_t temp_sensors[] = { {"I2C-Right D-Object", TEMP_SENSOR_TYPE_CASE, tmp006_get_val, 9, 7}, {"I2C-Left D-Die", TEMP_SENSOR_TYPE_BOARD, tmp006_get_val, 10, 7}, {"I2C-Left D-Object", TEMP_SENSOR_TYPE_CASE, tmp006_get_val, 11, 7}, - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 4}, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/strago/board.c b/board/strago/board.c index 528b658b93..a013e0f73e 100644 --- a/board/strago/board.c +++ b/board/strago/board.c @@ -151,7 +151,7 @@ const struct temp_sensor_t temp_sensors[] = { TMP432_IDX_REMOTE1, 4}, {"TMP432_Sensor_2", TEMP_SENSOR_TYPE_BOARD, tmp432_get_val, TMP432_IDX_REMOTE2, 4}, - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, }; BUILD_ASSERT(ARRAY_SIZE(temp_sensors) == TEMP_SENSOR_COUNT); diff --git a/board/wheatley/board.c b/board/wheatley/board.c index fe0435d952..c0f256ac09 100644 --- a/board/wheatley/board.c +++ b/board/wheatley/board.c @@ -182,7 +182,7 @@ void board_reset_pd_mcu(void) } const struct temp_sensor_t temp_sensors[] = { - {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_temp_sensor_get_val, 0, 4}, + {"Battery", TEMP_SENSOR_TYPE_BATTERY, charge_get_battery_temp, 0, 4}, /* These BD99992GW temp sensors are only readable in S0 */ {"Ambient", TEMP_SENSOR_TYPE_BOARD, bd99992gw_get_val, diff --git a/common/charge_state_v1.c b/common/charge_state_v1.c index fa209a4c1b..63435d6587 100644 --- a/common/charge_state_v1.c +++ b/common/charge_state_v1.c @@ -665,7 +665,7 @@ int charge_get_percent(void) return task_ctx.curr.batt.state_of_charge; } -int charge_temp_sensor_get_val(int idx, int *temp_ptr) +int charge_get_battery_temp(int idx, int *temp_ptr) { const struct batt_params *batt = &task_ctx.curr.batt; diff --git a/common/charge_state_v2.c b/common/charge_state_v2.c index 6990eed5dd..dceec8d562 100644 --- a/common/charge_state_v2.c +++ b/common/charge_state_v2.c @@ -1090,7 +1090,7 @@ int charge_get_percent(void) return is_full ? 100 : curr.batt.state_of_charge; } -int charge_temp_sensor_get_val(int idx, int *temp_ptr) +int charge_get_battery_temp(int idx, int *temp_ptr) { if (curr.batt.flags & BATT_FLAG_BAD_TEMPERATURE) return EC_ERROR_UNKNOWN; diff --git a/include/charge_state.h b/include/charge_state.h index f0847cdd09..a1e476209d 100644 --- a/include/charge_state.h +++ b/include/charge_state.h @@ -110,7 +110,7 @@ int charge_prevent_power_on(int power_button_pressed); * * @return EC_SUCCESS if successful, non-zero if error. */ -int charge_temp_sensor_get_val(int idx, int *temp_ptr); +int charge_get_battery_temp(int idx, int *temp_ptr); /** * Get the pointer to the battery parameters we saved in charge state. diff --git a/test/sbs_charging_v2.c b/test/sbs_charging_v2.c index 5e11c722fe..e69cbdfb34 100644 --- a/test/sbs_charging_v2.c +++ b/test/sbs_charging_v2.c @@ -408,7 +408,7 @@ static int test_external_funcs(void) TEST_ASSERT(!charge_want_shutdown()); TEST_ASSERT(charge_get_percent() == 50); temp = 0; - rv = charge_temp_sensor_get_val(0, &temp); + rv = charge_get_battery_temp(0, &temp); TEST_ASSERT(rv == EC_SUCCESS); TEST_ASSERT(K_TO_C(temp) == 25); |