rigol-ds1xx2: Cosmetics, whitespace.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index 33d716da552c1debb92a1d3a3f583504e489afb9..2640ba9720b98e9a8b338fd000ad9423c45beda0 100644 (file)
--- 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[] = {
@@ -54,12 +68,30 @@ 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_HW_LASCAR_EL_USB
+extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
+#endif
+#ifdef HAVE_HW_NEXUS_OSCIPRIME
+extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
+#endif
 #ifdef HAVE_LA_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
+#ifdef HAVE_HW_RIGOL_DS1XX2
+extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_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
@@ -72,7 +104,7 @@ extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info;
 #ifdef HAVE_LA_LINK_MSO19
 extern SR_PRIV struct sr_dev_driver link_mso19_driver_info;
 #endif
-#ifdef HAVE_LA_ALSA
+#ifdef HAVE_HW_ALSA
 extern SR_PRIV struct sr_dev_driver alsa_driver_info;
 #endif
 #ifdef HAVE_LA_FX2LAFW
@@ -81,27 +113,59 @@ 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;
+extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut61e_ser_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_HW_NEXUS_OSCIPRIME
+       &nexus_osciprime_driver_info,
+#endif
 #ifdef HAVE_LA_OLS
        &ols_driver_info,
 #endif
+#ifdef HAVE_HW_RIGOL_DS1XX2
+       &rigol_ds1xx2_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
@@ -114,7 +178,7 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_LA_LINK_MSO19
        &link_mso19_driver_info,
 #endif
-#ifdef HAVE_LA_ALSA
+#ifdef HAVE_HW_ALSA
        &alsa_driver_info,
 #endif
 #ifdef HAVE_LA_FX2LAFW
@@ -123,17 +187,31 @@ 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,
+       &voltcraft_vc820_ser_driver_info,
+       &voltcraft_vc840_ser_driver_info,
+       &uni_t_ut61e_ser_driver_info,
+#endif
+#ifdef HAVE_HW_UNI_T_DMM
+       &uni_t_ut61d_driver_info,
+       &voltcraft_vc820_driver_info,
 #endif
        NULL,
 };
@@ -152,15 +230,17 @@ SR_API struct sr_dev_driver **sr_driver_list(void)
 /**
  * Initialize a hardware driver.
  *
+ * @param ctx A libsigrok context object allocated by a previous call to
+ *             sr_init().
  * @param driver The driver to initialize.
  *
  * @return SR_OK if all went well, or an error code otherwise.
  */
-SR_API int sr_driver_init(struct sr_dev_driver *driver)
+SR_API int sr_driver_init(struct sr_context *ctx, struct sr_dev_driver *driver)
 {
 
        if (driver->init)
-               return driver->init();
+               return driver->init(ctx);
 
        return SR_OK;
 }
@@ -356,3 +436,5 @@ SR_PRIV int sr_source_add(int fd, int events, int timeout,
 {
        return sr_session_source_add(fd, events, timeout, cb, cb_data);
 }
+
+/** @} */