aboutsummaryrefslogtreecommitdiff
path: root/sysutils/apcupsd/files
diff options
context:
space:
mode:
authorDanilo G. Baio <dbaio@FreeBSD.org>2020-09-04 23:39:38 +0000
committerDanilo G. Baio <dbaio@FreeBSD.org>2020-09-04 23:39:38 +0000
commit5158fdadabc0e2db1f8b1cd8a7d456bc999d83d3 (patch)
tree5fabcc634cecf93be203c8148aa87c49a54dee8d /sysutils/apcupsd/files
parentf52117b52944f049bdcf74db61c4f89a54cd7b68 (diff)
downloadports-5158fdadabc0e2db1f8b1cd8a7d456bc999d83d3.tar.gz
ports-5158fdadabc0e2db1f8b1cd8a7d456bc999d83d3.zip
Notes
Diffstat (limited to 'sysutils/apcupsd/files')
-rw-r--r--sysutils/apcupsd/files/extra-patch-usb-reporting51
-rw-r--r--sysutils/apcupsd/files/pkg-message.in4
2 files changed, 55 insertions, 0 deletions
diff --git a/sysutils/apcupsd/files/extra-patch-usb-reporting b/sysutils/apcupsd/files/extra-patch-usb-reporting
new file mode 100644
index 000000000000..b926c5b10db9
--- /dev/null
+++ b/sysutils/apcupsd/files/extra-patch-usb-reporting
@@ -0,0 +1,51 @@
+--- include/HidUps.h.orig 2015-02-08 18:00:05 UTC
++++ include/HidUps.h
+@@ -107,6 +107,7 @@ class HidUps (private)
+ /* Fetch a descriptor from an interface (as opposed to from the device) */
+ int GetIntfDescr(
+ unsigned char type, unsigned char index, void *buf, int size);
++ int GetIntfDescrLength(unsigned char index);
+
+ bool init_device(struct usb_device *dev, const char *serno);
+
+--- src/libusbhid/HidUps.cpp.orig 2015-02-08 18:00:05 UTC
++++ src/libusbhid/HidUps.cpp
+@@ -244,6 +244,26 @@ int HidUps::GetIntfDescr(
+ (type << 8) + index, 0, (char*)buf, size, 1000);
+ }
+
++/* Get the interface descriptor's length */
++int HidUps::GetIntfDescrLength(unsigned char index)
++{
++ /* usb_hid_descriptor */
++ char buf[9];
++ memset(buf, 0, sizeof(buf));
++ int ret = usb_control_msg(_fd, USB_ENDPOINT_IN | USB_RECIP_INTERFACE,
++ USB_REQ_GET_DESCRIPTOR,
++ (USB_DT_HID << 8) + index, 0, (char*)buf, sizeof(buf), 1000);
++
++ int len = MAX_SANE_DESCRIPTOR_LEN;
++ if (ret >= 0) {
++ /* wDescriptorLength */
++ int desclen = buf[7] | (buf[8] << 8);
++ if (desclen > 0)
++ len = desclen;
++ }
++ return len;
++}
++
+ /*
+ * Fetch the report descriptor from the device given an _fd for the
+ * device's control endpoint. Descriptor length is written to the
+@@ -255,8 +275,9 @@ unsigned char *HidUps::FetchReportDescr(int *rlen)
+ unsigned char *ptr;
+ int rdesclen;
+
+- ptr = (unsigned char*)malloc(MAX_SANE_DESCRIPTOR_LEN);
+- rdesclen = GetIntfDescr(USB_DT_REPORT, 0, ptr, MAX_SANE_DESCRIPTOR_LEN);
++ int desclen = GetIntfDescrLength(0);
++ ptr = (unsigned char*)malloc(desclen);
++ rdesclen = GetIntfDescr(USB_DT_REPORT, 0, ptr, desclen);
+ if (rdesclen <= 0) {
+ Dmsg(100, "Unable to get REPORT descriptor (%d).\n", rdesclen);
+ free(ptr);
diff --git a/sysutils/apcupsd/files/pkg-message.in b/sysutils/apcupsd/files/pkg-message.in
index 6af80aada141..a9ce5b4d036e 100644
--- a/sysutils/apcupsd/files/pkg-message.in
+++ b/sysutils/apcupsd/files/pkg-message.in
@@ -18,6 +18,10 @@ For default, apcupsd starts with `--kill-on-powerfail` parameter.
Please, read its man page, and if this is not the intended behavior you want,
change it accordingly.
+If connected via USB and apcaccess reports incomplete data consider enabling
+the USB_REPORTING options via 'make config'. This contains an experimental
+patch that may fix some USB attach APC UPS. PR #249041
+
In some systems where the shutdown can take a while (like in bhyve environment),
you may want to change this behavior as follows: