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

Imported Upstream version 2.6.4

Browse source
This commit is contained in:
Arnaud Quette 2012-06-01 15:55:19 +02:00
parent fad6ced6f6
commit fefe62b2bd
257 changed files with 6020 additions and 1394 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/mge-shut.c
View file

@ -1,6 +1,6 @@
/* mge-shut.c - monitor MGE UPS for NUT with SHUT protocol
*
* Copyright (C) 2002 - 2008
* Copyright (C) 2002 - 2012
* Arnaud Quette <arnaud.quette@gmail.com>
*
* Sponsored by MGE UPS SYSTEMS <http://opensource.mgeups.com/>
@ -37,7 +37,7 @@
/* --------------------------------------------------------------- */
#define DRIVER_NAME "Eaton / SHUT driver"
#define DRIVER_VERSION "0.69"
#define DRIVER_VERSION "0.70"
/* driver description structure */
upsdrv_info_t upsdrv_info = {
@ -524,7 +524,7 @@ int shut_wait_ack (void)
upsdebugx (2, "shut_wait_ack(): NACK received");
return -2;
}
else if ((c[0] & SHUT_PKT_LAST) == SHUT_TYPE_NOTIFY) {
else if ((c[0] & 0x0f) == SHUT_TYPE_NOTIFY) {
upsdebugx (2, "shut_wait_ack(): NOTIFY received");
return -3;
}
@ -835,8 +835,11 @@ int shut_packet_recv (u_char *Buf, int datalen)
shut_token_send(SHUT_OK);
if(Start[0]&SHUT_PKT_LAST) {
if ((Start[0]&SHUT_PKT_LAST) == SHUT_TYPE_NOTIFY) {
/* Check if there are more data to receive */
if((Start[0] & 0xf0) == SHUT_PKT_LAST) {
/* Check if it's a notification */
if ((Start[0] & 0x0f) == SHUT_TYPE_NOTIFY) {
/* TODO: process notification (dropped for now) */
upsdebugx (4, "=> notification");
datalen+=Pos;