1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00

drivers/ina3221: Fix compatibility with C++

This commit is contained in:
Jens Wetterich 2021-02-01 12:13:32 +01:00
parent 0903952564
commit 8dff7b57ad
3 changed files with 28 additions and 28 deletions

View File

@ -193,7 +193,7 @@ int _ina3221_get_config(const ina3221_t *dev, uint16_t *cfg)
return INA3221_OK;
}
int _ina3221_set_enable_channel(ina3221_t *dev, ina3221_enable_ch_t ech)
int _ina3221_set_enable_channel(ina3221_t *dev, uint16_t ech)
{
uint16_t cfg;
int status = _read_reg(dev, INA3221_REG_CONFIGURATION, &cfg);
@ -211,7 +211,7 @@ int _ina3221_set_enable_channel(ina3221_t *dev, ina3221_enable_ch_t ech)
return INA3221_OK;
}
int _ina3221_get_enable_channel(const ina3221_t *dev, ina3221_enable_ch_t *ech)
int _ina3221_get_enable_channel(const ina3221_t *dev, uint16_t *ech)
{
*ech = dev->params.config & INA3221_ENABLE_CH_MASK;
return ((*ech & INA3221_ENABLE_CH1) ? 1 : 0) +
@ -320,7 +320,7 @@ int ina3221_get_mode(const ina3221_t *dev, ina3221_mode_t *mode)
}
int _ina3221_set_enable_sum_channel(const ina3221_t *dev,
ina3221_enable_sum_ch_t esch)
uint16_t esch)
{
uint16_t mask_en;
int status = _read_reg(dev, INA3221_REG_MASK_ENABLE, &mask_en);
@ -338,7 +338,7 @@ int _ina3221_set_enable_sum_channel(const ina3221_t *dev,
}
int _ina3221_get_enable_sum_channel(const ina3221_t *dev,
ina3221_enable_sum_ch_t *esch)
uint16_t *esch)
{
uint16_t mask_en;
int status = _read_reg(dev, INA3221_REG_MASK_ENABLE, &mask_en);

View File

@ -31,7 +31,7 @@
static int read_bus_voltage(const void *dev, phydat_t *res)
{
ina3221_t *_dev = (ina3221_t *)dev;
ina3221_enable_ch_t ench = 0;
uint16_t ench = 0;
int16_t voltage[INA3221_NUM_CH] = { 0 };
int num_ch = _ina3221_get_enable_channel(_dev, &ench);
@ -54,7 +54,7 @@ static int read_bus_voltage(const void *dev, phydat_t *res)
static int read_current(const void *dev, phydat_t *res)
{
ina3221_t *_dev = (ina3221_t *)dev;
ina3221_enable_ch_t ench = 0;
uint16_t ench = 0;
int32_t shunt_uv[INA3221_NUM_CH] = { 0 };
int32_t current[INA3221_NUM_CH] = { 0 };
int num_ch = _ina3221_get_enable_channel(_dev, &ench);
@ -81,7 +81,7 @@ static int read_current(const void *dev, phydat_t *res)
static int read_power(const void *dev, phydat_t *res)
{
ina3221_t *_dev = (ina3221_t *)dev;
ina3221_enable_ch_t ench = 0;
uint16_t ench = 0;
int32_t shunt_uv[INA3221_NUM_CH] = { 0 };
int32_t current_ua[INA3221_NUM_CH] = { 0 };
int16_t bus_mv[INA3221_NUM_CH] = { 0 };
@ -112,7 +112,7 @@ static int read_power(const void *dev, phydat_t *res)
static int read_shunt_voltage_sum(const void *dev, phydat_t *res)
{
ina3221_t *_dev = (ina3221_t *)dev;
ina3221_enable_ch_t ench = 0;
uint16_t ench = 0;
int32_t shunt_voltage_sum = SAUL_INA3221_NO_VALUE;
int num_ch = _ina3221_get_enable_channel(_dev, &ench);
@ -130,7 +130,7 @@ static int read_shunt_voltage_sum(const void *dev, phydat_t *res)
static int configure_channel(const void *dev, phydat_t *data)
{
ina3221_t *_dev = (ina3221_t *)dev;
ina3221_enable_ch_t ench =
uint16_t ench =
((data->val[0] & INA3221_CH1) ? INA3221_ENABLE_CH1 : 0) |
((data->val[0] & INA3221_CH2) ? INA3221_ENABLE_CH2 : 0) |
((data->val[0] & INA3221_CH3) ? INA3221_ENABLE_CH3 : 0);
@ -144,7 +144,7 @@ static int configure_channel(const void *dev, phydat_t *data)
static int configure_channel_sum(const void *dev, phydat_t *data)
{
ina3221_t *_dev = (ina3221_t *)dev;
ina3221_enable_sum_ch_t esch =
uint16_t esch =
((data->val[0] & INA3221_CH1) ? INA3221_ENABLE_SUM_CH1 : 0) |
((data->val[0] & INA3221_CH2) ? INA3221_ENABLE_SUM_CH2 : 0) |
((data->val[0] & INA3221_CH3) ? INA3221_ENABLE_SUM_CH3 : 0);

View File

@ -516,7 +516,7 @@ int _ina3221_set_config(ina3221_t *dev, uint16_t cfg);
* @brief Wrapper around @see _ina3221_set_config
*
* @param[in, out] dev Device handle
* @param[in] chs Channel enable flags
* @param[in] chs Channel enable flags @see ina3221_enable_ch_t
* @param[in] ns Number of samples
* @param[in] ctbadc Conversion time for bus voltage ADC
* @param[in] ctsadc Conversion time for shunt voltage ADC
@ -525,7 +525,7 @@ int _ina3221_set_config(ina3221_t *dev, uint16_t cfg);
* @return @see _ina3221_set_config
*/
static inline int ina3221_set_config(ina3221_t *dev,
ina3221_enable_ch_t chs,
uint16_t chs,
ina3221_num_samples_t ns,
ina3221_conv_time_bus_adc_t ctbadc,
ina3221_conv_time_shunt_adc_t ctsadc,
@ -548,7 +548,7 @@ int _ina3221_get_config(const ina3221_t *dev, uint16_t *cfg);
* @brief Wrapper around @see _ina3221_get_config
*
* @param[in] dev Device handle
* @param[out] chs Pointer to enabled channels variable
* @param[out] chs Pointer to enabled channels variable @see ina3221_enable_ch_t
* @param[out] ns Pointer to number of samples variable
* @param[out] ctbadc Pointer to conversion time bus adc variable
* @param[out] ctsadc Pointer to conversion time shunt adc variable
@ -557,7 +557,7 @@ int _ina3221_get_config(const ina3221_t *dev, uint16_t *cfg);
* @return @see _ina3221_get_config
*/
static inline int ina3221_get_config(const ina3221_t *dev,
ina3221_enable_ch_t *chs,
uint16_t *chs,
ina3221_num_samples_t *ns,
ina3221_conv_time_bus_adc_t *ctbadc,
ina3221_conv_time_shunt_adc_t *ctsadc,
@ -567,10 +567,10 @@ static inline int ina3221_get_config(const ina3221_t *dev,
int ret = _ina3221_get_config(dev, &cfg);
*chs = cfg & INA3221_ENABLE_CH_MASK;
*ns = cfg & INA3221_NUM_SAMPLES_MASK;
*ctbadc = cfg & INA3221_CONV_TIME_BADC_MASK;
*ctsadc = cfg & INA3221_CONV_TIME_SADC_MASK;
*mode = cfg & INA3221_MODE_MASK;
*ns = (ina3221_num_samples_t)(cfg & INA3221_NUM_SAMPLES_MASK);
*ctbadc = (ina3221_conv_time_bus_adc_t)(cfg & INA3221_CONV_TIME_BADC_MASK);
*ctsadc = (ina3221_conv_time_shunt_adc_t)(cfg & INA3221_CONV_TIME_SADC_MASK);
*mode = (ina3221_mode_t)(cfg & INA3221_MODE_MASK);
return ret;
}
@ -578,14 +578,14 @@ static inline int ina3221_get_config(const ina3221_t *dev,
* @brief Enable channels
*
* @param[in,out] dev Device handle
* @param[in] ech Channel enable flags
* @param[in] ech Channel enable flags @see ina3221_enable_ch_t
*
* @return INA3221_OK, on success
* @return -INA3221_I2C_ERROR, if I2C bus acquirement failed
* @return @see i2c_read_regs
* @return @see i2c_write_regs
*/
int _ina3221_set_enable_channel(ina3221_t *dev, ina3221_enable_ch_t ech);
int _ina3221_set_enable_channel(ina3221_t *dev, uint16_t ech);
/**
* @brief Wrapper around @see _ina3221_set_enable_channel
@ -612,11 +612,11 @@ static inline int ina3221_set_channel_state(ina3221_t *dev,
* @brief Read which channels are currently enabled
*
* @param[in] dev Device handle
* @param[out] ech Pointer to enabled channels output variable
* @param[out] ech Pointer to enabled channels output variable @see ina3221_enable_ch_t
*
* @return Number of enabled channels
*/
int _ina3221_get_enable_channel(const ina3221_t *dev, ina3221_enable_ch_t *ech);
int _ina3221_get_enable_channel(const ina3221_t *dev, uint16_t *ech);
/**
* @brief Wrapper around _ina3221_get_enable_channel
@ -633,7 +633,7 @@ static inline int ina3221_get_channel_state(const ina3221_t *dev,
ina3221_channel_state_t *ch2,
ina3221_channel_state_t *ch3)
{
ina3221_enable_ch_t ech = 0;
uint16_t ech = 0;
int ret = _ina3221_get_enable_channel(dev, &ech);
*ch1 = (ech & INA3221_ENABLE_CH1) ? INA3221_CH_ENABLE : INA3221_CH_DISABLE;
@ -742,7 +742,7 @@ int ina3221_get_mode(const ina3221_t *dev, ina3221_mode_t *mode);
* @brief Enable channels for shunt voltage sum calculation
*
* @param[in] dev Device handle
* @param[in] esch Enable channel shunt voltage sum flags in host byte order
* @param[in] esch Enable channel shunt voltage sum flags in host byte order @see ina3221_enable_sum_ch_t
*
* @return INA3221_OK, on success
* @return -INA3221_I2C_ERROR, if I2C bus acquirement failed
@ -750,7 +750,7 @@ int ina3221_get_mode(const ina3221_t *dev, ina3221_mode_t *mode);
* @return @see i2c_write_regs
*/
int _ina3221_set_enable_sum_channel(const ina3221_t *dev,
ina3221_enable_sum_ch_t esch);
uint16_t esch);
/**
* @brief Wrapper around @see _ina3221_set_enable_sum_channel
@ -777,14 +777,14 @@ static inline int ina3221_set_enable_sum_channel(const ina3221_t *dev,
* @brief Read enabled channels for shunt voltage sum calculation
*
* @param[in] dev Device handle
* @param[out] esch Pointer to enabled channels for shunt voltage sum calculation output variable
* @param[out] esch Pointer to enabled channels for shunt voltage sum calculation output variable @see ina3221_enable_sum_ch_t
*
* @return Number of enabled channels for shunt voltage sum calculation, on success
* @return -INA3221_I2C_ERROR, if I2C bus acquirement failed
* @return @see i2c_read_regs
*/
int _ina3221_get_enable_sum_channel(const ina3221_t *dev,
ina3221_enable_sum_ch_t *esch);
uint16_t *esch);
/**
* @brief Wrapper for @see _ina3221_get_enable_sum_channel
@ -801,7 +801,7 @@ static inline int ina3221_get_enable_sum_channel(const ina3221_t *dev,
ina3221_channel_state_t *ch2,
ina3221_channel_state_t *ch3)
{
ina3221_enable_sum_ch_t esch = 0;
uint16_t esch = 0;
int ret = _ina3221_get_enable_sum_channel(dev, &esch);
*ch1 =