X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=e685459feef37d8dbfefcf4f4a49b1aad3481ac5;hb=46697e38b286541e0e5aa354d35a6f4564855fa6;hp=3b1718d31adc00bf1be7f7539440582b509ce5cc;hpb=d375b3c3ec01c246dbf6f0827c33aafc0953431b;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index 3b1718d3..e685459f 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -23,9 +23,23 @@
 #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"
 
+/**
+ * @file
+ *
+ * Hardware driver handling in libsigrok.
+ */
+
+/**
+ * @defgroup grp_driver Hardware drivers
+ *
+ * Hardware driver handling in libsigrok.
+ *
+ * @{
+ */
 
 /* Driver scanning options. */
 static struct sr_hwcap_option sr_drvopts[] = {
@@ -53,12 +67,25 @@ static struct sr_hwcap_option sr_devopts[] = {
 	{0, 0, NULL, NULL},
 };
 
+/** @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_HW_LASCAR_EL_USB
+extern SR_PRIV struct sr_dev_driver lascar_el_usb_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
@@ -80,26 +107,50 @@ 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
 #ifdef HAVE_HW_FLUKE_DMM
 extern SR_PRIV struct sr_dev_driver flukedmm_driver_info;
 #endif
-#ifdef HAVE_HW_RADIOSHACK_DMM
-extern SR_PRIV struct sr_dev_driver radioshackdmm_driver_info;
+#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;
+extern SR_PRIV struct sr_dev_driver pce_pce_dm32_driver_info;
+extern SR_PRIV struct sr_dev_driver radioshack_22_168_driver_info;
+extern SR_PRIV struct sr_dev_driver radioshack_22_812_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_HW_LASCAR_EL_USB
+	&lascar_el_usb_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
@@ -121,17 +172,28 @@ 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
 #ifdef HAVE_HW_FLUKE_DMM
 	&flukedmm_driver_info,
 #endif
-#ifdef HAVE_HW_RADIOSHACK_DMM
-	&radioshackdmm_driver_info,
+#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,
+	&pce_pce_dm32_driver_info,
+	&radioshack_22_168_driver_info,
+	&radioshack_22_812_driver_info,
+#endif
+#ifdef HAVE_HW_UNI_T_DMM
+	&uni_t_ut61d_driver_info,
+	&voltcraft_vc820_driver_info,
 #endif
 	NULL,
 };
@@ -190,6 +252,7 @@ SR_API GSList *sr_driver_scan(struct sr_dev_driver *driver, GSList *options)
 	return NULL;
 }
 
+/** @private */
 SR_PRIV void sr_hw_cleanup_all(void)
 {
 	int i;
@@ -341,13 +404,17 @@ SR_API const struct sr_hwcap_option *sr_devopt_name_get(const char *optname)
 
 /* Unnecessary level of indirection follows. */
 
+/** @private */
 SR_PRIV int sr_source_remove(int fd)
 {
 	return sr_session_source_remove(fd);
 }
 
+/** @private */
 SR_PRIV int sr_source_add(int fd, int events, int timeout,
 			  sr_receive_data_callback_t cb, void *cb_data)
 {
 	return sr_session_source_add(fd, events, timeout, cb, cb_data);
 }
+
+/** @} */