X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=2640ba9720b98e9a8b338fd000ad9423c45beda0;hb=29d957ceae3bd9ac5b72cd0e58a5910932bd1768;hp=fdb965854811bf28b245315e4c6f94ca66598d01;hpb=aa2af32432b3410421a89303ef48cc990ff39db9;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index fdb96585..2640ba97 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -74,9 +74,18 @@ extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 #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
@@ -95,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
@@ -104,20 +113,27 @@ 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;
-#endif
-#ifdef HAVE_HW_TEKPOWER_DMM
-extern SR_PRIV struct sr_dev_driver tekpower_dmm_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;
@@ -132,9 +148,18 @@ static struct sr_dev_driver *drivers_list[] = {
 #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
@@ -153,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
@@ -162,20 +187,27 @@ 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,
-#endif
-#ifdef HAVE_HW_TEKPOWER_DMM
-	&tekpower_dmm_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,
@@ -198,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;
 }