diff options
Diffstat (limited to 'driver/temp_sensor')
29 files changed, 803 insertions, 857 deletions
diff --git a/driver/temp_sensor/adt7481.c b/driver/temp_sensor/adt7481.c index 738fdb776a..0157d64b2d 100644 --- a/driver/temp_sensor/adt7481.c +++ b/driver/temp_sensor/adt7481.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -34,14 +34,14 @@ static int has_power(void) static int raw_read8(const int offset, int *data_ptr) { - return i2c_read8(I2C_PORT_THERMAL, ADT7481_I2C_ADDR_FLAGS, - offset, data_ptr); + return i2c_read8(I2C_PORT_THERMAL, ADT7481_I2C_ADDR_FLAGS, offset, + data_ptr); } static int raw_write8(const int offset, int data) { - return i2c_write8(I2C_PORT_THERMAL, ADT7481_I2C_ADDR_FLAGS, - offset, data); + return i2c_write8(I2C_PORT_THERMAL, ADT7481_I2C_ADDR_FLAGS, offset, + data); } static int get_temp(const int offset, int *temp_ptr) @@ -145,7 +145,7 @@ int adt7481_set_therm_limit(int channel, int limit_c, int hysteresis) return EC_ERROR_INVAL; if (hysteresis > ADT7481_HYSTERESIS_HIGH_LIMIT || - hysteresis < ADT7481_HYSTERESIS_LOW_LIMIT) + hysteresis < ADT7481_HYSTERESIS_LOW_LIMIT) return EC_ERROR_INVAL; /* hysteresis must be less than high limit */ @@ -197,12 +197,10 @@ static void adt7481_temp_sensor_poll(void) DECLARE_HOOK(HOOK_SECOND, adt7481_temp_sensor_poll, HOOK_PRIO_TEMP_SENSOR); #ifdef CONFIG_CMD_TEMP_SENSOR -static void print_temps( - const char *name, - const int adt7481_temp_reg, - const int adt7481_therm_limit_reg, - const int adt7481_high_limit_reg, - const int adt7481_low_limit_reg) +static void print_temps(const char *name, const int adt7481_temp_reg, + const int adt7481_therm_limit_reg, + const int adt7481_high_limit_reg, + const int adt7481_low_limit_reg) { int value; @@ -230,39 +228,33 @@ static int print_status(void) { int value; - print_temps("Local", ADT7481_LOCAL, - ADT7481_LOCAL_THERM_LIMIT, - ADT7481_LOCAL_HIGH_LIMIT_R, - ADT7481_LOCAL_LOW_LIMIT_R); + print_temps("Local", ADT7481_LOCAL, ADT7481_LOCAL_THERM_LIMIT, + ADT7481_LOCAL_HIGH_LIMIT_R, ADT7481_LOCAL_LOW_LIMIT_R); - print_temps("Remote1", ADT7481_REMOTE1, - ADT7481_REMOTE1_THERM_LIMIT, - ADT7481_REMOTE1_HIGH_LIMIT_R, - ADT7481_REMOTE1_LOW_LIMIT_R); + print_temps("Remote1", ADT7481_REMOTE1, ADT7481_REMOTE1_THERM_LIMIT, + ADT7481_REMOTE1_HIGH_LIMIT_R, ADT7481_REMOTE1_LOW_LIMIT_R); - print_temps("Remote2", ADT7481_REMOTE2, - ADT7481_REMOTE2_THERM_LIMIT, - ADT7481_REMOTE2_HIGH_LIMIT, - ADT7481_REMOTE2_LOW_LIMIT); + print_temps("Remote2", ADT7481_REMOTE2, ADT7481_REMOTE2_THERM_LIMIT, + ADT7481_REMOTE2_HIGH_LIMIT, ADT7481_REMOTE2_LOW_LIMIT); ccprintf("\n"); if (raw_read8(ADT7481_STATUS1_R, &value) == EC_SUCCESS) - ccprintf("STATUS1: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("STATUS1: 0x%x\n", value); if (raw_read8(ADT7481_STATUS2_R, &value) == EC_SUCCESS) - ccprintf("STATUS2: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("STATUS2: 0x%x\n", value); if (raw_read8(ADT7481_CONFIGURATION1_R, &value) == EC_SUCCESS) - ccprintf("CONFIG1: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("CONFIG1: 0x%x\n", value); if (raw_read8(ADT7481_CONFIGURATION2, &value) == EC_SUCCESS) - ccprintf("CONFIG2: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("CONFIG2: 0x%x\n", value); return EC_SUCCESS; } -static int command_adt7481(int argc, char **argv) +static int command_adt7481(int argc, const char **argv) { char *command; char *e; @@ -307,8 +299,7 @@ static int command_adt7481(int argc, char **argv) rv = raw_read8(offset, &data); if (rv < 0) return rv; - ccprintf("Byte at offset 0x%02x is %pb\n", - offset, BINARY_VALUE(data, 8)); + ccprintf("Byte at offset 0x%02x is 0x%x\n", offset, data); return rv; } @@ -331,7 +322,8 @@ static int command_adt7481(int argc, char **argv) return rv; } -DECLARE_CONSOLE_COMMAND(adt7481, command_adt7481, +DECLARE_CONSOLE_COMMAND( + adt7481, command_adt7481, "[settemp|setbyte <offset> <value>] or [getbyte <offset>] or" "[power <on|off>]. " "Temps in Celsius.", diff --git a/driver/temp_sensor/adt7481.h b/driver/temp_sensor/adt7481.h index 78541a0a3b..af2b676f0d 100644 --- a/driver/temp_sensor/adt7481.h +++ b/driver/temp_sensor/adt7481.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -8,120 +8,118 @@ #ifndef __CROS_EC_ADT7481_H #define __CROS_EC_ADT7481_H -#define ADT7481_I2C_ADDR_FLAGS 0x4B +#define ADT7481_I2C_ADDR_FLAGS 0x4B -#define ADT7481_IDX_LOCAL 0 -#define ADT7481_IDX_REMOTE1 1 -#define ADT7481_IDX_REMOTE2 2 +#define ADT7481_IDX_LOCAL 0 +#define ADT7481_IDX_REMOTE1 1 +#define ADT7481_IDX_REMOTE2 2 /* Chip-specific registers */ -#define ADT7481_LOCAL 0x00 -#define ADT7481_REMOTE1 0x01 -#define ADT7481_STATUS1_R 0x02 -#define ADT7481_CONFIGURATION1_R 0x03 -#define ADT7481_CONVERSION_RATE_R 0x04 -#define ADT7481_LOCAL_HIGH_LIMIT_R 0x05 -#define ADT7481_LOCAL_LOW_LIMIT_R 0x06 -#define ADT7481_REMOTE1_HIGH_LIMIT_R 0x07 -#define ADT7481_REMOTE1_LOW_LIMIT_R 0x08 -#define ADT7481_CONFIGURATION1_W 0x09 -#define ADT7481_CONVERSION_RATE_W 0x0a -#define ADT7481_LOCAL_HIGH_LIMIT_W 0x0b -#define ADT7481_LOCAL_LOW_LIMIT_W 0x0c -#define ADT7481_REMOTE1_HIGH_LIMIT_W 0x0d -#define ADT7481_REMOTE1_LOW_LIMIT_W 0x0e -#define ADT7481_ONESHOT_W 0x0f -#define ADT7481_REMOTE1_EXTD_R 0x10 -#define ADT7481_REMOTE1_OFFSET 0x11 -#define ADT7481_REMOTE1_OFFSET_EXTD 0x12 -#define ADT7481_REMOTE1_HIGH_LIMIT_EXTD 0x13 -#define ADT7481_REMOTE1_LOW_LIMIT_EXTD 0x14 -#define ADT7481_REMOTE1_THERM_LIMIT 0x19 -#define ADT7481_LOCAL_THERM_LIMIT 0x20 -#define ADT7481_THERM_HYSTERESIS 0x21 -#define ADT7481_CONSECUTIVE_ALERT 0x22 -#define ADT7481_STATUS2_R 0x23 -#define ADT7481_CONFIGURATION2 0x24 -#define ADT7481_REMOTE2 0x30 -#define ADT7481_REMOTE2_HIGH_LIMIT 0x31 -#define ADT7481_REMOTE2_LOW_LIMIT 0x32 -#define ADT7481_REMOTE2_EXTD_R 0x33 -#define ADT7481_REMOTE2_OFFSET 0x34 -#define ADT7481_REMOTE2_OFFSET_EXTD 0x35 -#define ADT7481_REMOTE2_HIGH_LIMIT_EXTD 0x36 -#define ADT7481_REMOTE2_LOW_LIMIT_EXTD 0x37 -#define ADT7481_REMOTE2_THERM_LIMIT 0x39 -#define ADT7481_DEVICE_ID 0x3d -#define ADT7481_MANUFACTURER_ID 0x3e +#define ADT7481_LOCAL 0x00 +#define ADT7481_REMOTE1 0x01 +#define ADT7481_STATUS1_R 0x02 +#define ADT7481_CONFIGURATION1_R 0x03 +#define ADT7481_CONVERSION_RATE_R 0x04 +#define ADT7481_LOCAL_HIGH_LIMIT_R 0x05 +#define ADT7481_LOCAL_LOW_LIMIT_R 0x06 +#define ADT7481_REMOTE1_HIGH_LIMIT_R 0x07 +#define ADT7481_REMOTE1_LOW_LIMIT_R 0x08 +#define ADT7481_CONFIGURATION1_W 0x09 +#define ADT7481_CONVERSION_RATE_W 0x0a +#define ADT7481_LOCAL_HIGH_LIMIT_W 0x0b +#define ADT7481_LOCAL_LOW_LIMIT_W 0x0c +#define ADT7481_REMOTE1_HIGH_LIMIT_W 0x0d +#define ADT7481_REMOTE1_LOW_LIMIT_W 0x0e +#define ADT7481_ONESHOT_W 0x0f +#define ADT7481_REMOTE1_EXTD_R 0x10 +#define ADT7481_REMOTE1_OFFSET 0x11 +#define ADT7481_REMOTE1_OFFSET_EXTD 0x12 +#define ADT7481_REMOTE1_HIGH_LIMIT_EXTD 0x13 +#define ADT7481_REMOTE1_LOW_LIMIT_EXTD 0x14 +#define ADT7481_REMOTE1_THERM_LIMIT 0x19 +#define ADT7481_LOCAL_THERM_LIMIT 0x20 +#define ADT7481_THERM_HYSTERESIS 0x21 +#define ADT7481_CONSECUTIVE_ALERT 0x22 +#define ADT7481_STATUS2_R 0x23 +#define ADT7481_CONFIGURATION2 0x24 +#define ADT7481_REMOTE2 0x30 +#define ADT7481_REMOTE2_HIGH_LIMIT 0x31 +#define ADT7481_REMOTE2_LOW_LIMIT 0x32 +#define ADT7481_REMOTE2_EXTD_R 0x33 +#define ADT7481_REMOTE2_OFFSET 0x34 +#define ADT7481_REMOTE2_OFFSET_EXTD 0x35 +#define ADT7481_REMOTE2_HIGH_LIMIT_EXTD 0x36 +#define ADT7481_REMOTE2_LOW_LIMIT_EXTD 0x37 +#define ADT7481_REMOTE2_THERM_LIMIT 0x39 +#define ADT7481_DEVICE_ID 0x3d +#define ADT7481_MANUFACTURER_ID 0x3e /* Config1 register bits */ -#define ADT7481_CONFIG1_REMOTE1_ALERT_MASK BIT(0) -#define ADT7481_CONFIG1_REMOTE2_ALERT_MASK BIT(1) -#define ADT7481_CONFIG1_TEMP_RANGE BIT(2) -#define ADT7481_CONFIG1_SEL_REMOTE2 BIT(3) +#define ADT7481_CONFIG1_REMOTE1_ALERT_MASK BIT(0) +#define ADT7481_CONFIG1_REMOTE2_ALERT_MASK BIT(1) +#define ADT7481_CONFIG1_TEMP_RANGE BIT(2) +#define ADT7481_CONFIG1_SEL_REMOTE2 BIT(3) /* ADT7481_CONFIG1_MODE bit is use to enable THERM mode */ -#define ADT7481_CONFIG1_MODE BIT(5) -#define ADT7481_CONFIG1_RUN_L BIT(6) +#define ADT7481_CONFIG1_MODE BIT(5) +#define ADT7481_CONFIG1_RUN_L BIT(6) /* mask all alerts on ALERT# pin */ -#define ADT7481_CONFIG1_ALERT_MASK_L BIT(7) +#define ADT7481_CONFIG1_ALERT_MASK_L BIT(7) /* Config2 register bits */ -#define ADT7481_CONFIG2_LOCK BIT(7) +#define ADT7481_CONFIG2_LOCK BIT(7) /* Conversion Rate/Channel Select Register */ -#define ADT7481_CONV_RATE_MASK (0x0f) -#define ADT7481_CONV_RATE_16S (0x00) -#define ADT7481_CONV_RATE_8S (0x01) -#define ADT7481_CONV_RATE_4S (0x02) -#define ADT7481_CONV_RATE_2S (0x03) -#define ADT7481_CONV_RATE_1S (0x04) -#define ADT7481_CONV_RATE_500MS (0x05) -#define ADT7481_CONV_RATE_250MS (0x06) -#define ADT7481_CONV_RATE_125MS (0x07) -#define ADT7481_CONV_RATE_62500US (0x08) -#define ADT7481_CONV_RATE_31250US (0x09) -#define ADT7481_CONV_RATE_15500US (0x0a) +#define ADT7481_CONV_RATE_MASK (0x0f) +#define ADT7481_CONV_RATE_16S (0x00) +#define ADT7481_CONV_RATE_8S (0x01) +#define ADT7481_CONV_RATE_4S (0x02) +#define ADT7481_CONV_RATE_2S (0x03) +#define ADT7481_CONV_RATE_1S (0x04) +#define ADT7481_CONV_RATE_500MS (0x05) +#define ADT7481_CONV_RATE_250MS (0x06) +#define ADT7481_CONV_RATE_125MS (0x07) +#define ADT7481_CONV_RATE_62500US (0x08) +#define ADT7481_CONV_RATE_31250US (0x09) +#define ADT7481_CONV_RATE_15500US (0x0a) /* continuous mode 73 ms averaging */ -#define ADT7481_CONV_RATE_73MS_AVE (0x0b) -#define ADT7481_CONV_CHAN_SELECT_MASK (0x30) -#define ADT7481_CONV_CHAN_SEL_ROUND_ROBIN (0 << 4) -#define ADT7481_CONV_CHAN_SEL_LOCAL BIT(4) -#define ADT7481_CONV_CHAN_SEL_REMOTE1 (2 << 4) -#define ADT7481_CONV_CHAN_SEL_REMOTE2 (3 << 4) -#define ADT7481_CONV_AVERAGING_L BIT(7) - +#define ADT7481_CONV_RATE_73MS_AVE (0x0b) +#define ADT7481_CONV_CHAN_SELECT_MASK (0x30) +#define ADT7481_CONV_CHAN_SEL_ROUND_ROBIN (0 << 4) +#define ADT7481_CONV_CHAN_SEL_LOCAL BIT(4) +#define ADT7481_CONV_CHAN_SEL_REMOTE1 (2 << 4) +#define ADT7481_CONV_CHAN_SEL_REMOTE2 (3 << 4) +#define ADT7481_CONV_AVERAGING_L BIT(7) /* Status1 register bits */ -#define ADT7481_STATUS1_LOCAL_THERM_ALARM BIT(0) -#define ADT7481_STATUS1_REMOTE1_THERM_ALARM BIT(1) -#define ADT7481_STATUS1_REMOTE1_OPEN BIT(2) -#define ADT7481_STATUS1_REMOTE1_LOW_ALARM BIT(3) -#define ADT7481_STATUS1_REMOTE1_HIGH_ALARM BIT(4) -#define ADT7481_STATUS1_LOCAL_LOW_ALARM BIT(5) -#define ADT7481_STATUS1_LOCAL_HIGH_ALARM BIT(6) -#define ADT7481_STATUS1_BUSY BIT(7) +#define ADT7481_STATUS1_LOCAL_THERM_ALARM BIT(0) +#define ADT7481_STATUS1_REMOTE1_THERM_ALARM BIT(1) +#define ADT7481_STATUS1_REMOTE1_OPEN BIT(2) +#define ADT7481_STATUS1_REMOTE1_LOW_ALARM BIT(3) +#define ADT7481_STATUS1_REMOTE1_HIGH_ALARM BIT(4) +#define ADT7481_STATUS1_LOCAL_LOW_ALARM BIT(5) +#define ADT7481_STATUS1_LOCAL_HIGH_ALARM BIT(6) +#define ADT7481_STATUS1_BUSY BIT(7) /* Status2 register bits */ -#define ADT7481_STATUS2_ALERT BIT(0) -#define ADT7481_STATUS2_REMOTE2_THERM_ALARM BIT(1) -#define ADT7481_STATUS2_REMOTE2_OPEN BIT(2) -#define ADT7481_STATUS2_REMOTE2_LOW_ALARM BIT(3) -#define ADT7481_STATUS2_REMOTE2_HIGH_ALARM BIT(4) +#define ADT7481_STATUS2_ALERT BIT(0) +#define ADT7481_STATUS2_REMOTE2_THERM_ALARM BIT(1) +#define ADT7481_STATUS2_REMOTE2_OPEN BIT(2) +#define ADT7481_STATUS2_REMOTE2_LOW_ALARM BIT(3) +#define ADT7481_STATUS2_REMOTE2_HIGH_ALARM BIT(4) /* Consecutive Alert register */ -#define ADT7481_CONSEC_MASK (0xf) -#define ADT7481_CONSEC_1 (0x0) -#define ADT7481_CONSEC_2 (0x2) -#define ADT7481_CONSEC_3 (0x6) -#define ADT7481_CONSEC_4 (0xe) -#define ADT7481_CONSEC_EN_SCL_TIMEOUT BIT(5) -#define ADT7481_CONSEC_EN_SDA_TIMEOUT BIT(6) -#define ADT7481_CONSEC_MASK_LOCAL_ALERT BIT(7) - +#define ADT7481_CONSEC_MASK (0xf) +#define ADT7481_CONSEC_1 (0x0) +#define ADT7481_CONSEC_2 (0x2) +#define ADT7481_CONSEC_3 (0x6) +#define ADT7481_CONSEC_4 (0xe) +#define ADT7481_CONSEC_EN_SCL_TIMEOUT BIT(5) +#define ADT7481_CONSEC_EN_SDA_TIMEOUT BIT(6) +#define ADT7481_CONSEC_MASK_LOCAL_ALERT BIT(7) /* Limits */ -#define ADT7481_HYSTERESIS_HIGH_LIMIT 255 -#define ADT7481_HYSTERESIS_LOW_LIMIT 0 +#define ADT7481_HYSTERESIS_HIGH_LIMIT 255 +#define ADT7481_HYSTERESIS_LOW_LIMIT 0 enum adt7481_power_state { ADT7481_POWER_OFF = 0, diff --git a/driver/temp_sensor/amd_r19me4070.c b/driver/temp_sensor/amd_r19me4070.c index b5f4e66d38..97868b6945 100644 --- a/driver/temp_sensor/amd_r19me4070.c +++ b/driver/temp_sensor/amd_r19me4070.c @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -13,14 +13,14 @@ #include "amd_r19me4070.h" #include "power.h" -#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ## args) -#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ## args) +#define CPRINTS(format, args...) cprints(CC_USBCHARGE, format, ##args) +#define CPRINTF(format, args...) cprintf(CC_USBCHARGE, format, ##args) /* GPU I2C address */ -#define GPU_ADDR_FLAGS 0x0041 +#define GPU_ADDR_FLAGS 0x0041 -#define GPU_INIT_OFFSET 0x01 -#define GPU_TEMPERATURE_OFFSET 0x03 +#define GPU_INIT_OFFSET 0x01 +#define GPU_TEMPERATURE_OFFSET 0x03 static int initialized; /* @@ -34,8 +34,8 @@ static void gpu_init_temp_sensor(void) { int rv; rv = i2c_write_block(I2C_PORT_GPU, GPU_ADDR_FLAGS, GPU_INIT_OFFSET, - gpu_init_write_value, - ARRAY_SIZE(gpu_init_write_value)); + gpu_init_write_value, + ARRAY_SIZE(gpu_init_write_value)); if (rv == EC_SUCCESS) { initialized = 1; return; @@ -64,7 +64,7 @@ int get_temp_R19ME4070(int idx, int *temp_ptr) return EC_ERROR_BUSY; } rv = i2c_read_block(I2C_PORT_GPU, GPU_ADDR_FLAGS, - GPU_TEMPERATURE_OFFSET, reg, ARRAY_SIZE(reg)); + GPU_TEMPERATURE_OFFSET, reg, ARRAY_SIZE(reg)); if (rv) { CPRINTS("read GPU Temperature fail"); *temp_ptr = C_TO_K(0); diff --git a/driver/temp_sensor/amd_r19me4070.h b/driver/temp_sensor/amd_r19me4070.h index d3c7977ba5..5460dcb1cc 100644 --- a/driver/temp_sensor/amd_r19me4070.h +++ b/driver/temp_sensor/amd_r19me4070.h @@ -1,4 +1,4 @@ -/* Copyright 2020 The Chromium OS Authors. All rights reserved. +/* Copyright 2020 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -9,7 +9,7 @@ #define __CROS_EC_R19ME4070_H /* GPU features */ -#define R19ME4070_LOCAL 0 +#define R19ME4070_LOCAL 0 /* * get GPU temperature value and move to *tem_ptr diff --git a/driver/temp_sensor/bd99992gw.c b/driver/temp_sensor/bd99992gw.c index e66642224c..bd152c0441 100644 --- a/driver/temp_sensor/bd99992gw.c +++ b/driver/temp_sensor/bd99992gw.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -10,6 +10,7 @@ */ #include "bd99992gw.h" +#include "builtin/assert.h" #include "chipset.h" #include "common.h" #include "console.h" @@ -23,7 +24,7 @@ /* Console output macros */ #define CPUTS(outstr) cputs(CC_THERMAL, outstr) -#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args) +#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ##args) /* List of active channels, ordered by pointer register */ static enum bd99992gw_adc_channel @@ -39,8 +40,8 @@ static enum bd99992gw_adc_channel static int raw_read8(const int offset, int *data_ptr) { int ret; - ret = i2c_read8(I2C_PORT_THERMAL, BD99992GW_I2C_ADDR_FLAGS, - offset, data_ptr); + ret = i2c_read8(I2C_PORT_THERMAL, BD99992GW_I2C_ADDR_FLAGS, offset, + data_ptr); if (ret != EC_SUCCESS) CPRINTS("bd99992gw read fail %d", ret); return ret; @@ -49,8 +50,8 @@ static int raw_read8(const int offset, int *data_ptr) static int raw_write8(const int offset, int data) { int ret; - ret = i2c_write8(I2C_PORT_THERMAL, BD99992GW_I2C_ADDR_FLAGS, - offset, data); + ret = i2c_write8(I2C_PORT_THERMAL, BD99992GW_I2C_ADDR_FLAGS, offset, + data); if (ret != EC_SUCCESS) CPRINTS("bd99992gw write fail %d", ret); return ret; @@ -79,9 +80,11 @@ static void bd99992gw_init(void) /* Now write pointer regs with channel to monitor */ for (i = 0; i < active_channel_count; ++i) /* Write stop bit on last channel */ - if (raw_write8(pointer_reg + i, active_channels[i] | - ((i == active_channel_count - 1) ? - BD99992GW_ADC1ADDR_STOP : 0))) + if (raw_write8(pointer_reg + i, + active_channels[i] | + ((i == active_channel_count - 1) ? + BD99992GW_ADC1ADDR_STOP : + 0))) return; /* Enable ADC interrupts */ @@ -96,7 +99,8 @@ static void bd99992gw_init(void) /* Start round-robin conversions at 27ms period */ raw_write8(BD99992GW_REG_ADC1CNTL1, ADC_LOOP_PERIOD | - BD99992GW_ADC1CNTL1_ADEN | BD99992GW_ADC1CNTL1_ADSTRT); + BD99992GW_ADC1CNTL1_ADEN | + BD99992GW_ADC1CNTL1_ADSTRT); } /* * Some regs only work in S0, so we must initialize on AP startup in @@ -130,24 +134,20 @@ int bd99992gw_get_val(int idx, int *temp_ptr) /* Find requested channel */ for (i = 0; i < ARRAY_SIZE(active_channels); ++i) { channel = active_channels[i]; - if (channel == idx || - channel == BD99992GW_ADC_CHANNEL_NONE) + if (channel == idx || channel == BD99992GW_ADC_CHANNEL_NONE) break; } /* Make sure we found it */ - if (i == ARRAY_SIZE(active_channels) || - active_channels[i] != idx) { + if (i == ARRAY_SIZE(active_channels) || active_channels[i] != idx) { CPRINTS("Bad ADC channel %d", idx); return EC_ERROR_INVAL; } /* Pause conversions */ - ret = raw_write8(0x80, - ADC_LOOP_PERIOD | - BD99992GW_ADC1CNTL1_ADEN | - BD99992GW_ADC1CNTL1_ADSTRT | - BD99992GW_ADC1CNTL1_ADPAUSE); + ret = raw_write8(0x80, ADC_LOOP_PERIOD | BD99992GW_ADC1CNTL1_ADEN | + BD99992GW_ADC1CNTL1_ADSTRT | + BD99992GW_ADC1CNTL1_ADPAUSE); if (ret) return ret; @@ -173,8 +173,9 @@ int bd99992gw_get_val(int idx, int *temp_ptr) return ret; /* Resume conversions */ - ret = raw_write8(BD99992GW_REG_ADC1CNTL1, ADC_LOOP_PERIOD | - BD99992GW_ADC1CNTL1_ADEN | BD99992GW_ADC1CNTL1_ADSTRT); + ret = raw_write8(BD99992GW_REG_ADC1CNTL1, + ADC_LOOP_PERIOD | BD99992GW_ADC1CNTL1_ADEN | + BD99992GW_ADC1CNTL1_ADSTRT); if (ret) return ret; diff --git a/driver/temp_sensor/bd99992gw.h b/driver/temp_sensor/bd99992gw.h index c461012c45..8ee2c2774c 100644 --- a/driver/temp_sensor/bd99992gw.h +++ b/driver/temp_sensor/bd99992gw.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -8,74 +8,74 @@ #ifndef __CROS_EC_TEMP_SENSOR_BD99992GW_H #define __CROS_EC_TEMP_SENSOR_BD99992GW_H -#define BD99992GW_I2C_ADDR_FLAGS 0x30 +#define BD99992GW_I2C_ADDR_FLAGS 0x30 /* ADC channels */ enum bd99992gw_adc_channel { - BD99992GW_ADC_CHANNEL_NONE = -1, - BD99992GW_ADC_CHANNEL_BATTERY = 0, - BD99992GW_ADC_CHANNEL_AC = 1, + BD99992GW_ADC_CHANNEL_NONE = -1, + BD99992GW_ADC_CHANNEL_BATTERY = 0, + BD99992GW_ADC_CHANNEL_AC = 1, BD99992GW_ADC_CHANNEL_SYSTHERM0 = 2, BD99992GW_ADC_CHANNEL_SYSTHERM1 = 3, BD99992GW_ADC_CHANNEL_SYSTHERM2 = 4, BD99992GW_ADC_CHANNEL_SYSTHERM3 = 5, - BD99992GW_ADC_CHANNEL_DIE_TEMP = 6, - BD99992GW_ADC_CHANNEL_VDC = 7, - BD99992GW_ADC_CHANNEL_COUNT = 8, + BD99992GW_ADC_CHANNEL_DIE_TEMP = 6, + BD99992GW_ADC_CHANNEL_VDC = 7, + BD99992GW_ADC_CHANNEL_COUNT = 8, }; /* Registers */ -#define BD99992GW_REG_IRQLVL1 0x02 -#define BD99992GW_IRQLVL1_ADC BIT(1) /* ADC IRQ asserted */ +#define BD99992GW_REG_IRQLVL1 0x02 +#define BD99992GW_IRQLVL1_ADC BIT(1) /* ADC IRQ asserted */ -#define BD99992GW_REG_ADC1INT 0x03 -#define BD99992GW_ADC1INT_RND BIT(0) /* RR cycle completed */ +#define BD99992GW_REG_ADC1INT 0x03 +#define BD99992GW_ADC1INT_RND BIT(0) /* RR cycle completed */ -#define BD99992GW_REG_MADC1INT 0x0a -#define BD99992GW_MADC1INT_RND BIT(0) /* RR cycle mask */ +#define BD99992GW_REG_MADC1INT 0x0a +#define BD99992GW_MADC1INT_RND BIT(0) /* RR cycle mask */ -#define BD99992GW_REG_IRQLVL1MSK 0x13 -#define BD99992GW_IRQLVL1MSK_MADC BIT(1) /* ADC IRQ mask */ +#define BD99992GW_REG_IRQLVL1MSK 0x13 +#define BD99992GW_IRQLVL1MSK_MADC BIT(1) /* ADC IRQ mask */ -#define BD99992GW_REG_ADC1CNTL1 0x80 -#define BD99992GW_ADC1CNTL1_SLP27MS (0x6 << 3) /* 27ms between pass */ -#define BD99992GW_ADC1CNTL1_NOLOOP (0x7 << 3) /* Single loop pass only */ -#define BD99992GW_ADC1CNTL1_ADPAUSE BIT(2) /* ADC pause */ -#define BD99992GW_ADC1CNTL1_ADSTRT BIT(1) /* ADC start */ -#define BD99992GW_ADC1CNTL1_ADEN BIT(0) /* ADC enable */ +#define BD99992GW_REG_ADC1CNTL1 0x80 +#define BD99992GW_ADC1CNTL1_SLP27MS (0x6 << 3) /* 27ms between pass */ +#define BD99992GW_ADC1CNTL1_NOLOOP (0x7 << 3) /* Single loop pass only */ +#define BD99992GW_ADC1CNTL1_ADPAUSE BIT(2) /* ADC pause */ +#define BD99992GW_ADC1CNTL1_ADSTRT BIT(1) /* ADC start */ +#define BD99992GW_ADC1CNTL1_ADEN BIT(0) /* ADC enable */ -#define BD99992GW_REG_ADC1CNTL2 0x81 -#define BD99992GW_ADC1CNTL2_ADCTHERM BIT(0) /* Enable ADC sequencing */ +#define BD99992GW_REG_ADC1CNTL2 0x81 +#define BD99992GW_ADC1CNTL2_ADCTHERM BIT(0) /* Enable ADC sequencing */ - /* ADC1 Pointer file regs - assign to proper bd99992gw_adc_channel */ -#define BD99992GW_ADC_POINTER_REG_COUNT 8 -#define BD99992GW_REG_ADC1ADDR0 0x82 -#define BD99992GW_REG_ADC1ADDR1 0x83 -#define BD99992GW_REG_ADC1ADDR2 0x84 -#define BD99992GW_REG_ADC1ADDR3 0x85 -#define BD99992GW_REG_ADC1ADDR4 0x86 -#define BD99992GW_REG_ADC1ADDR5 0x87 -#define BD99992GW_REG_ADC1ADDR6 0x88 -#define BD99992GW_REG_ADC1ADDR7 0x89 -#define BD99992GW_ADC1ADDR_STOP BIT(3) /* Last conversion channel */ +/* ADC1 Pointer file regs - assign to proper bd99992gw_adc_channel */ +#define BD99992GW_ADC_POINTER_REG_COUNT 8 +#define BD99992GW_REG_ADC1ADDR0 0x82 +#define BD99992GW_REG_ADC1ADDR1 0x83 +#define BD99992GW_REG_ADC1ADDR2 0x84 +#define BD99992GW_REG_ADC1ADDR3 0x85 +#define BD99992GW_REG_ADC1ADDR4 0x86 +#define BD99992GW_REG_ADC1ADDR5 0x87 +#define BD99992GW_REG_ADC1ADDR6 0x88 +#define BD99992GW_REG_ADC1ADDR7 0x89 +#define BD99992GW_ADC1ADDR_STOP BIT(3) /* Last conversion channel */ /* Result registers */ -#define BD99992GW_REG_ADC1DATA0L 0x95 -#define BD99992GW_REG_ADC1DATA0H 0x96 -#define BD99992GW_REG_ADC1DATA1L 0x97 -#define BD99992GW_REG_ADC1DATA1H 0x98 -#define BD99992GW_REG_ADC1DATA2L 0x99 -#define BD99992GW_REG_ADC1DATA2H 0x9a -#define BD99992GW_REG_ADC1DATA3L 0x9b -#define BD99992GW_REG_ADC1DATA3H 0x9c -#define BD99992GW_REG_ADC1DATA4L 0x9d -#define BD99992GW_REG_ADC1DATA4H 0x9e -#define BD99992GW_REG_ADC1DATA5L 0x9f -#define BD99992GW_REG_ADC1DATA5H 0xa0 -#define BD99992GW_REG_ADC1DATA6L 0xa1 -#define BD99992GW_REG_ADC1DATA6H 0xa2 -#define BD99992GW_REG_ADC1DATA7L 0xa3 -#define BD99992GW_REG_ADC1DATA7H 0xa4 +#define BD99992GW_REG_ADC1DATA0L 0x95 +#define BD99992GW_REG_ADC1DATA0H 0x96 +#define BD99992GW_REG_ADC1DATA1L 0x97 +#define BD99992GW_REG_ADC1DATA1H 0x98 +#define BD99992GW_REG_ADC1DATA2L 0x99 +#define BD99992GW_REG_ADC1DATA2H 0x9a +#define BD99992GW_REG_ADC1DATA3L 0x9b +#define BD99992GW_REG_ADC1DATA3H 0x9c +#define BD99992GW_REG_ADC1DATA4L 0x9d +#define BD99992GW_REG_ADC1DATA4H 0x9e +#define BD99992GW_REG_ADC1DATA5L 0x9f +#define BD99992GW_REG_ADC1DATA5H 0xa0 +#define BD99992GW_REG_ADC1DATA6L 0xa1 +#define BD99992GW_REG_ADC1DATA6H 0xa2 +#define BD99992GW_REG_ADC1DATA7L 0xa3 +#define BD99992GW_REG_ADC1DATA7H 0xa4 /** * Get the latest value from the sensor. @@ -87,4 +87,4 @@ enum bd99992gw_adc_channel { */ int bd99992gw_get_val(int idx, int *temp_ptr); -#endif /* __CROS_EC_TEMP_SENSOR_BD99992GW_H */ +#endif /* __CROS_EC_TEMP_SENSOR_BD99992GW_H */ diff --git a/driver/temp_sensor/ec_adc.c b/driver/temp_sensor/ec_adc.c index 196d191e47..ca03cd6c6d 100644 --- a/driver/temp_sensor/ec_adc.c +++ b/driver/temp_sensor/ec_adc.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -23,15 +23,15 @@ static int get_temp(int idx, int *temp_ptr) if (temp_raw == ADC_READ_ERROR) return EC_ERROR_UNKNOWN; - /* TODO : Need modification here if the result is not 10-bit */ + /* TODO : Need modification here if the result is not 10-bit */ - /* If there is no thermistor calculation function. - * 1. Add adjusting function like thermistor_ncp15wb.c - * 2. Place function here with ifdef - * 3. define it on board.h - */ + /* If there is no thermistor calculation function. + * 1. Add adjusting function like thermistor_ncp15wb.c + * 2. Place function here with ifdef + * 3. define it on board.h + */ #ifdef CONFIG_THERMISTOR_NCP15WB - *temp_ptr = ncp15wb_calculate_temp((uint16_t) temp_raw); + *temp_ptr = ncp15wb_calculate_temp((uint16_t)temp_raw); #else #error "Unknown thermistor for ec_adc" return EC_ERROR_UNKNOWN; @@ -45,7 +45,7 @@ int ec_adc_get_val(int idx, int *temp_ptr) int ret; int temp_c; - if(idx < 0 || idx >= ADC_CH_COUNT) + if (idx < 0 || idx >= ADC_CH_COUNT) return EC_ERROR_INVAL; ret = get_temp(idx, &temp_c); diff --git a/driver/temp_sensor/ec_adc.h b/driver/temp_sensor/ec_adc.h index 8ff213e95d..3bea83ffe8 100644 --- a/driver/temp_sensor/ec_adc.h +++ b/driver/temp_sensor/ec_adc.h @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,4 +21,4 @@ */ int ec_adc_get_val(int idx, int *temp_ptr); -#endif /* __CROS_EC_TEMP_SENSOR_EC_ADC_H */ +#endif /* __CROS_EC_TEMP_SENSOR_EC_ADC_H */ diff --git a/driver/temp_sensor/f75303.c b/driver/temp_sensor/f75303.c index 6b8895a252..e686537c31 100644 --- a/driver/temp_sensor/f75303.c +++ b/driver/temp_sensor/f75303.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -13,15 +13,14 @@ #include "console.h" static int temps[F75303_IDX_COUNT]; -static int8_t fake_temp[F75303_IDX_COUNT] = {-1, -1, -1}; +static int8_t fake_temp[F75303_IDX_COUNT] = { -1, -1, -1 }; /** * Read 8 bits register from temp sensor. */ static int raw_read8(const int offset, int *data) { - return i2c_read8(I2C_PORT_THERMAL, F75303_I2C_ADDR_FLAGS, - offset, data); + return i2c_read8(I2C_PORT_THERMAL, F75303_I2C_ADDR_FLAGS, offset, data); } static int get_temp(const int offset, int *temp) @@ -59,7 +58,7 @@ static void f75303_sensor_poll(void) } DECLARE_HOOK(HOOK_SECOND, f75303_sensor_poll, HOOK_PRIO_TEMP_SENSOR); -static int f75303_set_fake_temp(int argc, char **argv) +static int f75303_set_fake_temp(int argc, const char **argv) { int index; int value; @@ -88,6 +87,5 @@ static int f75303_set_fake_temp(int argc, char **argv) return EC_SUCCESS; } -DECLARE_CONSOLE_COMMAND(f75303, f75303_set_fake_temp, - "<index> <value>|off", - "Set fake temperature of sensor f75303."); +DECLARE_CONSOLE_COMMAND(f75303, f75303_set_fake_temp, "<index> <value>|off", + "Set fake temperature of sensor f75303."); diff --git a/driver/temp_sensor/f75303.h b/driver/temp_sensor/f75303.h index bdfd2624f0..f8c85231da 100644 --- a/driver/temp_sensor/f75303.h +++ b/driver/temp_sensor/f75303.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -9,9 +9,9 @@ #define __CROS_EC_F75303_H #ifdef BOARD_MUSHU -#define F75303_I2C_ADDR_FLAGS 0x4D +#define F75303_I2C_ADDR_FLAGS 0x4D #else -#define F75303_I2C_ADDR_FLAGS 0x4C +#define F75303_I2C_ADDR_FLAGS 0x4C #endif enum f75303_index { @@ -22,9 +22,9 @@ enum f75303_index { }; /* F75303 register */ -#define F75303_TEMP_LOCAL 0x00 -#define F75303_TEMP_REMOTE1 0x01 -#define F75303_TEMP_REMOTE2 0x23 +#define F75303_TEMP_LOCAL 0x00 +#define F75303_TEMP_REMOTE1 0x01 +#define F75303_TEMP_REMOTE2 0x23 /** * Get the last polled value of a sensor. @@ -37,4 +37,4 @@ enum f75303_index { */ int f75303_get_val(int idx, int *temp); -#endif /* __CROS_EC_F75303_H */ +#endif /* __CROS_EC_F75303_H */ diff --git a/driver/temp_sensor/g753.c b/driver/temp_sensor/g753.c index e3946e4f43..8d94cac4f8 100644 --- a/driver/temp_sensor/g753.c +++ b/driver/temp_sensor/g753.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -31,15 +31,14 @@ static int has_power(void) static int raw_read8(const int offset, int *data_ptr) { - return i2c_read8(I2C_PORT_THERMAL, G753_I2C_ADDR_FLAGS, - offset, data_ptr); + return i2c_read8(I2C_PORT_THERMAL, G753_I2C_ADDR_FLAGS, offset, + data_ptr); } #ifdef CONFIG_CMD_TEMP_SENSOR static int raw_write8(const int offset, int data) { - return i2c_write8(I2C_PORT_THERMAL, G753_I2C_ADDR_FLAGS, - offset, data); + return i2c_write8(I2C_PORT_THERMAL, G753_I2C_ADDR_FLAGS, offset, data); } #endif @@ -93,8 +92,7 @@ static void temp_sensor_poll(void) DECLARE_HOOK(HOOK_SECOND, temp_sensor_poll, HOOK_PRIO_TEMP_SENSOR); #ifdef CONFIG_CMD_TEMP_SENSOR -static void print_temps(const char *name, - const int temp_reg, +static void print_temps(const char *name, const int temp_reg, const int high_limit_reg) { int value; @@ -106,7 +104,6 @@ static void print_temps(const char *name, if (get_temp(high_limit_reg, &value) == EC_SUCCESS) ccprintf(" High Alarm: %3dC\n", value); - } static int print_status(void) @@ -118,23 +115,22 @@ static int print_status(void) return EC_ERROR_NOT_POWERED; } - print_temps("Local", G753_TEMP_LOCAL, - G753_LOCAL_TEMP_HIGH_LIMIT_R); + print_temps("Local", G753_TEMP_LOCAL, G753_LOCAL_TEMP_HIGH_LIMIT_R); ccprintf("\n"); if (raw_read8(G753_STATUS, &value) == EC_SUCCESS) - ccprintf("STATUS: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("STATUS: 0x%x\n", value); if (raw_read8(G753_CONFIGURATION_R, &value) == EC_SUCCESS) - ccprintf("CONFIG: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("CONFIG: 0x%x\n", value); return EC_SUCCESS; } -static int command_g753(int argc, char **argv) +static int command_g753(int argc, const char **argv) { - char *command; + const char *command; char *e; int data; int offset; @@ -161,8 +157,7 @@ static int command_g753(int argc, char **argv) rv = raw_read8(offset, &data); if (rv < 0) return rv; - ccprintf("Byte at offset 0x%02x is %pb\n", - offset, BINARY_VALUE(data, 8)); + ccprintf("Byte at offset 0x%02x is 0x%x\n", offset, data); return rv; } @@ -185,7 +180,8 @@ static int command_g753(int argc, char **argv) return rv; } -DECLARE_CONSOLE_COMMAND(g753, command_g753, +DECLARE_CONSOLE_COMMAND( + g753, command_g753, "[settemp|setbyte <offset> <value>] or [getbyte <offset>]. " "Temps in Celsius.", "Print g753 temp sensor status or set parameters."); diff --git a/driver/temp_sensor/g753.h b/driver/temp_sensor/g753.h index 04c412bfbb..00f7fec8ac 100644 --- a/driver/temp_sensor/g753.h +++ b/driver/temp_sensor/g753.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -8,36 +8,35 @@ #ifndef __CROS_EC_G753_H #define __CROS_EC_G753_H +#define G753_I2C_ADDR_FLAGS 0x48 -#define G753_I2C_ADDR_FLAGS 0x48 - -#define G753_IDX_INTERNAL 0 +#define G753_IDX_INTERNAL 0 /* G753 register */ -#define G753_TEMP_LOCAL 0x00 -#define G753_STATUS 0x02 -#define G753_CONFIGURATION_R 0x03 -#define G753_CONVERSION_RATE_R 0x04 -#define G753_LOCAL_TEMP_HIGH_LIMIT_R 0x05 -#define G753_CONFIGURATION_W 0x09 -#define G753_CONVERSION_RATE_W 0x0A -#define G753_LOCAL_TEMP_HIGH_LIMIT_W 0x0B -#define G753_ONESHOT 0x0F -#define G753_Customer_Data_Log_Register_1 0x2D -#define G753_Customer_Data_Log_Register_2 0x2E -#define G753_Customer_Data_Log_Register_3 0x2F -#define G753_ALERT_MODE 0xBF -#define G753_CHIP_ID 0xFD -#define G753_VENDOR_ID 0xFE -#define G753_DEVICE_ID 0xFF +#define G753_TEMP_LOCAL 0x00 +#define G753_STATUS 0x02 +#define G753_CONFIGURATION_R 0x03 +#define G753_CONVERSION_RATE_R 0x04 +#define G753_LOCAL_TEMP_HIGH_LIMIT_R 0x05 +#define G753_CONFIGURATION_W 0x09 +#define G753_CONVERSION_RATE_W 0x0A +#define G753_LOCAL_TEMP_HIGH_LIMIT_W 0x0B +#define G753_ONESHOT 0x0F +#define G753_Customer_Data_Log_Register_1 0x2D +#define G753_Customer_Data_Log_Register_2 0x2E +#define G753_Customer_Data_Log_Register_3 0x2F +#define G753_ALERT_MODE 0xBF +#define G753_CHIP_ID 0xFD +#define G753_VENDOR_ID 0xFE +#define G753_DEVICE_ID 0xFF /* Config register bits */ -#define G753_CONFIGURATION_STANDBY BIT(6) -#define G753_CONFIGURATION_ALERT_MASK BIT(7) +#define G753_CONFIGURATION_STANDBY BIT(6) +#define G753_CONFIGURATION_ALERT_MASK BIT(7) /* Status register bits */ -#define G753_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(6) -#define G753_STATUS_BUSY BIT(7) +#define G753_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(6) +#define G753_STATUS_BUSY BIT(7) /** * Get the last polled value of a sensor. @@ -50,4 +49,4 @@ */ int g753_get_val(int idx, int *temp_ptr); -#endif /* __CROS_EC_G753_H */ +#endif /* __CROS_EC_G753_H */ diff --git a/driver/temp_sensor/g78x.c b/driver/temp_sensor/g78x.c index c4fd0ff243..82cb2d26e9 100644 --- a/driver/temp_sensor/g78x.c +++ b/driver/temp_sensor/g78x.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -35,15 +35,14 @@ static int has_power(void) static int raw_read8(const int offset, int *data_ptr) { - return i2c_read8(I2C_PORT_THERMAL, G78X_I2C_ADDR_FLAGS, - offset, data_ptr); + return i2c_read8(I2C_PORT_THERMAL, G78X_I2C_ADDR_FLAGS, offset, + data_ptr); } #ifdef CONFIG_CMD_TEMP_SENSOR static int raw_write8(const int offset, int data) { - return i2c_write8(I2C_PORT_THERMAL, G78X_I2C_ADDR_FLAGS, - offset, data); + return i2c_write8(I2C_PORT_THERMAL, G78X_I2C_ADDR_FLAGS, offset, data); } #endif @@ -113,10 +112,8 @@ static void temp_sensor_poll(void) DECLARE_HOOK(HOOK_SECOND, temp_sensor_poll, HOOK_PRIO_TEMP_SENSOR); #ifdef CONFIG_CMD_TEMP_SENSOR -static void print_temps(const char *name, - const int temp_reg, - const int therm_limit_reg, - const int high_limit_reg, +static void print_temps(const char *name, const int temp_reg, + const int therm_limit_reg, const int high_limit_reg, const int low_limit_reg) { int value; @@ -145,19 +142,15 @@ static int print_status(void) return EC_ERROR_NOT_POWERED; } - print_temps("Local", G78X_TEMP_LOCAL, - G78X_LOCAL_TEMP_THERM_LIMIT, - G78X_LOCAL_TEMP_HIGH_LIMIT_R, - G78X_LOCAL_TEMP_LOW_LIMIT_R); + print_temps("Local", G78X_TEMP_LOCAL, G78X_LOCAL_TEMP_THERM_LIMIT, + G78X_LOCAL_TEMP_HIGH_LIMIT_R, G78X_LOCAL_TEMP_LOW_LIMIT_R); - print_temps("Remote1", G78X_TEMP_REMOTE1, - G78X_REMOTE1_TEMP_THERM_LIMIT, + print_temps("Remote1", G78X_TEMP_REMOTE1, G78X_REMOTE1_TEMP_THERM_LIMIT, G78X_REMOTE1_TEMP_HIGH_LIMIT_R, G78X_REMOTE1_TEMP_LOW_LIMIT_R); #ifdef CONFIG_TEMP_SENSOR_G782 - print_temps("Remote2", G78X_TEMP_REMOTE1, - G78X_REMOTE2_TEMP_THERM_LIMIT, + print_temps("Remote2", G78X_TEMP_REMOTE1, G78X_REMOTE2_TEMP_THERM_LIMIT, G78X_REMOTE2_TEMP_HIGH_LIMIT_R, G78X_REMOTE2_TEMP_LOW_LIMIT_R); #endif @@ -165,20 +158,20 @@ static int print_status(void) ccprintf("\n"); if (raw_read8(G78X_STATUS, &value) == EC_SUCCESS) - ccprintf("STATUS: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("STATUS: 0x%x\n", value); #ifdef CONFIG_TEMP_SENSOR_G782 if (raw_read8(G78X_STATUS1, &value) == EC_SUCCESS) - ccprintf("STATUS1: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("STATUS1: 0x%x\n", value); #endif if (raw_read8(G78X_CONFIGURATION_R, &value) == EC_SUCCESS) - ccprintf("CONFIG: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("CONFIG: 0x%x\n", value); return EC_SUCCESS; } -static int command_g78x(int argc, char **argv) +static int command_g78x(int argc, const char **argv) { char *command; char *e; @@ -207,8 +200,7 @@ static int command_g78x(int argc, char **argv) rv = raw_read8(offset, &data); if (rv < 0) return rv; - ccprintf("Byte at offset 0x%02x is %pb\n", - offset, BINARY_VALUE(data, 8)); + ccprintf("Byte at offset 0x%02x is 0x%x\n", offset, data); return rv; } @@ -231,7 +223,8 @@ static int command_g78x(int argc, char **argv) return rv; } -DECLARE_CONSOLE_COMMAND(g78x, command_g78x, +DECLARE_CONSOLE_COMMAND( + g78x, command_g78x, "[settemp|setbyte <offset> <value>] or [getbyte <offset>]. " "Temps in Celsius.", "Print g781/g782 temp sensor status or set parameters."); diff --git a/driver/temp_sensor/g78x.h b/driver/temp_sensor/g78x.h index fdd987fcbd..70abc82a3f 100644 --- a/driver/temp_sensor/g78x.h +++ b/driver/temp_sensor/g78x.h @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -12,118 +12,118 @@ #error Cannot support both G781 and G782 together! #endif -#define G78X_I2C_ADDR_FLAGS 0x4C +#define G78X_I2C_ADDR_FLAGS 0x4C -#define G78X_IDX_INTERNAL 0 -#define G78X_IDX_EXTERNAL1 1 -#define G78X_IDX_EXTERNAL2 2 +#define G78X_IDX_INTERNAL 0 +#define G78X_IDX_EXTERNAL1 1 +#define G78X_IDX_EXTERNAL2 2 #if defined(CONFIG_TEMP_SENSOR_G781) /* G781 register */ -#define G78X_TEMP_LOCAL 0x00 -#define G78X_TEMP_REMOTE1 0x01 -#define G78X_STATUS 0x02 -#define G78X_CONFIGURATION_R 0x03 -#define G78X_CONVERSION_RATE_R 0x04 -#define G78X_LOCAL_TEMP_HIGH_LIMIT_R 0x05 -#define G78X_LOCAL_TEMP_LOW_LIMIT_R 0x06 -#define G78X_REMOTE1_TEMP_HIGH_LIMIT_R 0x07 -#define G78X_REMOTE1_TEMP_LOW_LIMIT_R 0x08 -#define G78X_CONFIGURATION_W 0x09 -#define G78X_CONVERSION_RATE_W 0x0a -#define G78X_LOCAL_TEMP_HIGH_LIMIT_W 0x0b -#define G78X_LOCAL_TEMP_LOW_LIMIT_W 0x0c -#define G78X_REMOTE1_TEMP_HIGH_LIMIT_W 0x0d -#define G78X_REMOTE1_TEMP_LOW_LIMIT_W 0x0e -#define G78X_ONESHOT 0x0f -#define G78X_REMOTE1_TEMP_EXTENDED 0x10 -#define G78X_REMOTE1_TEMP_OFFSET_HIGH 0x11 -#define G78X_REMOTE1_TEMP_OFFSET_EXTD 0x12 -#define G78X_REMOTE1_T_HIGH_LIMIT_EXTD 0x13 -#define G78X_REMOTE1_T_LOW_LIMIT_EXTD 0x14 -#define G78X_REMOTE1_TEMP_THERM_LIMIT 0x19 -#define G78X_LOCAL_TEMP_THERM_LIMIT 0x20 -#define G78X_THERM_HYSTERESIS 0x21 -#define G78X_ALERT_FAULT_QUEUE_CODE 0x22 -#define G78X_MANUFACTURER_ID 0xFE -#define G78X_DEVICE_ID 0xFF +#define G78X_TEMP_LOCAL 0x00 +#define G78X_TEMP_REMOTE1 0x01 +#define G78X_STATUS 0x02 +#define G78X_CONFIGURATION_R 0x03 +#define G78X_CONVERSION_RATE_R 0x04 +#define G78X_LOCAL_TEMP_HIGH_LIMIT_R 0x05 +#define G78X_LOCAL_TEMP_LOW_LIMIT_R 0x06 +#define G78X_REMOTE1_TEMP_HIGH_LIMIT_R 0x07 +#define G78X_REMOTE1_TEMP_LOW_LIMIT_R 0x08 +#define G78X_CONFIGURATION_W 0x09 +#define G78X_CONVERSION_RATE_W 0x0a +#define G78X_LOCAL_TEMP_HIGH_LIMIT_W 0x0b +#define G78X_LOCAL_TEMP_LOW_LIMIT_W 0x0c +#define G78X_REMOTE1_TEMP_HIGH_LIMIT_W 0x0d +#define G78X_REMOTE1_TEMP_LOW_LIMIT_W 0x0e +#define G78X_ONESHOT 0x0f +#define G78X_REMOTE1_TEMP_EXTENDED 0x10 +#define G78X_REMOTE1_TEMP_OFFSET_HIGH 0x11 +#define G78X_REMOTE1_TEMP_OFFSET_EXTD 0x12 +#define G78X_REMOTE1_T_HIGH_LIMIT_EXTD 0x13 +#define G78X_REMOTE1_T_LOW_LIMIT_EXTD 0x14 +#define G78X_REMOTE1_TEMP_THERM_LIMIT 0x19 +#define G78X_LOCAL_TEMP_THERM_LIMIT 0x20 +#define G78X_THERM_HYSTERESIS 0x21 +#define G78X_ALERT_FAULT_QUEUE_CODE 0x22 +#define G78X_MANUFACTURER_ID 0xFE +#define G78X_DEVICE_ID 0xFF /* Config register bits */ -#define G78X_CONFIGURATION_STANDBY BIT(6) -#define G78X_CONFIGURATION_ALERT_MASK BIT(7) +#define G78X_CONFIGURATION_STANDBY BIT(6) +#define G78X_CONFIGURATION_ALERT_MASK BIT(7) /* Status register bits */ -#define G78X_STATUS_LOCAL_TEMP_THERM_ALARM BIT(0) -#define G78X_STATUS_REMOTE1_TEMP_THERM_ALARM BIT(1) -#define G78X_STATUS_REMOTE1_TEMP_FAULT BIT(2) -#define G78X_STATUS_REMOTE1_TEMP_LOW_ALARM BIT(3) -#define G78X_STATUS_REMOTE1_TEMP_HIGH_ALARM BIT(4) -#define G78X_STATUS_LOCAL_TEMP_LOW_ALARM BIT(5) -#define G78X_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(6) -#define G78X_STATUS_BUSY BIT(7) +#define G78X_STATUS_LOCAL_TEMP_THERM_ALARM BIT(0) +#define G78X_STATUS_REMOTE1_TEMP_THERM_ALARM BIT(1) +#define G78X_STATUS_REMOTE1_TEMP_FAULT BIT(2) +#define G78X_STATUS_REMOTE1_TEMP_LOW_ALARM BIT(3) +#define G78X_STATUS_REMOTE1_TEMP_HIGH_ALARM BIT(4) +#define G78X_STATUS_LOCAL_TEMP_LOW_ALARM BIT(5) +#define G78X_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(6) +#define G78X_STATUS_BUSY BIT(7) #elif defined(CONFIG_TEMP_SENSOR_G782) /* G782 register */ -#define G78X_TEMP_LOCAL 0x00 -#define G78X_TEMP_REMOTE1 0x01 -#define G78X_TEMP_REMOTE2 0x02 -#define G78X_STATUS 0x03 -#define G78X_CONFIGURATION_R 0x04 -#define G78X_CONFIGURATION_W 0x04 -#define G78X_CONVERSION_RATE_R 0x05 -#define G78X_CONVERSION_RATE_W 0x05 -#define G78X_LOCAL_TEMP_HIGH_LIMIT_R 0x06 -#define G78X_LOCAL_TEMP_HIGH_LIMIT_W 0x06 -#define G78X_LOCAL_TEMP_LOW_LIMIT_R 0x07 -#define G78X_LOCAL_TEMP_LOW_LIMIT_W 0x07 -#define G78X_REMOTE1_TEMP_HIGH_LIMIT_R 0x08 -#define G78X_REMOTE1_TEMP_HIGH_LIMIT_W 0x08 -#define G78X_REMOTE1_TEMP_LOW_LIMIT_R 0x09 -#define G78X_REMOTE1_TEMP_LOW_LIMIT_W 0x09 -#define G78X_REMOTE2_TEMP_HIGH_LIMIT_R 0x0a -#define G78X_REMOTE2_TEMP_HIGH_LIMIT_W 0x0a -#define G78X_REMOTE2_TEMP_LOW_LIMIT_R 0x0b -#define G78X_REMOTE2_TEMP_LOW_LIMIT_W 0x0b -#define G78X_ONESHOT 0x0c -#define G78X_REMOTE1_TEMP_EXTENDED 0x0d -#define G78X_REMOTE1_TEMP_OFFSET_HIGH 0x0e -#define G78X_REMOTE1_TEMP_OFFSET_EXTD 0x0f -#define G78X_REMOTE1_T_HIGH_LIMIT_EXTD 0x10 -#define G78X_REMOTE1_T_LOW_LIMIT_EXTD 0x11 -#define G78X_REMOTE1_TEMP_THERM_LIMIT 0x12 -#define G78X_REMOTE2_TEMP_EXTENDED 0x13 -#define G78X_REMOTE2_TEMP_OFFSET_HIGH 0x14 -#define G78X_REMOTE2_TEMP_OFFSET_EXTD 0x15 -#define G78X_REMOTE2_T_HIGH_LIMIT_EXTD 0x16 -#define G78X_REMOTE2_T_LOW_LIMIT_EXTD 0x17 -#define G78X_REMOTE2_TEMP_THERM_LIMIT 0x18 -#define G78X_STATUS1 0x19 -#define G78X_LOCAL_TEMP_THERM_LIMIT 0x20 -#define G78X_THERM_HYSTERESIS 0x21 -#define G78X_ALERT_FAULT_QUEUE_CODE 0x22 -#define G78X_MANUFACTURER_ID 0xFE -#define G78X_DEVICE_ID 0xFF +#define G78X_TEMP_LOCAL 0x00 +#define G78X_TEMP_REMOTE1 0x01 +#define G78X_TEMP_REMOTE2 0x02 +#define G78X_STATUS 0x03 +#define G78X_CONFIGURATION_R 0x04 +#define G78X_CONFIGURATION_W 0x04 +#define G78X_CONVERSION_RATE_R 0x05 +#define G78X_CONVERSION_RATE_W 0x05 +#define G78X_LOCAL_TEMP_HIGH_LIMIT_R 0x06 +#define G78X_LOCAL_TEMP_HIGH_LIMIT_W 0x06 +#define G78X_LOCAL_TEMP_LOW_LIMIT_R 0x07 +#define G78X_LOCAL_TEMP_LOW_LIMIT_W 0x07 +#define G78X_REMOTE1_TEMP_HIGH_LIMIT_R 0x08 +#define G78X_REMOTE1_TEMP_HIGH_LIMIT_W 0x08 +#define G78X_REMOTE1_TEMP_LOW_LIMIT_R 0x09 +#define G78X_REMOTE1_TEMP_LOW_LIMIT_W 0x09 +#define G78X_REMOTE2_TEMP_HIGH_LIMIT_R 0x0a +#define G78X_REMOTE2_TEMP_HIGH_LIMIT_W 0x0a +#define G78X_REMOTE2_TEMP_LOW_LIMIT_R 0x0b +#define G78X_REMOTE2_TEMP_LOW_LIMIT_W 0x0b +#define G78X_ONESHOT 0x0c +#define G78X_REMOTE1_TEMP_EXTENDED 0x0d +#define G78X_REMOTE1_TEMP_OFFSET_HIGH 0x0e +#define G78X_REMOTE1_TEMP_OFFSET_EXTD 0x0f +#define G78X_REMOTE1_T_HIGH_LIMIT_EXTD 0x10 +#define G78X_REMOTE1_T_LOW_LIMIT_EXTD 0x11 +#define G78X_REMOTE1_TEMP_THERM_LIMIT 0x12 +#define G78X_REMOTE2_TEMP_EXTENDED 0x13 +#define G78X_REMOTE2_TEMP_OFFSET_HIGH 0x14 +#define G78X_REMOTE2_TEMP_OFFSET_EXTD 0x15 +#define G78X_REMOTE2_T_HIGH_LIMIT_EXTD 0x16 +#define G78X_REMOTE2_T_LOW_LIMIT_EXTD 0x17 +#define G78X_REMOTE2_TEMP_THERM_LIMIT 0x18 +#define G78X_STATUS1 0x19 +#define G78X_LOCAL_TEMP_THERM_LIMIT 0x20 +#define G78X_THERM_HYSTERESIS 0x21 +#define G78X_ALERT_FAULT_QUEUE_CODE 0x22 +#define G78X_MANUFACTURER_ID 0xFE +#define G78X_DEVICE_ID 0xFF /* Config register bits */ -#define G78X_CONFIGURATION_REMOTE2_DIS BIT(5) -#define G78X_CONFIGURATION_STANDBY BIT(6) -#define G78X_CONFIGURATION_ALERT_MASK BIT(7) +#define G78X_CONFIGURATION_REMOTE2_DIS BIT(5) +#define G78X_CONFIGURATION_STANDBY BIT(6) +#define G78X_CONFIGURATION_ALERT_MASK BIT(7) /* Status register bits */ -#define G78X_STATUS_LOCAL_TEMP_LOW_ALARM BIT(0) -#define G78X_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(1) -#define G78X_STATUS_LOCAL_TEMP_THERM_ALARM BIT(2) -#define G78X_STATUS_REMOTE2_TEMP_THERM_ALARM BIT(3) -#define G78X_STATUS_REMOTE1_TEMP_THERM_ALARM BIT(4) -#define G78X_STATUS_REMOTE2_TEMP_FAULT BIT(5) -#define G78X_STATUS_REMOTE1_TEMP_FAULT BIT(6) -#define G78X_STATUS_BUSY BIT(7) +#define G78X_STATUS_LOCAL_TEMP_LOW_ALARM BIT(0) +#define G78X_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(1) +#define G78X_STATUS_LOCAL_TEMP_THERM_ALARM BIT(2) +#define G78X_STATUS_REMOTE2_TEMP_THERM_ALARM BIT(3) +#define G78X_STATUS_REMOTE1_TEMP_THERM_ALARM BIT(4) +#define G78X_STATUS_REMOTE2_TEMP_FAULT BIT(5) +#define G78X_STATUS_REMOTE1_TEMP_FAULT BIT(6) +#define G78X_STATUS_BUSY BIT(7) /* Status1 register bits */ -#define G78X_STATUS_REMOTE2_TEMP_LOW_ALARM BIT(4) -#define G78X_STATUS_REMOTE2_TEMP_HIGH_ALARM BIT(5) -#define G78X_STATUS_REMOTE1_TEMP_LOW_ALARM BIT(6) -#define G78X_STATUS_REMOTE1_TEMP_HIGH_ALARM BIT(7) +#define G78X_STATUS_REMOTE2_TEMP_LOW_ALARM BIT(4) +#define G78X_STATUS_REMOTE2_TEMP_HIGH_ALARM BIT(5) +#define G78X_STATUS_REMOTE1_TEMP_LOW_ALARM BIT(6) +#define G78X_STATUS_REMOTE1_TEMP_HIGH_ALARM BIT(7) #endif /** @@ -137,4 +137,4 @@ */ int g78x_get_val(int idx, int *temp_ptr); -#endif /* __CROS_EC_G78X_H */ +#endif /* __CROS_EC_G78X_H */ diff --git a/driver/temp_sensor/oti502.c b/driver/temp_sensor/oti502.c index b58d1c3e96..2051df89f6 100644 --- a/driver/temp_sensor/oti502.c +++ b/driver/temp_sensor/oti502.c @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -12,13 +12,13 @@ #include "hooks.h" #include "util.h" -static int temp_val_ambient; /* Ambient is chip temperature*/ -static int temp_val_object; /* Object is IR temperature */ +static int temp_val_ambient; /* Ambient is chip temperature*/ +static int temp_val_object; /* Object is IR temperature */ static int oti502_read_block(const int offset, uint8_t *data, int len) { - return i2c_read_block(I2C_PORT_THERMAL, OTI502_I2C_ADDR_FLAGS, - offset, data, len); + return i2c_read_block(I2C_PORT_THERMAL, OTI502_I2C_ADDR_FLAGS, offset, + data, len); } int oti502_get_val(int idx, int *temp_ptr) diff --git a/driver/temp_sensor/oti502.h b/driver/temp_sensor/oti502.h index 4e846282c1..fd09362589 100644 --- a/driver/temp_sensor/oti502.h +++ b/driver/temp_sensor/oti502.h @@ -1,4 +1,4 @@ -/* Copyright 2019 The Chromium OS Authors. All rights reserved. +/* Copyright 2019 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -8,10 +8,10 @@ #ifndef __CROS_EC_OTI502_H #define __CROS_EC_OTI502_H -#define OTI502_I2C_ADDR_FLAGS 0x10 +#define OTI502_I2C_ADDR_FLAGS 0x10 -#define OTI502_IDX_AMBIENT 0 -#define OTI502_IDX_OBJECT 1 +#define OTI502_IDX_AMBIENT 0 +#define OTI502_IDX_OBJECT 1 /** * Get the last polled value of a sensor. @@ -24,4 +24,4 @@ */ int oti502_get_val(int idx, int *temp_ptr); -#endif /* __CROS_EC_OTI502_H */ +#endif /* __CROS_EC_OTI502_H */ diff --git a/driver/temp_sensor/pct2075.c b/driver/temp_sensor/pct2075.c index a5458c72fb..9c7b7190e9 100644 --- a/driver/temp_sensor/pct2075.c +++ b/driver/temp_sensor/pct2075.c @@ -1,4 +1,4 @@ -/* Copyright 2021 The Chromium OS Authors. All rights reserved. +/* Copyright 2021 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,7 +21,7 @@ #define PCT2075_SHIFT1 (16 - PCT2075_RESOLUTION) #define PCT2075_SHIFT2 (PCT2075_RESOLUTION - 8) -#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args) +#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ##args) static int temp_mk_local[PCT2075_COUNT]; @@ -35,8 +35,8 @@ static int raw_read16(int sensor, const int offset, int *data_ptr) return EC_ERROR_NOT_POWERED; #endif return i2c_read16(pct2075_sensors[sensor].i2c_port, - pct2075_sensors[sensor].i2c_addr_flags, - offset, data_ptr); + pct2075_sensors[sensor].i2c_addr_flags, offset, + data_ptr); } static int get_reg_temp(int sensor, int *temp_ptr) @@ -90,6 +90,6 @@ DECLARE_HOOK(HOOK_SECOND, pct2075_poll, HOOK_PRIO_TEMP_SENSOR); void pct2075_init(void) { -/* Incase we need to initialize somthing */ + /* Incase we need to initialize somthing */ } DECLARE_HOOK(HOOK_INIT, pct2075_init, HOOK_PRIO_DEFAULT); diff --git a/driver/temp_sensor/sb_tsi.c b/driver/temp_sensor/sb_tsi.c index ffcd924b0e..0c58fb88dc 100644 --- a/driver/temp_sensor/sb_tsi.c +++ b/driver/temp_sensor/sb_tsi.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -19,8 +19,8 @@ static int raw_read8(const int offset, int *data_ptr) { - return i2c_read8(I2C_PORT_THERMAL_AP, SB_TSI_I2C_ADDR_FLAGS, - offset, data_ptr); + return i2c_read8(I2C_PORT_THERMAL_AP, SB_TSI_I2C_ADDR_FLAGS, offset, + data_ptr); } int sb_tsi_get_val(int idx, int *temp_ptr) diff --git a/driver/temp_sensor/thermistor.c b/driver/temp_sensor/thermistor.c index bef10416b6..25fe0f56e8 100644 --- a/driver/temp_sensor/thermistor.c +++ b/driver/temp_sensor/thermistor.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -9,13 +9,14 @@ */ #include "adc.h" +#include "builtin/assert.h" #include "common.h" #include "gpio.h" #include "temp_sensor/thermistor.h" #include "util.h" int thermistor_linear_interpolate(uint16_t mv, - const struct thermistor_info *info) + const struct thermistor_info *info) { const struct thermistor_data_pair *data = info->data; int v_high = 0, v_low = 0, t_low, t_high, num_steps; @@ -66,7 +67,7 @@ int thermistor_linear_interpolate(uint16_t mv, return t_low + num_steps; } -#if defined(CONFIG_STEINHART_HART_3V3_51K1_47K_4050B) || \ +#if defined(CONFIG_STEINHART_HART_3V3_51K1_47K_4050B) || \ defined(CONFIG_STEINHART_HART_3V3_13K7_47K_4050B) || \ defined(CONFIG_STEINHART_HART_6V0_51K1_47K_4050B) || \ defined(CONFIG_STEINHART_HART_3V0_22K6_47K_4050B) || \ @@ -103,19 +104,19 @@ int thermistor_get_temperature(int idx_adc, int *temp_ptr, */ #define THERMISTOR_SCALING_FACTOR_51_47 11 static const struct thermistor_data_pair thermistor_data_51_47[] = { - { 2484 / THERMISTOR_SCALING_FACTOR_51_47, 0 }, - { 2142 / THERMISTOR_SCALING_FACTOR_51_47, 10 }, - { 1767 / THERMISTOR_SCALING_FACTOR_51_47, 20 }, - { 1400 / THERMISTOR_SCALING_FACTOR_51_47, 30 }, - { 1072 / THERMISTOR_SCALING_FACTOR_51_47, 40 }, - { 802 / THERMISTOR_SCALING_FACTOR_51_47, 50 }, - { 593 / THERMISTOR_SCALING_FACTOR_51_47, 60 }, - { 436 / THERMISTOR_SCALING_FACTOR_51_47, 70 }, - { 321 / THERMISTOR_SCALING_FACTOR_51_47, 80 }, - { 276 / THERMISTOR_SCALING_FACTOR_51_47, 85 }, - { 237 / THERMISTOR_SCALING_FACTOR_51_47, 90 }, - { 204 / THERMISTOR_SCALING_FACTOR_51_47, 95 }, - { 177 / THERMISTOR_SCALING_FACTOR_51_47, 100 }, + { 2484 / THERMISTOR_SCALING_FACTOR_51_47, 0 }, + { 2142 / THERMISTOR_SCALING_FACTOR_51_47, 10 }, + { 1767 / THERMISTOR_SCALING_FACTOR_51_47, 20 }, + { 1400 / THERMISTOR_SCALING_FACTOR_51_47, 30 }, + { 1072 / THERMISTOR_SCALING_FACTOR_51_47, 40 }, + { 802 / THERMISTOR_SCALING_FACTOR_51_47, 50 }, + { 593 / THERMISTOR_SCALING_FACTOR_51_47, 60 }, + { 436 / THERMISTOR_SCALING_FACTOR_51_47, 70 }, + { 321 / THERMISTOR_SCALING_FACTOR_51_47, 80 }, + { 276 / THERMISTOR_SCALING_FACTOR_51_47, 85 }, + { 237 / THERMISTOR_SCALING_FACTOR_51_47, 90 }, + { 204 / THERMISTOR_SCALING_FACTOR_51_47, 95 }, + { 177 / THERMISTOR_SCALING_FACTOR_51_47, 100 }, }; static const struct thermistor_info thermistor_info_51_47 = { @@ -127,7 +128,7 @@ static const struct thermistor_info thermistor_info_51_47 = { int get_temp_3v3_51k1_47k_4050b(int idx_adc, int *temp_ptr) { return thermistor_get_temperature(idx_adc, temp_ptr, - &thermistor_info_51_47); + &thermistor_info_51_47); } #endif /* CONFIG_STEINHART_HART_3V3_51K1_47K_4050B */ @@ -139,19 +140,19 @@ int get_temp_3v3_51k1_47k_4050b(int idx_adc, int *temp_ptr) */ #define THERMISTOR_SCALING_FACTOR_13_47 13 static const struct thermistor_data_pair thermistor_data_13_47[] = { - { 3033 / THERMISTOR_SCALING_FACTOR_13_47, 0 }, - { 2882 / THERMISTOR_SCALING_FACTOR_13_47, 10 }, - { 2677 / THERMISTOR_SCALING_FACTOR_13_47, 20 }, - { 2420 / THERMISTOR_SCALING_FACTOR_13_47, 30 }, - { 2119 / THERMISTOR_SCALING_FACTOR_13_47, 40 }, - { 1799 / THERMISTOR_SCALING_FACTOR_13_47, 50 }, - { 1485 / THERMISTOR_SCALING_FACTOR_13_47, 60 }, - { 1197 / THERMISTOR_SCALING_FACTOR_13_47, 70 }, - { 947 / THERMISTOR_SCALING_FACTOR_13_47, 80 }, - { 839 / THERMISTOR_SCALING_FACTOR_13_47, 85 }, - { 741 / THERMISTOR_SCALING_FACTOR_13_47, 90 }, - { 653 / THERMISTOR_SCALING_FACTOR_13_47, 95 }, - { 576 / THERMISTOR_SCALING_FACTOR_13_47, 100 }, + { 3033 / THERMISTOR_SCALING_FACTOR_13_47, 0 }, + { 2882 / THERMISTOR_SCALING_FACTOR_13_47, 10 }, + { 2677 / THERMISTOR_SCALING_FACTOR_13_47, 20 }, + { 2420 / THERMISTOR_SCALING_FACTOR_13_47, 30 }, + { 2119 / THERMISTOR_SCALING_FACTOR_13_47, 40 }, + { 1799 / THERMISTOR_SCALING_FACTOR_13_47, 50 }, + { 1485 / THERMISTOR_SCALING_FACTOR_13_47, 60 }, + { 1197 / THERMISTOR_SCALING_FACTOR_13_47, 70 }, + { 947 / THERMISTOR_SCALING_FACTOR_13_47, 80 }, + { 839 / THERMISTOR_SCALING_FACTOR_13_47, 85 }, + { 741 / THERMISTOR_SCALING_FACTOR_13_47, 90 }, + { 653 / THERMISTOR_SCALING_FACTOR_13_47, 95 }, + { 576 / THERMISTOR_SCALING_FACTOR_13_47, 100 }, }; static const struct thermistor_info thermistor_info_13_47 = { @@ -163,7 +164,7 @@ static const struct thermistor_info thermistor_info_13_47 = { int get_temp_3v3_13k7_47k_4050b(int idx_adc, int *temp_ptr) { return thermistor_get_temperature(idx_adc, temp_ptr, - &thermistor_info_13_47); + &thermistor_info_13_47); } #endif /* CONFIG_STEINHART_HART_3V3_13K7_47K_4050B */ @@ -175,19 +176,19 @@ int get_temp_3v3_13k7_47k_4050b(int idx_adc, int *temp_ptr) */ #define THERMISTOR_SCALING_FACTOR_6V0_51_47 18 static const struct thermistor_data_pair thermistor_data_6v0_51_47[] = { - { 4517 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 0 }, - { 3895 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 10 }, - { 3214 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 20 }, - { 2546 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 30 }, - { 1950 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 40 }, - { 1459 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 50 }, - { 1079 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 60 }, - { 794 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 70 }, - { 584 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 80 }, - { 502 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 85 }, - { 432 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 90 }, - { 372 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 95 }, - { 322 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 100 }, + { 4517 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 0 }, + { 3895 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 10 }, + { 3214 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 20 }, + { 2546 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 30 }, + { 1950 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 40 }, + { 1459 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 50 }, + { 1079 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 60 }, + { 794 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 70 }, + { 584 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 80 }, + { 502 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 85 }, + { 432 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 90 }, + { 372 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 95 }, + { 322 / THERMISTOR_SCALING_FACTOR_6V0_51_47, 100 }, }; static const struct thermistor_info thermistor_info_6v0_51_47 = { @@ -199,7 +200,7 @@ static const struct thermistor_info thermistor_info_6v0_51_47 = { int get_temp_6v0_51k1_47k_4050b(int idx_adc, int *temp_ptr) { return thermistor_get_temperature(idx_adc, temp_ptr, - &thermistor_info_6v0_51_47); + &thermistor_info_6v0_51_47); } #endif /* CONFIG_STEINHART_HART_6V0_51K1_47K_4050B */ @@ -211,19 +212,19 @@ int get_temp_6v0_51k1_47k_4050b(int idx_adc, int *temp_ptr) */ #define THERMISTOR_SCALING_FACTOR_22_47 11 static const struct thermistor_data_pair thermistor_data_22_47[] = { - { 2619 / THERMISTOR_SCALING_FACTOR_22_47, 0 }, - { 2421 / THERMISTOR_SCALING_FACTOR_22_47, 10 }, - { 2168 / THERMISTOR_SCALING_FACTOR_22_47, 20 }, - { 1875 / THERMISTOR_SCALING_FACTOR_22_47, 30 }, - { 1563 / THERMISTOR_SCALING_FACTOR_22_47, 40 }, - { 1262 / THERMISTOR_SCALING_FACTOR_22_47, 50 }, - { 994 / THERMISTOR_SCALING_FACTOR_22_47, 60 }, - { 769 / THERMISTOR_SCALING_FACTOR_22_47, 70 }, - { 588 / THERMISTOR_SCALING_FACTOR_22_47, 80 }, - { 513 / THERMISTOR_SCALING_FACTOR_22_47, 85 }, - { 448 / THERMISTOR_SCALING_FACTOR_22_47, 90 }, - { 390 / THERMISTOR_SCALING_FACTOR_22_47, 95 }, - { 340 / THERMISTOR_SCALING_FACTOR_22_47, 100 }, + { 2619 / THERMISTOR_SCALING_FACTOR_22_47, 0 }, + { 2421 / THERMISTOR_SCALING_FACTOR_22_47, 10 }, + { 2168 / THERMISTOR_SCALING_FACTOR_22_47, 20 }, + { 1875 / THERMISTOR_SCALING_FACTOR_22_47, 30 }, + { 1563 / THERMISTOR_SCALING_FACTOR_22_47, 40 }, + { 1262 / THERMISTOR_SCALING_FACTOR_22_47, 50 }, + { 994 / THERMISTOR_SCALING_FACTOR_22_47, 60 }, + { 769 / THERMISTOR_SCALING_FACTOR_22_47, 70 }, + { 588 / THERMISTOR_SCALING_FACTOR_22_47, 80 }, + { 513 / THERMISTOR_SCALING_FACTOR_22_47, 85 }, + { 448 / THERMISTOR_SCALING_FACTOR_22_47, 90 }, + { 390 / THERMISTOR_SCALING_FACTOR_22_47, 95 }, + { 340 / THERMISTOR_SCALING_FACTOR_22_47, 100 }, }; static const struct thermistor_info thermistor_info_22_47 = { @@ -235,7 +236,7 @@ static const struct thermistor_info thermistor_info_22_47 = { int get_temp_3v0_22k6_47k_4050b(int idx_adc, int *temp_ptr) { return thermistor_get_temperature(idx_adc, temp_ptr, - &thermistor_info_22_47); + &thermistor_info_22_47); } #endif /* CONFIG_STEINHART_HART_3V0_22K6_47K_4050B */ @@ -247,16 +248,16 @@ int get_temp_3v0_22k6_47k_4050b(int idx_adc, int *temp_ptr) */ #define THERMISTOR_SCALING_FACTOR_31_47 11 static const struct thermistor_data_pair thermistor_data_31_47[] = { - { 2753 / THERMISTOR_SCALING_FACTOR_31_47, 0 }, - { 2487 / THERMISTOR_SCALING_FACTOR_31_47, 10 }, - { 2165 / THERMISTOR_SCALING_FACTOR_31_47, 20 }, - { 1813 / THERMISTOR_SCALING_FACTOR_31_47, 30 }, - { 1145 / THERMISTOR_SCALING_FACTOR_31_47, 50 }, - { 878 / THERMISTOR_SCALING_FACTOR_31_47, 60 }, - { 665 / THERMISTOR_SCALING_FACTOR_31_47, 70 }, - { 500 / THERMISTOR_SCALING_FACTOR_31_47, 80 }, - { 375 / THERMISTOR_SCALING_FACTOR_31_47, 90 }, - { 282 / THERMISTOR_SCALING_FACTOR_31_47, 100 }, + { 2753 / THERMISTOR_SCALING_FACTOR_31_47, 0 }, + { 2487 / THERMISTOR_SCALING_FACTOR_31_47, 10 }, + { 2165 / THERMISTOR_SCALING_FACTOR_31_47, 20 }, + { 1813 / THERMISTOR_SCALING_FACTOR_31_47, 30 }, + { 1145 / THERMISTOR_SCALING_FACTOR_31_47, 50 }, + { 878 / THERMISTOR_SCALING_FACTOR_31_47, 60 }, + { 665 / THERMISTOR_SCALING_FACTOR_31_47, 70 }, + { 500 / THERMISTOR_SCALING_FACTOR_31_47, 80 }, + { 375 / THERMISTOR_SCALING_FACTOR_31_47, 90 }, + { 282 / THERMISTOR_SCALING_FACTOR_31_47, 100 }, }; static const struct thermistor_info thermistor_info_31_47 = { @@ -268,6 +269,6 @@ static const struct thermistor_info thermistor_info_31_47 = { int get_temp_3v3_30k9_47k_4050b(int idx_adc, int *temp_ptr) { return thermistor_get_temperature(idx_adc, temp_ptr, - &thermistor_info_31_47); + &thermistor_info_31_47); } #endif /* CONFIG_STEINHART_HART_3V3_30K9_47K_4050B */ diff --git a/driver/temp_sensor/thermistor_ncp15wb.c b/driver/temp_sensor/thermistor_ncp15wb.c index dba06ee326..93896cfcc2 100644 --- a/driver/temp_sensor/thermistor_ncp15wb.c +++ b/driver/temp_sensor/thermistor_ncp15wb.c @@ -1,4 +1,4 @@ -/* Copyright 2015 The Chromium OS Authors. All rights reserved. +/* Copyright 2015 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -15,30 +15,30 @@ * For 50C through 100C, use linear interpolation from discreet points * in table below. For temps < 50C, use a simplified linear function. */ -#define ADC_DISCREET_RANGE_START_TEMP 50 +#define ADC_DISCREET_RANGE_START_TEMP 50 /* 10 bit ADC result corresponding to START_TEMP */ -#define ADC_DISCREET_RANGE_START_RESULT 407 +#define ADC_DISCREET_RANGE_START_RESULT 407 -#define ADC_DISCREET_RANGE_LIMIT_TEMP 100 +#define ADC_DISCREET_RANGE_LIMIT_TEMP 100 /* 10 bit ADC result corresponding to LIMIT_TEMP */ -#define ADC_DISCREET_RANGE_LIMIT_RESULT 107 +#define ADC_DISCREET_RANGE_LIMIT_RESULT 107 /* Table entries in steppings of 5C */ -#define ADC_DISCREET_RANGE_STEP 5 +#define ADC_DISCREET_RANGE_STEP 5 /* Discreet range ADC results (9 bit) per temperature, in 5 degree steps */ static const uint8_t adc_result[] = { - 203, /* 50 C */ - 178, /* 55 C */ - 157, /* 60 C */ - 138, /* 65 C */ - 121, /* 70 C */ - 106, /* 75 C */ - 93, /* 80 C */ - 81, /* 85 C */ - 70, /* 90 C */ - 61, /* 95 C */ - 53, /* 100 C */ + 203, /* 50 C */ + 178, /* 55 C */ + 157, /* 60 C */ + 138, /* 65 C */ + 121, /* 70 C */ + 106, /* 75 C */ + 93, /* 80 C */ + 81, /* 85 C */ + 70, /* 90 C */ + 61, /* 95 C */ + 53, /* 100 C */ }; /* @@ -46,8 +46,9 @@ static const uint8_t adc_result[] = { * to 50C, the temperature curve is roughly linear, so we don't need to include * data points in our table. */ -#define adc_to_temp(result) (ADC_DISCREET_RANGE_START_TEMP - \ - (((result) - ADC_DISCREET_RANGE_START_RESULT) * 3 + 16) / 32) +#define adc_to_temp(result) \ + (ADC_DISCREET_RANGE_START_TEMP - \ + (((result)-ADC_DISCREET_RANGE_START_RESULT) * 3 + 16) / 32) /* Convert ADC result (10 bit) to temperature in celsius */ int ncp15wb_calculate_temp(uint16_t adc) @@ -72,8 +73,7 @@ int ncp15wb_calculate_temp(uint16_t adc) tail = ARRAY_SIZE(adc_result) - 1; while (head != tail) { mid = (head + tail) / 2; - if (adc_result[mid] >= adc && - adc_result[mid+1] < adc) + if (adc_result[mid] >= adc && adc_result[mid + 1] < adc) break; if (adc_result[mid] > adc) head = mid + 1; @@ -85,7 +85,9 @@ int ncp15wb_calculate_temp(uint16_t adc) if (head != tail) { delta = adc_result[mid] - adc_result[mid + 1]; step = ((adc_result[mid] - adc) * - ADC_DISCREET_RANGE_STEP + delta / 2) / delta; + ADC_DISCREET_RANGE_STEP + + delta / 2) / + delta; } else { /* Edge case where adc = max */ mid = head; diff --git a/driver/temp_sensor/tmp006.c b/driver/temp_sensor/tmp006.c index 96922c857c..e3cb62276a 100644 --- a/driver/temp_sensor/tmp006.c +++ b/driver/temp_sensor/tmp006.c @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -19,7 +19,7 @@ /* Console output macros */ #define CPUTS(outstr) cputs(CC_THERMAL, outstr) -#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args) +#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ##args) /* * Alg 0 was what's in the TMP006 User's Guide. Alg 1 is Alg 0, but with @@ -30,23 +30,23 @@ #define ALGORITHM_PARAMS 12 /* Flags for tdata->fail */ -#define FAIL_INIT BIT(0) /* Just initialized */ -#define FAIL_POWER BIT(1) /* Sensor not powered */ -#define FAIL_I2C BIT(2) /* I2C communication error */ -#define FAIL_NOT_READY BIT(3) /* Data not ready */ +#define FAIL_INIT BIT(0) /* Just initialized */ +#define FAIL_POWER BIT(1) /* Sensor not powered */ +#define FAIL_I2C BIT(2) /* I2C communication error */ +#define FAIL_NOT_READY BIT(3) /* Data not ready */ /* State and conversion factors to track for each sensor */ struct tmp006_data_t { /* chip info */ - int16_t v_raw; /* TMP006_REG_VOBJ */ - int16_t t_raw0; /* TMP006_REG_TDIE */ - int fail; /* Fail flags; non-zero if last read failed */ + int16_t v_raw; /* TMP006_REG_VOBJ */ + int16_t t_raw0; /* TMP006_REG_TDIE */ + int fail; /* Fail flags; non-zero if last read failed */ /* calibration params */ - float s0, a1, a2; /* Sensitivity factors */ - float b0, b1, b2; /* Self-heating correction */ - float c2; /* Seebeck effect */ - float d0, d1, ds; /* Tdie filter and slope adjustment */ - float e0, e1; /* Tobj output filter */ + float s0, a1, a2; /* Sensitivity factors */ + float b0, b1, b2; /* Self-heating correction */ + float c2; /* Seebeck effect */ + float d0, d1, ds; /* Tdie filter and slope adjustment */ + float e0, e1; /* Tobj output filter */ /* FIR filter stages */ float tdie1, tobj1; }; @@ -57,7 +57,7 @@ static const struct tmp006_data_t tmp006_data_default = { .fail = FAIL_INIT, /* Alg 0 params from User's Guide */ - .s0 = 0.0f, /* zero == "uncalibrated" */ + .s0 = 0.0f, /* zero == "uncalibrated" */ .a1 = 1.75e-3f, .a2 = -1.678e-5f, .b0 = -2.94e-5f, @@ -104,8 +104,7 @@ static void tmp006_poll_sensor(int sensor_id) * data ready; otherwise, we read garbage data. */ if (tdata->fail & (FAIL_POWER | FAIL_INIT)) { - rv = i2c_read16(TMP006_PORT(addr_flags), - TMP006_REG(addr_flags), + rv = i2c_read16(TMP006_PORT(addr_flags), TMP006_REG(addr_flags), TMP006_REG_CONFIG, &v); if (rv) { tdata->fail |= FAIL_I2C; @@ -117,16 +116,14 @@ static void tmp006_poll_sensor(int sensor_id) } } - rv = i2c_read16(TMP006_PORT(addr_flags), - TMP006_REG(addr_flags), + rv = i2c_read16(TMP006_PORT(addr_flags), TMP006_REG(addr_flags), TMP006_REG_TDIE, &t); if (rv) { tdata->fail |= FAIL_I2C; return; } - rv = i2c_read16(TMP006_PORT(addr_flags), - TMP006_REG(addr_flags), + rv = i2c_read16(TMP006_PORT(addr_flags), TMP006_REG(addr_flags), TMP006_REG_VOBJ, &v); if (rv) { tdata->fail |= FAIL_I2C; @@ -179,8 +176,7 @@ static int tmp006_read_die_temp_k(const struct tmp006_data_t *tdata, * This uses Tdie and Vobj and a bunch of magic parameters to calculate the * object temperature, Tobj. */ -static int tmp006_read_object_temp_k(struct tmp006_data_t *tdata, - int *temp_ptr) +static int tmp006_read_object_temp_k(struct tmp006_data_t *tdata, int *temp_ptr) { float tdie, vobj; float tx, s, vos, vx, fv, tobj, t4; @@ -251,7 +247,7 @@ int tmp006_get_val(int idx, int *temp_ptr) * an I2C error. */ return (tdata->fail & FAIL_I2C) ? EC_ERROR_UNKNOWN : - EC_ERROR_NOT_POWERED; + EC_ERROR_NOT_POWERED; } /* Check the low bit to determine which temperature to read. */ @@ -277,26 +273,24 @@ static enum ec_status tmp006_get_calibration(struct host_cmd_handler_args *args) r1->algorithm = ALGORITHM_NUM; r1->num_params = ALGORITHM_PARAMS; - r1->val[0] = tdata->s0; - r1->val[1] = tdata->a1; - r1->val[2] = tdata->a2; - r1->val[3] = tdata->b0; - r1->val[4] = tdata->b1; - r1->val[5] = tdata->b2; - r1->val[6] = tdata->c2; - r1->val[7] = tdata->d0; - r1->val[8] = tdata->d1; - r1->val[9] = tdata->ds; + r1->val[0] = tdata->s0; + r1->val[1] = tdata->a1; + r1->val[2] = tdata->a2; + r1->val[3] = tdata->b0; + r1->val[4] = tdata->b1; + r1->val[5] = tdata->b2; + r1->val[6] = tdata->c2; + r1->val[7] = tdata->d0; + r1->val[8] = tdata->d1; + r1->val[9] = tdata->ds; r1->val[10] = tdata->e0; r1->val[11] = tdata->e1; - args->response_size = sizeof(*r1) + - r1->num_params * sizeof(r1->val[0]); + args->response_size = sizeof(*r1) + r1->num_params * sizeof(r1->val[0]); return EC_RES_SUCCESS; } -DECLARE_HOST_COMMAND(EC_CMD_TMP006_GET_CALIBRATION, - tmp006_get_calibration, +DECLARE_HOST_COMMAND(EC_CMD_TMP006_GET_CALIBRATION, tmp006_get_calibration, EC_VER_MASK(1)); static enum ec_status tmp006_set_calibration(struct host_cmd_handler_args *args) @@ -329,8 +323,7 @@ static enum ec_status tmp006_set_calibration(struct host_cmd_handler_args *args) return EC_RES_SUCCESS; } -DECLARE_HOST_COMMAND(EC_CMD_TMP006_SET_CALIBRATION, - tmp006_set_calibration, +DECLARE_HOST_COMMAND(EC_CMD_TMP006_SET_CALIBRATION, tmp006_set_calibration, EC_VER_MASK(1)); static enum ec_status tmp006_get_raw(struct host_cmd_handler_args *args) @@ -356,9 +349,7 @@ static enum ec_status tmp006_get_raw(struct host_cmd_handler_args *args) return EC_RES_SUCCESS; } -DECLARE_HOST_COMMAND(EC_CMD_TMP006_GET_RAW, - tmp006_get_raw, - EC_VER_MASK(0)); +DECLARE_HOST_COMMAND(EC_CMD_TMP006_GET_RAW, tmp006_get_raw, EC_VER_MASK(0)); /*****************************************************************************/ /* Console commands */ @@ -375,7 +366,6 @@ static int tmp006_print(int idx) int d; int addr_flags = tmp006_sensors[idx].addr_flags; - ccprintf("Debug data from %s:\n", tmp006_sensors[idx].name); if (!tmp006_has_power(idx)) { @@ -383,41 +373,36 @@ static int tmp006_print(int idx) return EC_ERROR_UNKNOWN; } - rv = i2c_read16(TMP006_PORT(addr_flags), - TMP006_REG(addr_flags), + rv = i2c_read16(TMP006_PORT(addr_flags), TMP006_REG(addr_flags), TMP006_REG_MANUFACTURER_ID, &d); if (rv) return rv; ccprintf(" Manufacturer ID: 0x%04x\n", d); - rv = i2c_read16(TMP006_PORT(addr_flags), - TMP006_REG(addr_flags), + rv = i2c_read16(TMP006_PORT(addr_flags), TMP006_REG(addr_flags), TMP006_REG_DEVICE_ID, &d); ccprintf(" Device ID: 0x%04x\n", d); - rv = i2c_read16(TMP006_PORT(addr_flags), - TMP006_REG(addr_flags), + rv = i2c_read16(TMP006_PORT(addr_flags), TMP006_REG(addr_flags), TMP006_REG_CONFIG, &d); ccprintf(" Config: 0x%04x\n", d); - rv = i2c_read16(TMP006_PORT(addr_flags), - TMP006_REG(addr_flags), + rv = i2c_read16(TMP006_PORT(addr_flags), TMP006_REG(addr_flags), TMP006_REG_VOBJ, &vraw); v = ((int)vraw * 15625) / 100; ccprintf(" Voltage: 0x%04x = %d nV\n", vraw, v); - rv = i2c_read16(TMP006_PORT(addr_flags), - TMP006_REG(addr_flags), + rv = i2c_read16(TMP006_PORT(addr_flags), TMP006_REG(addr_flags), TMP006_REG_TDIE, &traw); t = (int)traw; - ccprintf(" Temperature: 0x%04x = %d.%02d C\n", - traw, t / 128, t > 0 ? t % 128 : 128 - (t % 128)); + ccprintf(" Temperature: 0x%04x = %d.%02d C\n", traw, t / 128, + t > 0 ? t % 128 : 128 - (t % 128)); return EC_SUCCESS; } -static int command_sensor_info(int argc, char **argv) +static int command_sensor_info(int argc, const char **argv) { int i; int rv, rv1; @@ -442,14 +427,13 @@ static int command_sensor_info(int argc, char **argv) return rv1; } -DECLARE_CONSOLE_COMMAND(tmp006, command_sensor_info, - "[ <index> ]", +DECLARE_CONSOLE_COMMAND(tmp006, command_sensor_info, "[ <index> ]", "Print TMP006 sensors"); #endif /* Disable the t6cal command until/unless we have FP support in printf */ #if 0 -static int command_t6cal(int argc, char **argv) +static int command_t6cal(int argc, const char **argv) { struct tmp006_data_t *tdata; char *e; diff --git a/driver/temp_sensor/tmp006.h b/driver/temp_sensor/tmp006.h index 594dbc711a..c3409dde59 100644 --- a/driver/temp_sensor/tmp006.h +++ b/driver/temp_sensor/tmp006.h @@ -1,4 +1,4 @@ -/* Copyright 2014 The Chromium OS Authors. All rights reserved. +/* Copyright 2014 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -9,11 +9,11 @@ #define __CROS_EC_TMP006_H /* Registers within the TMP006 chip */ -#define TMP006_REG_VOBJ 0x00 -#define TMP006_REG_TDIE 0x01 -#define TMP006_REG_CONFIG 0x02 +#define TMP006_REG_VOBJ 0x00 +#define TMP006_REG_TDIE 0x01 +#define TMP006_REG_CONFIG 0x02 #define TMP006_REG_MANUFACTURER_ID 0xfe -#define TMP006_REG_DEVICE_ID 0xff +#define TMP006_REG_DEVICE_ID 0xff /* I2C address components */ #define TMP006_ADDR(PORT, REG) ((PORT << 16) + REG) @@ -22,7 +22,7 @@ struct tmp006_t { const char *name; - int addr_flags; /* I2C address formed by TMP006_ADDR macro. */ + int addr_flags; /* I2C address formed by TMP006_ADDR macro. */ }; /* Names and addresses of the sensors we have */ @@ -40,4 +40,4 @@ extern const struct tmp006_t tmp006_sensors[]; */ int tmp006_get_val(int idx, int *temp_ptr); -#endif /* __CROS_EC_TMP006_H */ +#endif /* __CROS_EC_TMP006_H */ diff --git a/driver/temp_sensor/tmp112.c b/driver/temp_sensor/tmp112.c index 6e726a27b9..f7f28159aa 100644 --- a/driver/temp_sensor/tmp112.c +++ b/driver/temp_sensor/tmp112.c @@ -1,4 +1,4 @@ -/* Copyright 2016 The Chromium OS Authors. All rights reserved. +/* Copyright 2016 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -21,7 +21,7 @@ #define TMP112_SHIFT1 (16 - TMP112_RESOLUTION) #define TMP112_SHIFT2 (TMP112_RESOLUTION - 8) -#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args) +#define CPRINTS(format, args...) cprints(CC_THERMAL, format, ##args) static int temp_mk_local[TMP112_COUNT]; @@ -35,8 +35,8 @@ static int raw_read16(int sensor, const int offset, int *data_ptr) return EC_ERROR_NOT_POWERED; #endif return i2c_read16(tmp112_sensors[sensor].i2c_port, - tmp112_sensors[sensor].i2c_addr_flags, - offset, data_ptr); + tmp112_sensors[sensor].i2c_addr_flags, offset, + data_ptr); } static int raw_write16(int sensor, const int offset, int data) @@ -49,8 +49,7 @@ static int raw_write16(int sensor, const int offset, int data) return EC_ERROR_NOT_POWERED; #endif return i2c_write16(tmp112_sensors[sensor].i2c_port, - tmp112_sensors[sensor].i2c_addr_flags, - offset, data); + tmp112_sensors[sensor].i2c_addr_flags, offset, data); } static int get_reg_temp(int sensor, int *temp_ptr) diff --git a/driver/temp_sensor/tmp411.c b/driver/temp_sensor/tmp411.c index 8db3f9a8d8..8a14440671 100644 --- a/driver/temp_sensor/tmp411.c +++ b/driver/temp_sensor/tmp411.c @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -139,7 +139,7 @@ int tmp411_set_therm_limit(int channel, int limit_c, int hysteresis) return EC_ERROR_INVAL; if (hysteresis > TMP411_HYSTERESIS_HIGH_LIMIT || - hysteresis < TMP411_HYSTERESIS_LOW_LIMIT) + hysteresis < TMP411_HYSTERESIS_LOW_LIMIT) return EC_ERROR_INVAL; /* hysteresis must be less than high limit */ @@ -181,17 +181,14 @@ static void tmp411_temp_sensor_poll(void) if (get_temp(TMP411_REMOTE1, &temp_c) == EC_SUCCESS) temp_val_remote1 = C_TO_K(temp_c); - } DECLARE_HOOK(HOOK_SECOND, tmp411_temp_sensor_poll, HOOK_PRIO_TEMP_SENSOR); #ifdef CONFIG_CMD_TEMP_SENSOR -static void print_temps( - const char *name, - const int tmp411_temp_reg, - const int tmp411_therm_limit_reg, - const int tmp411_high_limit_reg, - const int tmp411_low_limit_reg) +static void print_temps(const char *name, const int tmp411_temp_reg, + const int tmp411_therm_limit_reg, + const int tmp411_high_limit_reg, + const int tmp411_low_limit_reg) { int value; @@ -219,28 +216,24 @@ static int print_status(void) { int value; - print_temps("Local", TMP411_LOCAL, - TMP411_LOCAL_THERM_LIMIT, - TMP411_LOCAL_HIGH_LIMIT_R, - TMP411_LOCAL_LOW_LIMIT_R); + print_temps("Local", TMP411_LOCAL, TMP411_LOCAL_THERM_LIMIT, + TMP411_LOCAL_HIGH_LIMIT_R, TMP411_LOCAL_LOW_LIMIT_R); - print_temps("Remote1", TMP411_REMOTE1, - TMP411_REMOTE1_THERM_LIMIT, - TMP411_REMOTE1_HIGH_LIMIT_R, - TMP411_REMOTE1_LOW_LIMIT_R); + print_temps("Remote1", TMP411_REMOTE1, TMP411_REMOTE1_THERM_LIMIT, + TMP411_REMOTE1_HIGH_LIMIT_R, TMP411_REMOTE1_LOW_LIMIT_R); ccprintf("\n"); if (raw_read8(TMP411_STATUS_R, &value) == EC_SUCCESS) - ccprintf("STATUS: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("STATUS: 0x%x\n", value); if (raw_read8(TMP411_CONFIGURATION1_R, &value) == EC_SUCCESS) - ccprintf("CONFIG1: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("CONFIG1: 0x%x\n", value); return EC_SUCCESS; } -static int command_tmp411(int argc, char **argv) +static int command_tmp411(int argc, const char **argv) { char *command; char *e; @@ -285,8 +278,7 @@ static int command_tmp411(int argc, char **argv) rv = raw_read8(offset, &data); if (rv < 0) return rv; - ccprintf("Byte at offset 0x%02x is %pb\n", - offset, BINARY_VALUE(data, 8)); + ccprintf("Byte at offset 0x%02x is 0x%x\n", offset, data); return rv; } @@ -309,7 +301,8 @@ static int command_tmp411(int argc, char **argv) return rv; } -DECLARE_CONSOLE_COMMAND(tmp411, command_tmp411, +DECLARE_CONSOLE_COMMAND( + tmp411, command_tmp411, "[settemp|setbyte <offset> <value>] or [getbyte <offset>] or" "[power <on|off>]. " "Temps in Celsius.", diff --git a/driver/temp_sensor/tmp411.h b/driver/temp_sensor/tmp411.h index ef1b23278c..0716a2846d 100644 --- a/driver/temp_sensor/tmp411.h +++ b/driver/temp_sensor/tmp411.h @@ -1,4 +1,4 @@ -/* Copyright 2017 The Chromium OS Authors. All rights reserved. +/* Copyright 2017 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -8,83 +8,83 @@ #ifndef __CROS_EC_TMP411_H #define __CROS_EC_TMP411_H -#define TMP411_I2C_ADDR_FLAGS 0x4C +#define TMP411_I2C_ADDR_FLAGS 0x4C -#define TMP411_IDX_LOCAL 0 -#define TMP411_IDX_REMOTE1 1 -#define TMP411_IDX_REMOTE2 2 +#define TMP411_IDX_LOCAL 0 +#define TMP411_IDX_REMOTE1 1 +#define TMP411_IDX_REMOTE2 2 /* Chip-specific registers */ -#define TMP411_LOCAL 0x00 -#define TMP411_REMOTE1 0x01 -#define TMP411_STATUS_R 0x02 -#define TMP411_CONFIGURATION1_R 0x03 -#define TMP411_CONVERSION_RATE_R 0x04 -#define TMP411_LOCAL_HIGH_LIMIT_R 0x05 -#define TMP411_LOCAL_LOW_LIMIT_R 0x06 -#define TMP411_REMOTE1_HIGH_LIMIT_R 0x07 -#define TMP411_REMOTE1_LOW_LIMIT_R 0x08 -#define TMP411_CONFIGURATION1_W 0x09 -#define TMP411_CONVERSION_RATE_W 0x0a -#define TMP411_LOCAL_HIGH_LIMIT_W 0x0b -#define TMP411_LOCAL_LOW_LIMIT_W 0x0c -#define TMP411_REMOTE1_HIGH_LIMIT_W 0x0d -#define TMP411_REMOTE1_LOW_LIMIT_W 0x0e -#define TMP411_ONESHOT 0x0f -#define TMP411_REMOTE1_EXTD 0x10 -#define TMP411_REMOTE1_HIGH_LIMIT_EXTD 0x13 -#define TMP411_REMOTE1_LOW_LIMIT_EXTD 0x14 -#define TMP411_REMOTE2_HIGH_LIMIT_R 0x15 -#define TMP411_REMOTE2_HIGH_LIMIT_W 0x15 -#define TMP411_REMOTE2_LOW_LIMIT_R 0x16 -#define TMP411_REMOTE2_LOW_LIMIT_W 0x16 -#define TMP411_REMOTE2_HIGH_LIMIT_EXTD 0x17 -#define TMP411_REMOTE2_LOW_LIMIT_EXTD 0x18 -#define TMP411_REMOTE1_THERM_LIMIT 0x19 -#define TMP411_REMOTE2_THERM_LIMIT 0x1a -#define TMP411_STATUS_FAULT 0x1b -#define TMP411_CHANNEL_MASK 0x1f -#define TMP411_LOCAL_THERM_LIMIT 0x20 -#define TMP411_THERM_HYSTERESIS 0x21 -#define TMP411_CONSECUTIVE_ALERT 0x22 -#define TMP411_REMOTE2 0x23 -#define TMP411_REMOTE2_EXTD 0x24 -#define TMP411_BETA_RANGE_CH1 0x25 -#define TMP411_BETA_RANGE_CH2 0x26 -#define TMP411_NFACTOR_REMOTE1 0x27 -#define TMP411_NFACTOR_REMOTE2 0x28 -#define TMP411_LOCAL_EXTD 0x29 -#define TMP411_STATUS_LIMIT_HIGH 0x35 -#define TMP411_STATUS_LIMIT_LOW 0x36 -#define TMP411_STATUS_THERM 0x37 -#define TMP411_RESET_W 0xfc -#define TMP411_MANUFACTURER_ID 0xfe -#define TMP411_DEVICE_ID 0xff +#define TMP411_LOCAL 0x00 +#define TMP411_REMOTE1 0x01 +#define TMP411_STATUS_R 0x02 +#define TMP411_CONFIGURATION1_R 0x03 +#define TMP411_CONVERSION_RATE_R 0x04 +#define TMP411_LOCAL_HIGH_LIMIT_R 0x05 +#define TMP411_LOCAL_LOW_LIMIT_R 0x06 +#define TMP411_REMOTE1_HIGH_LIMIT_R 0x07 +#define TMP411_REMOTE1_LOW_LIMIT_R 0x08 +#define TMP411_CONFIGURATION1_W 0x09 +#define TMP411_CONVERSION_RATE_W 0x0a +#define TMP411_LOCAL_HIGH_LIMIT_W 0x0b +#define TMP411_LOCAL_LOW_LIMIT_W 0x0c +#define TMP411_REMOTE1_HIGH_LIMIT_W 0x0d +#define TMP411_REMOTE1_LOW_LIMIT_W 0x0e +#define TMP411_ONESHOT 0x0f +#define TMP411_REMOTE1_EXTD 0x10 +#define TMP411_REMOTE1_HIGH_LIMIT_EXTD 0x13 +#define TMP411_REMOTE1_LOW_LIMIT_EXTD 0x14 +#define TMP411_REMOTE2_HIGH_LIMIT_R 0x15 +#define TMP411_REMOTE2_HIGH_LIMIT_W 0x15 +#define TMP411_REMOTE2_LOW_LIMIT_R 0x16 +#define TMP411_REMOTE2_LOW_LIMIT_W 0x16 +#define TMP411_REMOTE2_HIGH_LIMIT_EXTD 0x17 +#define TMP411_REMOTE2_LOW_LIMIT_EXTD 0x18 +#define TMP411_REMOTE1_THERM_LIMIT 0x19 +#define TMP411_REMOTE2_THERM_LIMIT 0x1a +#define TMP411_STATUS_FAULT 0x1b +#define TMP411_CHANNEL_MASK 0x1f +#define TMP411_LOCAL_THERM_LIMIT 0x20 +#define TMP411_THERM_HYSTERESIS 0x21 +#define TMP411_CONSECUTIVE_ALERT 0x22 +#define TMP411_REMOTE2 0x23 +#define TMP411_REMOTE2_EXTD 0x24 +#define TMP411_BETA_RANGE_CH1 0x25 +#define TMP411_BETA_RANGE_CH2 0x26 +#define TMP411_NFACTOR_REMOTE1 0x27 +#define TMP411_NFACTOR_REMOTE2 0x28 +#define TMP411_LOCAL_EXTD 0x29 +#define TMP411_STATUS_LIMIT_HIGH 0x35 +#define TMP411_STATUS_LIMIT_LOW 0x36 +#define TMP411_STATUS_THERM 0x37 +#define TMP411_RESET_W 0xfc +#define TMP411_MANUFACTURER_ID 0xfe +#define TMP411_DEVICE_ID 0xff -#define TMP411A_DEVICE_ID_VAL 0x12 -#define TMP411B_DEVICE_ID_VAL 0x13 -#define TMP411C_DEVICE_ID_VAL 0x10 -#define TMP411d_DEVICE_ID_VAL 0x12 +#define TMP411A_DEVICE_ID_VAL 0x12 +#define TMP411B_DEVICE_ID_VAL 0x13 +#define TMP411C_DEVICE_ID_VAL 0x10 +#define TMP411d_DEVICE_ID_VAL 0x12 /* Config register bits */ -#define TMP411_CONFIG1_TEMP_RANGE BIT(2) +#define TMP411_CONFIG1_TEMP_RANGE BIT(2) /* TMP411_CONFIG1_MODE bit is use to enable THERM mode */ -#define TMP411_CONFIG1_MODE BIT(5) -#define TMP411_CONFIG1_RUN_L BIT(6) -#define TMP411_CONFIG1_ALERT_MASK_L BIT(7) +#define TMP411_CONFIG1_MODE BIT(5) +#define TMP411_CONFIG1_RUN_L BIT(6) +#define TMP411_CONFIG1_ALERT_MASK_L BIT(7) /* Status register bits */ -#define TMP411_STATUS_TEMP_THERM_ALARM BIT(1) -#define TMP411_STATUS_OPEN BIT(2) -#define TMP411_STATUS_TEMP_LOW_ALARM BIT(3) -#define TMP411_STATUS_TEMP_HIGH_ALARM BIT(4) -#define TMP411_STATUS_LOCAL_TEMP_LOW_ALARM BIT(5) -#define TMP411_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(6) -#define TMP411_STATUS_BUSY BIT(7) +#define TMP411_STATUS_TEMP_THERM_ALARM BIT(1) +#define TMP411_STATUS_OPEN BIT(2) +#define TMP411_STATUS_TEMP_LOW_ALARM BIT(3) +#define TMP411_STATUS_TEMP_HIGH_ALARM BIT(4) +#define TMP411_STATUS_LOCAL_TEMP_LOW_ALARM BIT(5) +#define TMP411_STATUS_LOCAL_TEMP_HIGH_ALARM BIT(6) +#define TMP411_STATUS_BUSY BIT(7) /* Limits */ -#define TMP411_HYSTERESIS_HIGH_LIMIT 255 -#define TMP411_HYSTERESIS_LOW_LIMIT 0 +#define TMP411_HYSTERESIS_HIGH_LIMIT 255 +#define TMP411_HYSTERESIS_LOW_LIMIT 0 enum tmp411_power_state { TMP411_POWER_OFF = 0, diff --git a/driver/temp_sensor/tmp432.c b/driver/temp_sensor/tmp432.c index 8db6a99e19..fde6536536 100644 --- a/driver/temp_sensor/tmp432.c +++ b/driver/temp_sensor/tmp432.c @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -19,7 +19,7 @@ static int temp_val_remote2; #ifndef CONFIG_TEMP_SENSOR_POWER static uint8_t is_sensor_shutdown; #endif -static int fake_temp[TMP432_IDX_COUNT] = {-1, -1, -1}; +static int fake_temp[TMP432_IDX_COUNT] = { -1, -1, -1 }; /** * Determine whether the sensor is powered. @@ -37,14 +37,14 @@ static int has_power(void) static int raw_read8(const int offset, int *data_ptr) { - return i2c_read8(I2C_PORT_THERMAL, TMP432_I2C_ADDR_FLAGS, - offset, data_ptr); + return i2c_read8(I2C_PORT_THERMAL, TMP432_I2C_ADDR_FLAGS, offset, + data_ptr); } static int raw_write8(const int offset, int data) { - return i2c_write8(I2C_PORT_THERMAL, TMP432_I2C_ADDR_FLAGS, - offset, data); + return i2c_write8(I2C_PORT_THERMAL, TMP432_I2C_ADDR_FLAGS, offset, + data); } static int get_temp(const int offset, int *temp_ptr) @@ -150,7 +150,7 @@ int tmp432_set_therm_limit(int channel, int limit_c, int hysteresis) return EC_ERROR_INVAL; if (hysteresis > TMP432_HYSTERESIS_HIGH_LIMIT || - hysteresis < TMP432_HYSTERESIS_LOW_LIMIT) + hysteresis < TMP432_HYSTERESIS_LOW_LIMIT) return EC_ERROR_INVAL; /* hysteresis must be less than high limit */ @@ -228,12 +228,10 @@ static int tmp432_set_fake_temp(int index, int degree_c) return EC_SUCCESS; } -static void print_temps( - const char *name, - const int tmp432_temp_reg, - const int tmp432_therm_limit_reg, - const int tmp432_high_limit_reg, - const int tmp432_low_limit_reg) +static void print_temps(const char *name, const int tmp432_temp_reg, + const int tmp432_therm_limit_reg, + const int tmp432_high_limit_reg, + const int tmp432_low_limit_reg) { int value; @@ -261,20 +259,14 @@ static int print_status(void) { int value, i; - print_temps("Local", TMP432_LOCAL, - TMP432_LOCAL_THERM_LIMIT, - TMP432_LOCAL_HIGH_LIMIT_R, - TMP432_LOCAL_LOW_LIMIT_R); + print_temps("Local", TMP432_LOCAL, TMP432_LOCAL_THERM_LIMIT, + TMP432_LOCAL_HIGH_LIMIT_R, TMP432_LOCAL_LOW_LIMIT_R); - print_temps("Remote1", TMP432_REMOTE1, - TMP432_REMOTE1_THERM_LIMIT, - TMP432_REMOTE1_HIGH_LIMIT_R, - TMP432_REMOTE1_LOW_LIMIT_R); + print_temps("Remote1", TMP432_REMOTE1, TMP432_REMOTE1_THERM_LIMIT, + TMP432_REMOTE1_HIGH_LIMIT_R, TMP432_REMOTE1_LOW_LIMIT_R); - print_temps("Remote2", TMP432_REMOTE2, - TMP432_REMOTE2_THERM_LIMIT, - TMP432_REMOTE2_HIGH_LIMIT_R, - TMP432_REMOTE2_LOW_LIMIT_R); + print_temps("Remote2", TMP432_REMOTE2, TMP432_REMOTE2_THERM_LIMIT, + TMP432_REMOTE2_HIGH_LIMIT_R, TMP432_REMOTE2_LOW_LIMIT_R); ccprintf("\n"); @@ -294,22 +286,22 @@ static int print_status(void) ccprintf("\n"); if (raw_read8(TMP432_STATUS, &value) == EC_SUCCESS) - ccprintf("STATUS: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("STATUS: 0x%x\n", value); if (raw_read8(TMP432_CONFIGURATION1_R, &value) == EC_SUCCESS) - ccprintf("CONFIG1: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("CONFIG1: 0x%x\n", value); if (raw_read8(TMP432_CONFIGURATION2_R, &value) == EC_SUCCESS) - ccprintf("CONFIG2: %pb\n", BINARY_VALUE(value, 8)); + ccprintf("CONFIG2: 0x%x\n", value); return EC_SUCCESS; } -static int command_tmp432(int argc, char **argv) +static int command_tmp432(int argc, const char **argv) { - char *command; + const char *command; char *e; - char *power; + const char *power; int data; int offset; int rv; @@ -321,8 +313,7 @@ static int command_tmp432(int argc, char **argv) rv = tmp432_set_power(TMP432_POWER_ON); if (!rv) print_status(); - } - else if (!strncasecmp(power, "off", sizeof("off"))) + } else if (!strncasecmp(power, "off", sizeof("off"))) rv = tmp432_set_power(TMP432_POWER_OFF); else return EC_ERROR_PARAM2; @@ -351,8 +342,7 @@ static int command_tmp432(int argc, char **argv) rv = raw_read8(offset, &data); if (rv < 0) return rv; - ccprintf("Byte at offset 0x%02x is %pb\n", - offset, BINARY_VALUE(data, 8)); + ccprintf("Byte at offset 0x%02x is 0x%x\n", offset, data); return rv; } @@ -379,7 +369,8 @@ static int command_tmp432(int argc, char **argv) return rv; } -DECLARE_CONSOLE_COMMAND(tmp432, command_tmp432, +DECLARE_CONSOLE_COMMAND( + tmp432, command_tmp432, "[settemp|setbyte <offset> <value>] or [getbyte <offset>] or" "[fake <index> <value>] or [power <on|off>]. " "Temps in Celsius.", diff --git a/driver/temp_sensor/tmp432.h b/driver/temp_sensor/tmp432.h index e58e39a4a0..d4c99f1129 100644 --- a/driver/temp_sensor/tmp432.h +++ b/driver/temp_sensor/tmp432.h @@ -1,4 +1,4 @@ -/* Copyright 2013 The Chromium OS Authors. All rights reserved. +/* Copyright 2013 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -8,85 +8,85 @@ #ifndef __CROS_EC_TMP432_H #define __CROS_EC_TMP432_H -#define TMP432_I2C_ADDR_FLAGS 0x4C +#define TMP432_I2C_ADDR_FLAGS 0x4C -#define TMP432_IDX_LOCAL 0 -#define TMP432_IDX_REMOTE1 1 -#define TMP432_IDX_REMOTE2 2 -#define TMP432_IDX_COUNT 3 +#define TMP432_IDX_LOCAL 0 +#define TMP432_IDX_REMOTE1 1 +#define TMP432_IDX_REMOTE2 2 +#define TMP432_IDX_COUNT 3 /* Chip-specific registers */ -#define TMP432_LOCAL 0x00 -#define TMP432_REMOTE1 0x01 -#define TMP432_STATUS 0x02 -#define TMP432_CONFIGURATION1_R 0x03 -#define TMP432_CONVERSION_RATE_R 0x04 -#define TMP432_LOCAL_HIGH_LIMIT_R 0x05 -#define TMP432_LOCAL_LOW_LIMIT_R 0x06 -#define TMP432_REMOTE1_HIGH_LIMIT_R 0x07 -#define TMP432_REMOTE1_LOW_LIMIT_R 0x08 -#define TMP432_CONFIGURATION1_W 0x09 -#define TMP432_CONVERSION_RATE_W 0x0a -#define TMP432_LOCAL_HIGH_LIMIT_W 0x0b -#define TMP432_LOCAL_LOW_LIMIT_W 0x0c -#define TMP432_REMOTE1_HIGH_LIMIT_W 0x0d -#define TMP432_REMOTE1_LOW_LIMIT_W 0x0e -#define TMP432_ONESHOT 0x0f -#define TMP432_REMOTE1_EXTD 0x10 -#define TMP432_REMOTE1_HIGH_LIMIT_EXTD 0x13 -#define TMP432_REMOTE1_LOW_LIMIT_EXTD 0x14 -#define TMP432_REMOTE2_HIGH_LIMIT_R 0x15 -#define TMP432_REMOTE2_HIGH_LIMIT_W 0x15 -#define TMP432_REMOTE2_LOW_LIMIT_R 0x16 -#define TMP432_REMOTE2_LOW_LIMIT_W 0x16 -#define TMP432_REMOTE2_HIGH_LIMIT_EXTD 0x17 -#define TMP432_REMOTE2_LOW_LIMIT_EXTD 0x18 -#define TMP432_REMOTE1_THERM_LIMIT 0x19 -#define TMP432_REMOTE2_THERM_LIMIT 0x1a -#define TMP432_STATUS_FAULT 0x1b -#define TMP432_CHANNEL_MASK 0x1f -#define TMP432_LOCAL_THERM_LIMIT 0x20 -#define TMP432_THERM_HYSTERESIS 0x21 -#define TMP432_CONSECUTIVE_ALERT 0x22 -#define TMP432_REMOTE2 0x23 -#define TMP432_REMOTE2_EXTD 0x24 -#define TMP432_BETA_RANGE_CH1 0x25 -#define TMP432_BETA_RANGE_CH2 0x26 -#define TMP432_NFACTOR_REMOTE1 0x27 -#define TMP432_NFACTOR_REMOTE2 0x28 -#define TMP432_LOCAL_EXTD 0x29 -#define TMP432_STATUS_LIMIT_HIGH 0x35 -#define TMP432_STATUS_LIMIT_LOW 0x36 -#define TMP432_STATUS_THERM 0x37 -#define TMP432_LOCAL_HIGH_LIMIT_EXTD 0x3d -#define TMP432_LOCAL_LOW_LIMIT_EXTD 0x3e -#define TMP432_CONFIGURATION2_R 0x3f -#define TMP432_CONFIGURATION2_W 0x3f -#define TMP432_RESET_W 0xfc -#define TMP432_DEVICE_ID 0xfd -#define TMP432_MANUFACTURER_ID 0xfe +#define TMP432_LOCAL 0x00 +#define TMP432_REMOTE1 0x01 +#define TMP432_STATUS 0x02 +#define TMP432_CONFIGURATION1_R 0x03 +#define TMP432_CONVERSION_RATE_R 0x04 +#define TMP432_LOCAL_HIGH_LIMIT_R 0x05 +#define TMP432_LOCAL_LOW_LIMIT_R 0x06 +#define TMP432_REMOTE1_HIGH_LIMIT_R 0x07 +#define TMP432_REMOTE1_LOW_LIMIT_R 0x08 +#define TMP432_CONFIGURATION1_W 0x09 +#define TMP432_CONVERSION_RATE_W 0x0a +#define TMP432_LOCAL_HIGH_LIMIT_W 0x0b +#define TMP432_LOCAL_LOW_LIMIT_W 0x0c +#define TMP432_REMOTE1_HIGH_LIMIT_W 0x0d +#define TMP432_REMOTE1_LOW_LIMIT_W 0x0e +#define TMP432_ONESHOT 0x0f +#define TMP432_REMOTE1_EXTD 0x10 +#define TMP432_REMOTE1_HIGH_LIMIT_EXTD 0x13 +#define TMP432_REMOTE1_LOW_LIMIT_EXTD 0x14 +#define TMP432_REMOTE2_HIGH_LIMIT_R 0x15 +#define TMP432_REMOTE2_HIGH_LIMIT_W 0x15 +#define TMP432_REMOTE2_LOW_LIMIT_R 0x16 +#define TMP432_REMOTE2_LOW_LIMIT_W 0x16 +#define TMP432_REMOTE2_HIGH_LIMIT_EXTD 0x17 +#define TMP432_REMOTE2_LOW_LIMIT_EXTD 0x18 +#define TMP432_REMOTE1_THERM_LIMIT 0x19 +#define TMP432_REMOTE2_THERM_LIMIT 0x1a +#define TMP432_STATUS_FAULT 0x1b +#define TMP432_CHANNEL_MASK 0x1f +#define TMP432_LOCAL_THERM_LIMIT 0x20 +#define TMP432_THERM_HYSTERESIS 0x21 +#define TMP432_CONSECUTIVE_ALERT 0x22 +#define TMP432_REMOTE2 0x23 +#define TMP432_REMOTE2_EXTD 0x24 +#define TMP432_BETA_RANGE_CH1 0x25 +#define TMP432_BETA_RANGE_CH2 0x26 +#define TMP432_NFACTOR_REMOTE1 0x27 +#define TMP432_NFACTOR_REMOTE2 0x28 +#define TMP432_LOCAL_EXTD 0x29 +#define TMP432_STATUS_LIMIT_HIGH 0x35 +#define TMP432_STATUS_LIMIT_LOW 0x36 +#define TMP432_STATUS_THERM 0x37 +#define TMP432_LOCAL_HIGH_LIMIT_EXTD 0x3d +#define TMP432_LOCAL_LOW_LIMIT_EXTD 0x3e +#define TMP432_CONFIGURATION2_R 0x3f +#define TMP432_CONFIGURATION2_W 0x3f +#define TMP432_RESET_W 0xfc +#define TMP432_DEVICE_ID 0xfd +#define TMP432_MANUFACTURER_ID 0xfe /* Config register bits */ -#define TMP432_CONFIG1_TEMP_RANGE BIT(2) +#define TMP432_CONFIG1_TEMP_RANGE BIT(2) /* TMP432_CONFIG1_MODE bit is use to enable THERM mode */ -#define TMP432_CONFIG1_MODE BIT(5) -#define TMP432_CONFIG1_RUN_L BIT(6) -#define TMP432_CONFIG1_ALERT_MASK_L BIT(7) -#define TMP432_CONFIG2_RESISTANCE_CORRECTION BIT(2) -#define TMP432_CONFIG2_LOCAL_ENABLE BIT(3) -#define TMP432_CONFIG2_REMOTE1_ENABLE BIT(4) -#define TMP432_CONFIG2_REMOTE2_ENABLE BIT(5) +#define TMP432_CONFIG1_MODE BIT(5) +#define TMP432_CONFIG1_RUN_L BIT(6) +#define TMP432_CONFIG1_ALERT_MASK_L BIT(7) +#define TMP432_CONFIG2_RESISTANCE_CORRECTION BIT(2) +#define TMP432_CONFIG2_LOCAL_ENABLE BIT(3) +#define TMP432_CONFIG2_REMOTE1_ENABLE BIT(4) +#define TMP432_CONFIG2_REMOTE2_ENABLE BIT(5) /* Status register bits */ -#define TMP432_STATUS_TEMP_THERM_ALARM BIT(1) -#define TMP432_STATUS_OPEN BIT(2) -#define TMP432_STATUS_TEMP_LOW_ALARM BIT(3) -#define TMP432_STATUS_TEMP_HIGH_ALARM BIT(4) -#define TMP432_STATUS_BUSY BIT(7) +#define TMP432_STATUS_TEMP_THERM_ALARM BIT(1) +#define TMP432_STATUS_OPEN BIT(2) +#define TMP432_STATUS_TEMP_LOW_ALARM BIT(3) +#define TMP432_STATUS_TEMP_HIGH_ALARM BIT(4) +#define TMP432_STATUS_BUSY BIT(7) /* Limintaions */ -#define TMP432_HYSTERESIS_HIGH_LIMIT 255 -#define TMP432_HYSTERESIS_LOW_LIMIT 0 +#define TMP432_HYSTERESIS_HIGH_LIMIT 255 +#define TMP432_HYSTERESIS_LOW_LIMIT 0 enum tmp432_power_state { TMP432_POWER_OFF = 0, diff --git a/driver/temp_sensor/tmp468.c b/driver/temp_sensor/tmp468.c index 46e77ca696..87eb040460 100644 --- a/driver/temp_sensor/tmp468.c +++ b/driver/temp_sensor/tmp468.c @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -15,9 +15,9 @@ #include "tmp468.h" - -static int fake_temp[TMP468_CHANNEL_COUNT] = {-1, -1, -1, -1, -1, -1, -1 , -1, -1}; -static int temp_val[TMP468_CHANNEL_COUNT] = {0, 0, 0, 0, 0, 0, 0 , 0, 0}; +static int fake_temp[TMP468_CHANNEL_COUNT] = { -1, -1, -1, -1, -1, + -1, -1, -1, -1 }; +static int temp_val[TMP468_CHANNEL_COUNT] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }; static uint8_t is_sensor_shutdown; static int has_power(void) @@ -27,14 +27,14 @@ static int has_power(void) static int raw_read16(const int offset, int *data_ptr) { - return i2c_read16(I2C_PORT_THERMAL, TMP468_I2C_ADDR_FLAGS, - offset, data_ptr); + return i2c_read16(I2C_PORT_THERMAL, TMP468_I2C_ADDR_FLAGS, offset, + data_ptr); } static int raw_write16(const int offset, int data_ptr) { - return i2c_write16(I2C_PORT_THERMAL, TMP468_I2C_ADDR_FLAGS, - offset, data_ptr); + return i2c_write16(I2C_PORT_THERMAL, TMP468_I2C_ADDR_FLAGS, offset, + data_ptr); } static int tmp468_shutdown(uint8_t want_shutdown) @@ -64,7 +64,7 @@ static int tmp468_shutdown(uint8_t want_shutdown) int tmp468_get_val(int idx, int *temp_ptr) { - if(!has_power()) + if (!has_power()) return EC_ERROR_NOT_POWERED; if (idx < TMP468_CHANNEL_COUNT) { diff --git a/driver/temp_sensor/tmp468.h b/driver/temp_sensor/tmp468.h index 59fbd20477..3a2c154066 100644 --- a/driver/temp_sensor/tmp468.h +++ b/driver/temp_sensor/tmp468.h @@ -1,4 +1,4 @@ -/* Copyright 2018 The Chromium OS Authors. All rights reserved. +/* Copyright 2018 The ChromiumOS Authors * Use of this source code is governed by a BSD-style license that can be * found in the LICENSE file. */ @@ -11,73 +11,73 @@ #define TMP468_I2C_ADDR_FLAGS (0x48 | I2C_FLAG_BIG_ENDIAN) #define TMP468_SHIFT1 7 -#define TMP468_LOCAL 0x00 -#define TMP468_REMOTE1 0x01 -#define TMP468_REMOTE2 0x02 -#define TMP468_REMOTE3 0x03 -#define TMP468_REMOTE4 0x04 -#define TMP468_REMOTE5 0x05 -#define TMP468_REMOTE6 0x06 -#define TMP468_REMOTE7 0x07 -#define TMP468_REMOTE8 0x08 - -#define TMP468_SRST 0x20 -#define TMP468_THERM 0x21 -#define TMP468_THERM2 0x22 -#define TMP468_ROPEN 0x23 - -#define TMP468_CONFIGURATION 0x30 -#define TMP468_THERM_HYST 0x38 - -#define TMP468_LOCAL_LOW_LIMIT 0x39 -#define TMP468_LOCAL_HIGH_LIMT 0x3a - -#define TMP468_REMOTE1_OFFSET 0x40 -#define TMP468_REMOTE1_NFACTOR 0x41 -#define TMP468_REMOTE1_LOW_LIMIT 0x41 -#define TMP468_REMOTE1_HIGH_LIMIT 0x42 - -#define TMP468_REMOTE2_OFFSET 0x48 -#define TMP468_REMOTE2_NFACTOR 0x49 -#define TMP468_REMOTE2_LOW_LIMIT 0x4a -#define TMP468_REMOTE2_HIGH_LIMIT 0x4b - -#define TMP468_REMOTE3_OFFSET 0x50 -#define TMP468_REMOTE3_NFACTOR 0x51 -#define TMP468_REMOTE3_LOW_LIMIT 0x52 -#define TMP468_REMOTE3_HIGH_LIMIT 0x53 - -#define TMP468_REMOTE4_OFFSET 0x58 -#define TMP468_REMOTE4_NFACTOR 0x59 -#define TMP468_REMOTE4_LOW_LIMIT 0x59 -#define TMP468_REMOTE4_HIGH_LIMIT 0x5a - -#define TMP468_REMOTE5_OFFSET 0x60 -#define TMP468_REMOTE5_NFACTOR 0x61 -#define TMP468_REMOTE5_LOW_LIMIT 0x62 -#define TMP468_REMOTE5_HIGH_LIMIT 0x63 - -#define TMP468_REMOTE6_OFFSET 0x68 -#define TMP468_REMOTE6_NFACTOR 0x69 -#define TMP468_REMOTE6_LOW_LIMIT 0x6a -#define TMP468_REMOTE6_HIGH_LIMIT 0x6b - -#define TMP468_REMOTE7_OFFSET 0x70 -#define TMP468_REMOTE7_NFACTOR 0x71 -#define TMP468_REMOTE7_LOW_LIMIT 0x72 -#define TMP468_REMOTE7_HIGH_LIMIT 0x73 - -#define TMP468_REMOTE8_OFFSET 0x78 -#define TMP468_REMOTE8_NFACTOR 0x79 -#define TMP468_REMOTE8_LOW_LIMIT 0x7a -#define TMP468_REMOTE8_HIGH_LIMIT 0x7b - -#define TMP468_LOCK 0xc4 - -#define TMP468_DEVICE_ID 0xfd -#define TMP468_MANUFACTURER_ID 0xfe - -#define TMP468_SHUTDOWN BIT(5) +#define TMP468_LOCAL 0x00 +#define TMP468_REMOTE1 0x01 +#define TMP468_REMOTE2 0x02 +#define TMP468_REMOTE3 0x03 +#define TMP468_REMOTE4 0x04 +#define TMP468_REMOTE5 0x05 +#define TMP468_REMOTE6 0x06 +#define TMP468_REMOTE7 0x07 +#define TMP468_REMOTE8 0x08 + +#define TMP468_SRST 0x20 +#define TMP468_THERM 0x21 +#define TMP468_THERM2 0x22 +#define TMP468_ROPEN 0x23 + +#define TMP468_CONFIGURATION 0x30 +#define TMP468_THERM_HYST 0x38 + +#define TMP468_LOCAL_LOW_LIMIT 0x39 +#define TMP468_LOCAL_HIGH_LIMT 0x3a + +#define TMP468_REMOTE1_OFFSET 0x40 +#define TMP468_REMOTE1_NFACTOR 0x41 +#define TMP468_REMOTE1_LOW_LIMIT 0x41 +#define TMP468_REMOTE1_HIGH_LIMIT 0x42 + +#define TMP468_REMOTE2_OFFSET 0x48 +#define TMP468_REMOTE2_NFACTOR 0x49 +#define TMP468_REMOTE2_LOW_LIMIT 0x4a +#define TMP468_REMOTE2_HIGH_LIMIT 0x4b + +#define TMP468_REMOTE3_OFFSET 0x50 +#define TMP468_REMOTE3_NFACTOR 0x51 +#define TMP468_REMOTE3_LOW_LIMIT 0x52 +#define TMP468_REMOTE3_HIGH_LIMIT 0x53 + +#define TMP468_REMOTE4_OFFSET 0x58 +#define TMP468_REMOTE4_NFACTOR 0x59 +#define TMP468_REMOTE4_LOW_LIMIT 0x59 +#define TMP468_REMOTE4_HIGH_LIMIT 0x5a + +#define TMP468_REMOTE5_OFFSET 0x60 +#define TMP468_REMOTE5_NFACTOR 0x61 +#define TMP468_REMOTE5_LOW_LIMIT 0x62 +#define TMP468_REMOTE5_HIGH_LIMIT 0x63 + +#define TMP468_REMOTE6_OFFSET 0x68 +#define TMP468_REMOTE6_NFACTOR 0x69 +#define TMP468_REMOTE6_LOW_LIMIT 0x6a +#define TMP468_REMOTE6_HIGH_LIMIT 0x6b + +#define TMP468_REMOTE7_OFFSET 0x70 +#define TMP468_REMOTE7_NFACTOR 0x71 +#define TMP468_REMOTE7_LOW_LIMIT 0x72 +#define TMP468_REMOTE7_HIGH_LIMIT 0x73 + +#define TMP468_REMOTE8_OFFSET 0x78 +#define TMP468_REMOTE8_NFACTOR 0x79 +#define TMP468_REMOTE8_LOW_LIMIT 0x7a +#define TMP468_REMOTE8_HIGH_LIMIT 0x7b + +#define TMP468_LOCK 0xc4 + +#define TMP468_DEVICE_ID 0xfd +#define TMP468_MANUFACTURER_ID 0xfe + +#define TMP468_SHUTDOWN BIT(5) enum tmp468_channel_id { TMP468_CHANNEL_LOCAL, @@ -101,7 +101,6 @@ enum tmp468_power_state { TMP468_POWER_COUNT }; - /** * Get the last polled value of a sensor. * |