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

Imported Upstream version 2.7.3

Browse source
This commit is contained in:
Arnaud Quette 2015-04-30 15:53:36 +02:00
parent a356b56d11
commit fd413a3168
283 changed files with 14978 additions and 6511 deletions
Download patch file Download diff file Expand all files Collapse all files

61
drivers/nutdrv_qx_blazer-common.c
View file

@ -42,8 +42,8 @@ info_rw_t blazer_r_offdelay[] = {
/* == Support functions == */
/* This function allows the subdriver to "claim" a device: return 1 if the device is supported by this subdriver, else 0. */
int blazer_claim(void) {
int blazer_claim(void)
{
/* To tell whether the UPS is supported or not, we'll check both status (Q1/QS/D) and vendor (I/FW?) - provided that we were not told not to do it with the ups.conf flag 'novendor'. */
item_t *item = find_nut_info("input.voltage", 0, 0);
@ -85,13 +85,12 @@ int blazer_claim(void) {
}
return 1;
}
/* This function allows the subdriver to "claim" a device: return 1 if the device is supported by this subdriver, else 0.
* NOTE: this 'light' version only checks for status (Q1/QS/D/..) */
int blazer_claim_light(void) {
int blazer_claim_light(void)
{
/* To tell whether the UPS is supported or not, we'll check just status (Q1/QS/D/..). */
item_t *item = find_nut_info("input.voltage", 0, 0);
@ -109,7 +108,6 @@ int blazer_claim_light(void) {
return 0;
return 1;
}
/* Subdriver-specific flags/vars */
@ -117,18 +115,28 @@ void blazer_makevartable(void)
{
addvar(VAR_FLAG, "norating", "Skip reading rating information from UPS");
addvar(VAR_FLAG, "novendor", "Skip reading vendor information from UPS");
blazer_makevartable_light();
}
/* Subdriver-specific flags/vars
* NOTE: this 'light' version only handles vars/flags related to UPS status query (Q1/QS/D/...) */
void blazer_makevartable_light(void)
{
addvar(VAR_FLAG, "ignoresab", "Ignore 'Shutdown Active' bit in UPS status");
}
/* Subdriver-specific initups */
void blazer_initups(item_t *qx2nut)
{
int nr, nv;
int nr, nv, isb;
item_t *item;
nr = testvar("norating");
nv = testvar("novendor");
isb = testvar("ignoresab");
if (!nr && !nv)
if (!nr && !nv && !isb)
return;
for (item = qx2nut; item->info_type != NULL; item++) {
@ -148,6 +156,33 @@ void blazer_initups(item_t *qx2nut)
item->qxflags |= QX_FLAG_SKIP;
}
/* ignoresab */
if (isb && !strcasecmp(item->info_type, "ups.status") && item->from == 44 && item->to == 44) {
upsdebugx(2, "%s: skipping %s ('Shutdown Active' bit)", __func__, item->info_type);
item->qxflags |= QX_FLAG_SKIP;
}
}
}
/* Subdriver-specific initups
* NOTE: this 'light' version only checks for status (Q1/QS/D/..) related items */
void blazer_initups_light(item_t *qx2nut)
{
item_t *item;
if (!testvar("ignoresab"))
return;
for (item = qx2nut; item->info_type != NULL; item++) {
if (strcasecmp(item->info_type, "ups.status") || item->from != 44 || item->to != 44)
continue;
upsdebugx(2, "%s: skipping %s ('Shutdown Active' bit)", __func__, item->info_type);
item->qxflags |= QX_FLAG_SKIP;
break;
}
}
@ -350,14 +385,10 @@ int blazer_process_status_bits(item_t *item, char *value, size_t valuelen)
case 44: /* Shutdown Active */
if (item->value[0] == '1') {
if (!strcasecmp(item->info_type, "ups.status"))
val = "FSD";
else /* ups.alarm */
val = "Shutdown imminent!";
} else if (!strcasecmp(item->info_type, "ups.status")) {
if (item->value[0] == '1')
val = "FSD";
else
val = "!FSD";
}
break;
case 45: /* Beeper status - ups.beeper.status */