lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.7.2

Browse source
This commit is contained in:
Laurent Bigonville 2014-04-22 20:39:47 +02:00
parent 0121794af9
commit a356b56d11
263 changed files with 6039 additions and 8151 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/al175.c
View file

@ -53,7 +53,7 @@ typedef uint8_t byte_t;
#define DRIVER_NAME "Eltek AL175/COMLI driver"
#define DRIVER_VERSION "0.11"
#define DRIVER_VERSION "0.12"
/* driver description structure */
upsdrv_info_t upsdrv_info = {
@ -462,7 +462,7 @@ static int al_parse_reply_head(io_head_t *io, const raw_data_t raw_reply_head)
const byte_t *reply_head = raw_reply_head.begin - 1;
if ( (raw_reply_head.end - raw_reply_head.begin) != 10) {
upsdebugx(3, "%s: wrong size\t(%i != 10)", __func__, (raw_reply_head.end - raw_reply_head.begin));
upsdebugx(3, "%s: wrong size\t(%i != 10)", __func__, (int)(raw_reply_head.end - raw_reply_head.begin));
return -1; /* wrong size */
}
@ -549,7 +549,7 @@ static int al_parse_reply(io_head_t *io_head, raw_data_t *io_buf, /*const*/ raw_
if ( (raw_reply.end - raw_reply.begin) != (ptrdiff_t)(10 + io_head->len)) {
upsdebugx(3, "%s: corrupt sentence\t(%i != %i)",
__func__, raw_reply.end - raw_reply.begin, 10 + io_head->len);
__func__, (int)(raw_reply.end - raw_reply.begin), 10 + io_head->len);
return -1; /* corrupt sentence */
}
@ -597,7 +597,7 @@ static int al_check_ack(/*const*/ raw_data_t raw_ack)
const byte_t *ack = raw_ack.begin - 1;
if ( (raw_ack.end - raw_ack.begin) !=5) {
upsdebugx(3, "%s: wrong size\t(%i != 5)", __func__, raw_ack.end - raw_ack.begin);
upsdebugx(3, "%s: wrong size\t(%i != 5)", __func__, (int)(raw_ack.end - raw_ack.begin));
return -1; /* wrong size */
}
@ -965,7 +965,8 @@ static int al175_read(byte_t *dst, unsigned addr, size_t count)
if ( (io.addr != addr) || (io.len != count) ) {
upsdebugx(3, "%s: io_head mismatch\t(%x,%x != %x,%x)",
__func__, io.addr, io.len, addr, count);
__func__, io.addr, io.len, addr,
(unsigned int)count);
return -1;
}