Attachment 217679 Details for Bug 249041 – Add patch to fix APC BE600M1 reporting

[patch] Add patch to fix APC BE600M1 reporting

0001-sysutils-apcupsd-Add-patch-to-fix-APC-BE600M1-report.patch (text/plain), 3.79 KB, created by Derek Schrock on 2020-08-31 23:54:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Derek Schrock

Created: 2020-08-31 23:54:44 UTC

Size: 3.79 KB

patch

obsolete

>From 71e98cb0a16193a724127a7fe9b8ab81b829d4d8 Mon Sep 17 00:00:00 2001
>From: Derek Schrock <dereks@lifeofadishwasher.com>
>Date: Mon, 31 Aug 2020 19:07:08 -0400
>Subject: [PATCH] sysutils/apcupsd: Add patch to fix APC BE600M1 reporting
>
>Reading here [1] and using the patch mentioned here [2] I was able to
>get apcupsd running on 12.1 to correctly report data from a BE600M1.
>
>Also, some functions in apctest now work as well.
>
>[1] https://sourceforge.net/p/apcupsd/mailman/apcupsd-users/thread/CAMe0L0Vc9BzCYehm-bZUoPgHaL-43xsjetQ3hi7gD380b7NsqQ%40mail.gmail.com/#msg36287119
>[2] http://apcupsd-ups-control-software.10985.n7.nabble.com/Potential-bug-with-USB-driver-and-HID-reports-td10001.html#a10043
>---
> sysutils/apcupsd/Makefile                     |  2 +-
> sysutils/apcupsd/files/patch-include_HidUps.h | 10 +++++
> .../files/patch-src_libusbhid_HidUps.cpp      | 41 +++++++++++++++++++
> 3 files changed, 52 insertions(+), 1 deletion(-)
> create mode 100644 sysutils/apcupsd/files/patch-include_HidUps.h
> create mode 100644 sysutils/apcupsd/files/patch-src_libusbhid_HidUps.cpp
>
>diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
>index 93f9b1302..053dde082 100644
>--- a/sysutils/apcupsd/Makefile
>+++ b/sysutils/apcupsd/Makefile
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	apcupsd
> PORTVERSION=	3.14.14
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	sysutils
> MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20-%20Stable/${PORTVERSION}
> 
>diff --git a/sysutils/apcupsd/files/patch-include_HidUps.h b/sysutils/apcupsd/files/patch-include_HidUps.h
>new file mode 100644
>index 000000000..a59bbd402
>--- /dev/null
>+++ b/sysutils/apcupsd/files/patch-include_HidUps.h
>@@ -0,0 +1,10 @@
>+--- 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);
>+ 
>diff --git a/sysutils/apcupsd/files/patch-src_libusbhid_HidUps.cpp b/sysutils/apcupsd/files/patch-src_libusbhid_HidUps.cpp
>new file mode 100644
>index 000000000..32411b1ff
>--- /dev/null
>+++ b/sysutils/apcupsd/files/patch-src_libusbhid_HidUps.cpp
>@@ -0,0 +1,41 @@
>+--- 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);
>-- 
>2.28.0
>

Actions: View | Diff

Attachments on bug 249041: 217679 | 217757