drivers/bcmxcp*: rename comm_upsdrv_info => bcmxcp_comm_upsdrv_info to avoid linker conflict with libusb{0,1}.c [#2270]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Author: jimklimov

drivers/bcmxcp.c

@@ -135,7 +135,7 @@ upsdrv_info_t upsdrv_info = {
 	"Alf Høgemark <alf@i100>\n" \
 	"Gavrilov Igor",
 	DRV_STABLE,
-	{ &comm_upsdrv_info, NULL }
+	{ &bcmxcp_comm_upsdrv_info, NULL }
 };
 
 static uint16_t get_word(const unsigned char*);

drivers/bcmxcp_io.h

@@ -17,6 +17,6 @@ void upsdrv_cleanup(void);
 void upsdrv_reconnect(void);
 void upsdrv_comm_good(void);
 
-extern upsdrv_info_t comm_upsdrv_info;
+extern upsdrv_info_t bcmxcp_comm_upsdrv_info;
 
 #endif  /* BCMXCP_IO__ */

drivers/bcmxcp_ser.c

@@ -9,7 +9,7 @@
 #define SUBDRIVER_VERSION "0.22"
 
 /* communication driver description structure */
-upsdrv_info_t comm_upsdrv_info = {
+upsdrv_info_t bcmxcp_comm_upsdrv_info = {
 	SUBDRIVER_NAME,
 	SUBDRIVER_VERSION,
 	NULL,

drivers/bcmxcp_usb.c

@@ -14,8 +14,11 @@
 #define SUBDRIVER_NAME    "USB communication subdriver"
 #define SUBDRIVER_VERSION "0.28"
 
-/* communication driver description structure */
-upsdrv_info_t comm_upsdrv_info = {
+/* communication driver description structure
+ * NOTE: Renamed from comm_upsdrv_info to avoid conflict
+ *  with that defined in libusb{0,1}.c
+ */
+upsdrv_info_t bcmxcp_comm_upsdrv_info = {
 	SUBDRIVER_NAME,
 	SUBDRIVER_VERSION,
 	NULL,