Imported Upstream version 2.6.0
This commit is contained in:
parent
26fb71b504
commit
459aaf9392
510 changed files with 40508 additions and 18859 deletions
|
|
@ -155,7 +155,7 @@ static int refresh_report_buffer(reportbuf_t *rbuf, hid_dev_handle_t udev, HIDDa
|
|||
}
|
||||
|
||||
/* broken report descriptors are common, so store whatever we can */
|
||||
memcpy(rbuf->data[id], buf, rbuf->len[id]);
|
||||
memcpy(rbuf->data[id], buf, (r < rbuf->len[id]) ? r : rbuf->len[id]);
|
||||
|
||||
if (rbuf->len[id] != r) {
|
||||
upsdebugx(2, "%s: expected %d bytes, but got %d instead", __func__, rbuf->len[id], r);
|
||||
|
|
@ -221,7 +221,7 @@ static int file_report_buffer(reportbuf_t *rbuf, unsigned char *buf, int buflen)
|
|||
int id = buf[0];
|
||||
|
||||
/* broken report descriptors are common, so store whatever we can */
|
||||
memcpy(rbuf->data[id], buf, rbuf->len[id]);
|
||||
memcpy(rbuf->data[id], buf, (buflen < rbuf->len[id]) ? buflen : rbuf->len[id]);
|
||||
|
||||
if (rbuf->len[id] != buflen) {
|
||||
upsdebugx(2, "%s: expected %d bytes, but got %d instead", __func__, rbuf->len[id], buflen);
|
||||
|
|
@ -299,7 +299,7 @@ void HIDDumpTree(hid_dev_handle_t udev, usage_tables_t *utab)
|
|||
|
||||
/* Get data value */
|
||||
if (HIDGetDataValue(udev, pData, &value, MAX_TS) == 1) {
|
||||
upsdebugx(1, "Path: %s, Type: %s, ReportID: 0x%02x, Offset: %i, Size: %i, Value: %f",
|
||||
upsdebugx(1, "Path: %s, Type: %s, ReportID: 0x%02x, Offset: %i, Size: %i, Value: %g",
|
||||
HIDGetDataItem(pData, utab), HIDDataType(pData), pData->ReportID, pData->Offset, pData->Size, value);
|
||||
continue;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue