fluke-dmm: build fixes

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index b93b37fa7baccf3d963e1461ba51646503ed33be..cec9f3ef7cd5f0aa5d6b44a42655de7a04229b4c 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -29,8 +29,8 @@
 #include <errno.h>
 
 
-SR_PRIV struct sr_dev_driver driver_info;
-static struct sr_dev_driver *di = &driver_info;
+SR_PRIV struct sr_dev_driver flukedmm_driver_info;
+static struct sr_dev_driver *di = &flukedmm_driver_info;
 
 static const struct flukedmm_profile supported_flukedmm[] = {
        { FLUKE_187, "187" },
@@ -307,7 +307,7 @@ static int hw_dev_acquisition_stop(const struct sr_dev_inst *sdi,
        return SR_OK;
 }
 
-SR_PRIV struct sr_dev_driver driver_info = {
+SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
        .name = "fluke-dmm",
        .longname = "Fluke 18x/28x series DMMs",
        .api_version = 1,

diff --git a/hwdriver.c b/hwdriver.c
index e466575b6ed43340272fe2cf9fb940cb54bc74c9..083504c5ec3728c8ba7ee3ab02ef391d712033dd 100644 (file)
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -86,6 +86,9 @@ extern SR_PRIV struct sr_dev_driver genericdmm_driver_info;
 #ifdef HAVE_HW_AGILENT_DMM
 extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
 #endif
+#ifdef HAVE_HW_FLUKE_DMM
+extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
+#endif
 
 static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_LA_DEMO
@@ -120,6 +123,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #endif
 #ifdef HAVE_HW_AGILENT_DMM
        &agdmm_driver_info,
+#endif
+#ifdef HAVE_HW_FLUKE_DMM
+       &flukedmm_driver_info,
 #endif
        NULL,
 };