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

Imported Upstream version 2.7.4

Browse source
This commit is contained in:
Laurent Bigonville 2016-07-18 02:11:41 +02:00
parent fd413a3168
commit c9cb2187ee
290 changed files with 7473 additions and 2607 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/usbhid-ups.c
View file

@ -27,7 +27,7 @@
*/
#define DRIVER_NAME "Generic HID driver"
#define DRIVER_VERSION "0.39"
#define DRIVER_VERSION "0.41"
#include "main.h"
#include "libhid.h"
@ -753,7 +753,7 @@ void upsdrv_makevartable(void)
void upsdrv_updateinfo(void)
{
hid_info_t *item;
HIDData_t *event[MAX_EVENT_NUM];
HIDData_t *event[MAX_EVENT_NUM], *found_data;
int i, evtCount;
double value;
time_t now;
@ -826,7 +826,15 @@ void upsdrv_updateinfo(void)
}
/* Skip Input reports, if we don't use the Feature report */
item = find_hid_info(FindObject_with_Path(pDesc, &(event[i]->Path), interrupt_only ? ITEM_INPUT:ITEM_FEATURE));
found_data = FindObject_with_Path(pDesc, &(event[i]->Path), interrupt_only ? ITEM_INPUT:ITEM_FEATURE);
if(!found_data && !interrupt_only) {
found_data = FindObject_with_Path(pDesc, &(event[i]->Path), ITEM_INPUT);
}
if(!found_data) {
upsdebugx(2, "Could not find event as either ITEM_INPUT or ITEM_FEATURE?");
continue;
}
item = find_hid_info(found_data);
if (!item) {
upsdebugx(3, "NUT doesn't use this HID object");
continue;
@ -1481,6 +1489,11 @@ static hid_info_t *find_hid_info(const HIDData_t *hiddata)
{
hid_info_t *hidups_item;
if(!hiddata) {
upsdebugx(2, "%s: hiddata == NULL", __func__);
return NULL;
}
for (hidups_item = subdriver->hid2nut; hidups_item->info_type != NULL ; hidups_item++) {
/* Skip server side vars */