Skip to content

Fightwarn - pijuice #864

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 7 commits into from
Nov 11, 2020
Merged

Fightwarn - pijuice #864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d753cd6
drivers/pijuice.c: replace __FUNCTION__ by __func__ to avoid warnings
jimklimov Nov 9, 2020
ab1275b
drivers/pijuice.c: set_poweroff(): fix limited value range exceeded
jimklimov Nov 9, 2020
dda64ec
drivers/pijuice.c: rearrange I2C_*() macros to catch -1 error codes w…
jimklimov Nov 9, 2020
944b9e4
drivers/pijuice.c: use "__s32" de-facto in headers instead of "s32" f…
jimklimov Nov 9, 2020
abd8b51
drivers/pijuice.c: avoid setting "data" during a write
jimklimov Nov 9, 2020
c5a2ff7
drivers/pijuice.c: set_power_off(): drop unused "data"
jimklimov Nov 9, 2020
08af693
drivers/al175.c: update Linux i2c include mesh (thanks to pijuice.c)
jimklimov Nov 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions drivers/asem.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,28 @@
#include <stdio.h>
#include <errno.h>
#include <unistd.h>
/* Depends on i2c-dev.h, Linux only */
#include <linux/i2c-dev.h>

/* Depends on i2c-dev.h, Linux only
* Linux I2C userland is a bit of a mess until distros refresh to
* the i2c-tools 4.x release that profides i2c/smbus.h for userspace
* instead of (re)using linux/i2c-dev.h, which conflicts with a
* kernel header of the same name.
*
* See:
* https://i2c.wiki.kernel.org/index.php/Plans_for_I2C_Tools_4
*/
#if HAVE_LINUX_SMBUS_H
# include <i2c/smbus.h>
#endif
#if HAVE_LINUX_I2C_DEV_H
# include <linux/i2c-dev.h> /* for I2C_SLAVE */
# if !HAVE_LINUX_SMBUS_H
# ifndef I2C_FUNC_I2C
# include <linux/i2c.h>
# endif
# endif
#endif

#include <sys/ioctl.h>

#ifndef __STR__
Expand Down
92 changes: 55 additions & 37 deletions drivers/pijuice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,22 +245,41 @@ upsdrv_info_t upsdrv_info = {
{ NULL }
};

/* The macros below all write into a "data" variable defined by the routine
* scope which calls them, with respective type of uint8_t for "byte" and
* uint16_t for "word" macros. Native i2c functions operate with __s32 type
* (currently, signed 32-bit ints?) with negative values for error returns.
* Note: some manpages refer to "s32" while headers on my and CI systems use
* a "__s32" type. Maybe this is something to determine in configure script?
* Code below was fixed to convert the valid values and avoid compiler
* warnings about comparing whether unsigned ints happened to be negative.
*/
#define I2C_READ_BYTE(fd, cmd, label) \
if ((data = i2c_smbus_read_byte_data(upsfd, cmd)) < 0 ) { \
upsdebugx(2, "Failure reading the i2c bus [%s]", label); \
return; \
{ \
__s32 sData; \
if ((sData = i2c_smbus_read_byte_data(upsfd, cmd)) < 0 ) { \
upsdebugx(2, "Failure reading the i2c bus [%s]", label); \
return; \
} ; \
data = (uint8_t) sData; \
}

#define I2C_WRITE_BYTE(fd, cmd, value, label) \
if ((data = i2c_smbus_write_byte_data(upsfd, cmd, value)) < 0 ) { \
upsdebugx(2, "Failure writing to the i2c bus [%s]", label); \
return; \
{ \
if ( i2c_smbus_write_byte_data(upsfd, cmd, value) < 0 ) { \
upsdebugx(2, "Failure writing to the i2c bus [%s]", label); \
return; \
} ; \
}

#define I2C_READ_WORD(fd, cmd, label) \
if ((data = i2c_smbus_read_word_data(upsfd, cmd)) < 0 ) { \
upsdebugx(2, "Failure reading the i2c bus [%s]", label); \
return; \
{ \
__s32 sData; \
if ((sData = i2c_smbus_read_word_data(upsfd, cmd)) < 0 ) { \
upsdebugx(2, "Failure reading the i2c bus [%s]", label); \
return; \
} ; \
data = (uint16_t) sData; \
}

#define I2C_READ_BLOCK(fd, cmd, size, block, label) \
Expand Down Expand Up @@ -291,9 +310,9 @@ static void get_charge_level_hi_res()
uint8_t cmd = CHARGE_LEVEL_HI_RES_CMD;
uint16_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_WORD( upsfd, cmd, __FUNCTION__ )
I2C_READ_WORD( upsfd, cmd, __func__ )

/*
* Use an external variable to allow for missed i2c bus
Expand Down Expand Up @@ -321,11 +340,11 @@ static void get_status()
uint8_t data;
char status_buf[ST_MAX_VALUE_LEN];

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

memset( status_buf, 0, ST_MAX_VALUE_LEN );

I2C_READ_BYTE( upsfd, cmd, __FUNCTION__ )
I2C_READ_BYTE( upsfd, cmd, __func__ )

uint8_t batteryStatus = data >> 2 & 0x03;
switch( batteryStatus )
Expand Down Expand Up @@ -522,9 +541,9 @@ static void get_battery_temperature()
uint8_t cmd = BATTERY_TEMPERATURE_CMD;
int16_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_WORD( upsfd, cmd, __FUNCTION__ )
I2C_READ_WORD( upsfd, cmd, __func__ )

upsdebugx( 1, "Battery Temperature: %d°C", data );
dstate_setinfo( "battery.temperature", "%d", data );
Expand All @@ -535,9 +554,9 @@ static void get_battery_voltage()
uint8_t cmd = BATTERY_VOLTAGE_CMD;
int16_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_WORD( upsfd, cmd, __FUNCTION__ )
I2C_READ_WORD( upsfd, cmd, __func__ )

upsdebugx( 1, "Battery Voltage: %0.3fV", data / 1000.0 );
dstate_setinfo( "battery.voltage", "%0.3f", data / 1000.0 );
Expand All @@ -548,7 +567,7 @@ static void get_battery_current()
uint8_t cmd = BATTERY_CURRENT_CMD;
int16_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

/*
* The reported current can actually be negative, so we cannot
Expand All @@ -570,9 +589,9 @@ static void get_io_voltage()
uint8_t cmd = IO_VOLTAGE_CMD;
int16_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_WORD( upsfd, cmd, __FUNCTION__ )
I2C_READ_WORD( upsfd, cmd, __func__ )

upsdebugx( 1, "Input Voltage: %.3fV", data / 1000.0 );
dstate_setinfo( "input.voltage", "%.3f", data / 1000.0 );
Expand All @@ -583,7 +602,7 @@ static void get_io_current()
uint8_t cmd = IO_CURRENT_CMD;
int16_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

/*
* The reported current can actually be negative, so we cannot
Expand All @@ -606,9 +625,9 @@ static void get_firmware_version()
uint16_t data;
uint8_t major, minor;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_WORD( upsfd, cmd, __FUNCTION__ )
I2C_READ_WORD( upsfd, cmd, __func__ )

major = data >> 4;
minor = ( data << 4 & 0xf0 ) >> 4;
Expand All @@ -627,9 +646,9 @@ static void get_battery_profile()
uint8_t cmd = BATTERY_PROFILE_CMD;
__u8 block[I2C_SMBUS_BLOCK_MAX];

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_BLOCK( upsfd, cmd, 14, block, __FUNCTION__ )
I2C_READ_BLOCK( upsfd, cmd, 14, block, __func__ )

upsdebugx( 1, "Battery Capacity: %0.3fAh", ( block[1] << 8 | block[0] ) / 1000.0 );
dstate_setinfo( "battery.capacity", "%0.3f", ( block[1] << 8 | block[0] ) / 1000.0 );
Expand All @@ -640,9 +659,9 @@ static void get_battery_profile_ext()
uint8_t cmd = BATTERY_EXT_PROFILE_CMD;
__u8 block[I2C_SMBUS_BLOCK_MAX];

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_BLOCK( upsfd, cmd, 17, block, __FUNCTION__ )
I2C_READ_BLOCK( upsfd, cmd, 17, block, __func__ )

switch( block[0] & 0xFF00 )
{
Expand All @@ -665,9 +684,9 @@ static void get_power_off()
uint8_t cmd = POWER_OFF_CMD;
uint8_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_BYTE( upsfd, cmd, __FUNCTION__ )
I2C_READ_BYTE( upsfd, cmd, __func__ )

if ( data == 255 )
{
Expand All @@ -682,16 +701,15 @@ static void get_power_off()
static void set_power_off()
{
uint8_t cmd = POWER_OFF_CMD;
uint8_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

/*
* Acceptable values for shutdown_delay are 1-250,
* use 0/255 to clear a scheduled power off command
*/

if ( shutdown_delay > 255 )
if ( shutdown_delay > 250 )
{
upslogx(
LOG_WARNING,
Expand All @@ -709,7 +727,7 @@ static void set_power_off()
shutdown_delay = 1;
}

I2C_WRITE_BYTE( upsfd, cmd, shutdown_delay, __FUNCTION__ )
I2C_WRITE_BYTE( upsfd, cmd, shutdown_delay, __func__ )
}

static void get_time()
Expand All @@ -719,9 +737,9 @@ static void get_time()
uint8_t second, minute, hour, day, month, subsecond;
uint16_t year;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_BLOCK( upsfd, cmd, 9, block, __FUNCTION__ )
I2C_READ_BLOCK( upsfd, cmd, 9, block, __func__ )

second = (( (block[0] >> 4 ) & 0x07) * 10 ) + ( block[0] & 0x0F );
minute = (( (block[1] >> 4 ) & 0x07) * 10 ) + ( block[1] & 0x0F );
Expand All @@ -743,9 +761,9 @@ static void get_i2c_address()
uint8_t cmd = I2C_ADDRESS_CMD;
uint8_t data;

upsdebugx( 3, __FUNCTION__ );
upsdebugx( 3, __func__ );

I2C_READ_BYTE( upsfd, cmd, __FUNCTION__ )
I2C_READ_BYTE( upsfd, cmd, __func__ )

upsdebugx( 1, "I2C Address: 0x%0x", data );

Expand Down