X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hwdriver.c;h=33981f6fe12b9b220a6873052176d38f19f4d43b;hb=fc19c288b5ee32618a10f73fda7475b9a5a8ac6d;hp=545fc533f0919789b4f809cb5ae9035bae1604c4;hpb=15cb43d67cee5d7381c9cbcf0a355329a5cabfd1;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index 545fc533..33981f6f 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,6 +67,10 @@ 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
@@ -83,8 +101,28 @@ extern SR_PRIV struct sr_dev_driver hantek_dso_driver_info;
 #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;
+#endif
+#ifdef HAVE_HW_TEKPOWER_DMM
+extern SR_PRIV struct sr_dev_driver tekpower_dmm_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
@@ -114,6 +152,22 @@ static struct sr_dev_driver *drivers_list[] = {
 #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,
+#endif
+#ifdef HAVE_HW_TEKPOWER_DMM
+	&tekpower_dmm_driver_info,
+#endif
+#ifdef HAVE_HW_UNI_T_DMM
+	&uni_t_ut61d_driver_info,
+	&voltcraft_vc820_driver_info,
 #endif
 	NULL,
 };
@@ -172,6 +226,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;
@@ -323,13 +378,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);
 }
+
+/** @} */