drivers/bcmxcp*: refactor with common bcmxcp_makevartable() to sneak …

…in nut_usb_addvars() where needed [#1754]
networkupstools · Jan 19, 2024 · 410da30 · 410da30
1 parent b583c96
commit 410da30
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 5 deletions.
diff --git a/drivers/Makefile.am b/drivers/Makefile.am
@@ -229,7 +229,7 @@ usbhid_ups_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
 tripplite_usb_SOURCES = tripplite_usb.c $(LIBUSB_IMPL) usb-common.c
 tripplite_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
 
-bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c usb-common.c
+bcmxcp_usb_SOURCES = bcmxcp_usb.c bcmxcp.c $(LIBUSB_IMPL) usb-common.c
 bcmxcp_usb_LDADD = $(LDADD_DRIVERS) $(LIBUSB_LIBS) -lm
 
 blazer_usb_SOURCES = blazer.c blazer_usb.c $(LIBUSB_IMPL) usb-common.c

diff --git a/drivers/bcmxcp.c b/drivers/bcmxcp.c
@@ -2213,8 +2213,10 @@ void upsdrv_help(void)
 {
 }
 
-/* list flags and values that you want to receive via -x */
-void upsdrv_makevartable(void)
+/* list flags and values that you want to receive via -x
+ * or ups.conf to all bcmxcp* family of drivers
+ */
+void bcmxcp_makevartable(void)
 {
 	addvar(VAR_VALUE, "shutdown_delay", "Specify shutdown delay (seconds)");
 	addvar(VAR_VALUE, "baud_rate", "Specify communication speed (ex: 9600)");

diff --git a/drivers/bcmxcp.h b/drivers/bcmxcp.h
@@ -622,4 +622,6 @@ typedef enum ebool { FALSE, TRUE } bool_t;
 typedef int bool_t;
 #endif
 
+void bcmxcp_makevartable(void);
+
 #endif	/* NUT_BCMXCP_H_SEEN */
diff --git a/drivers/bcmxcp_ser.c b/drivers/bcmxcp_ser.c
@@ -410,6 +410,11 @@ static void pw_comm_setup(const char *port)
 # pragma GCC diagnostic pop
 #endif
 
+void upsdrv_makevartable(void)
+{
+	bcmxcp_makevartable();
+}
+
 void upsdrv_initups(void)
 {
 	upsfd = ser_open(device_path);

diff --git a/drivers/bcmxcp_usb.c b/drivers/bcmxcp_usb.c
@@ -2,6 +2,7 @@
 #include "bcmxcp.h"
 #include "bcmxcp_io.h"
 #include "common.h"
+#include "nut_libusb.h"
 #include "usb-common.h"
 #include "timehead.h"
 #include "nut_stdint.h" /* for uint16_t */
@@ -11,7 +12,7 @@
 #include <unistd.h>
 
 #define SUBDRIVER_NAME    "USB communication subdriver"
-#define SUBDRIVER_VERSION "0.27"
+#define SUBDRIVER_VERSION "0.28"
 
 /* communication driver description structure */
 upsdrv_info_t comm_upsdrv_info = {
@@ -367,6 +368,14 @@ void upsdrv_comm_good(void)
 	nutusb_comm_good();
 }
 
+void upsdrv_makevartable(void)
+{
+	bcmxcp_makevartable();
+
+	/* allow -x vendor=X, vendorid=X, product=X, productid=X, serial=X */
+	nut_usb_addvars();
+}
+
 void upsdrv_initups(void)
 {
 	upsdev = nutusb_open("USB");

diff --git a/tools/nut-scanner/Makefile.am b/tools/nut-scanner/Makefile.am
@@ -46,10 +46,13 @@ LINKED_SOURCE_FILES += serial.c
 serial.c: $(top_srcdir)/drivers/serial.c
 	test -s "$@" || ln -s -f "$(top_srcdir)/drivers/serial.c" "$@"
 
-LINKED_SOURCE_FILES += bcmxcp_ser.c
+LINKED_SOURCE_FILES += bcmxcp_ser.c bcmxcp.c
 bcmxcp_ser.c: $(top_srcdir)/drivers/bcmxcp_ser.c
 	test -s "$@" || ln -s -f "$(top_srcdir)/drivers/bcmxcp_ser.c" "$@"
 
+bcmxcp.c: $(top_srcdir)/drivers/bcmxcp.c
+	test -s "$@" || ln -s -f "$(top_srcdir)/drivers/bcmxcp.c" "$@"
+
 CLEANFILES += $(LINKED_SOURCE_FILES)
 BUILT_SOURCES += $(LINKED_SOURCE_FILES)