X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=e40e1f676279386064a25c81c5c6f7c57064ee10;hb=a376ffea49411cca09b358f3677938612c79afaf;hp=8be8a9e2dd8820d6fc813a6e6b45aadd86198c43;hpb=393fb9cb18c5746d8567c9cf74b872804043345a;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index 8be8a9e2..e40e1f67 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -23,6 +23,7 @@
 #include <dirent.h>
 #include <string.h>
 #include <glib.h>
+#include "config.h" /* Needed for HAVE_LIBUSB_1_0 and others. */
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
@@ -67,12 +68,21 @@ static struct sr_hwcap_option sr_devopts[] = {
 };
 
 /** @cond PRIVATE */
+#ifdef HAVE_HW_COLEAD_SLM
+extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
+#endif
 #ifdef HAVE_LA_DEMO
 extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #endif
 #ifdef HAVE_LA_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
+#ifdef HAVE_HW_TONDAJ_SL_814
+extern SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info;
+#endif
+#ifdef HAVE_HW_VICTOR_DMM
+extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
+#endif
 #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
 extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info;
 #endif
@@ -94,9 +104,6 @@ extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info;
 #ifdef HAVE_HW_HANTEK_DSO
 extern SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
 #endif
-#ifdef HAVE_HW_GENERICDMM
-extern SR_PRIV struct sr_dev_driver genericdmm_driver_info;
-#endif
 #ifdef HAVE_HW_AGILENT_DMM
 extern SR_PRIV struct sr_dev_driver agdmm_driver_info;
 #endif
@@ -106,15 +113,38 @@ extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
 #ifdef HAVE_HW_RADIOSHACK_DMM
 extern SR_PRIV struct sr_dev_driver radioshackdmm_driver_info;
 #endif
+#ifdef HAVE_HW_SERIAL_DMM
+extern SR_PRIV struct sr_dev_driver digitek_dt4000zc_driver_info;
+extern SR_PRIV struct sr_dev_driver tekpower_tp4000zc_driver_info;
+extern SR_PRIV struct sr_dev_driver metex_me31_driver_info;
+extern SR_PRIV struct sr_dev_driver peaktech_3410_driver_info;
+extern SR_PRIV struct sr_dev_driver mastech_mas345_driver_info;
+extern SR_PRIV struct sr_dev_driver va_va18b_driver_info;
+extern SR_PRIV struct sr_dev_driver metex_m3640d_driver_info;
+extern SR_PRIV struct sr_dev_driver peaktech_4370_driver_info;
+#endif
+#ifdef HAVE_HW_UNI_T_DMM
+extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
+#endif
 /** @endcond */
 
 static struct sr_dev_driver *drivers_list[] = {
+#ifdef HAVE_HW_COLEAD_SLM
+	&colead_slm_driver_info,
+#endif
 #ifdef HAVE_LA_DEMO
 	&demo_driver_info,
 #endif
 #ifdef HAVE_LA_OLS
 	&ols_driver_info,
 #endif
+#ifdef HAVE_HW_TONDAJ_SL_814
+	&tondaj_sl_814_driver_info,
+#endif
+#ifdef HAVE_HW_VICTOR_DMM
+	&victor_dmm_driver_info,
+#endif
 #ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE
 	&zeroplus_logic_cube_driver_info,
 #endif
@@ -136,9 +166,6 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_HANTEK_DSO
 	&hantek_dso_driver_info,
 #endif
-#ifdef HAVE_HW_GENERICDMM
-	&genericdmm_driver_info,
-#endif
 #ifdef HAVE_HW_AGILENT_DMM
 	&agdmm_driver_info,
 #endif
@@ -147,6 +174,20 @@ static struct sr_dev_driver *drivers_list[] = {
 #endif
 #ifdef HAVE_HW_RADIOSHACK_DMM
 	&radioshackdmm_driver_info,
+#endif
+#ifdef HAVE_HW_SERIAL_DMM
+	&digitek_dt4000zc_driver_info,
+	&tekpower_tp4000zc_driver_info,
+	&metex_me31_driver_info,
+	&peaktech_3410_driver_info,
+	&mastech_mas345_driver_info,
+	&va_va18b_driver_info,
+	&metex_m3640d_driver_info,
+	&peaktech_4370_driver_info,
+#endif
+#ifdef HAVE_HW_UNI_T_DMM
+	&uni_t_ut61d_driver_info,
+	&voltcraft_vc820_driver_info,
 #endif
 	NULL,
 };