X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=8b23aea388eff40935fb853fb3fa5b0bac557e86;hb=c51bbdec345b0d7e1c9013e0a1bea2586cf6daa7;hp=6cb1431d78bef3deb859d91fa7656676fe693d93;hpb=16e76baec9b1df806e46d4da61269375924ab950;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index 6cb1431d..8b23aea3 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -83,6 +83,20 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Coupling", NULL},
 	{SR_CONF_DATALOG, SR_T_BOOL, "datalog",
 		"Datalog", NULL},
+	{SR_CONF_SPL_WEIGHT_FREQ, SR_T_CHAR, "spl_weight_freq",
+		"Sound pressure level frequency weighting", NULL},
+	{SR_CONF_SPL_WEIGHT_TIME, SR_T_CHAR, "spl_weight_time",
+		"Sound pressure level time weighting", NULL},
+	{SR_CONF_HOLD_MAX, SR_T_BOOL, "hold_max",
+		"Hold max", NULL},
+	{SR_CONF_HOLD_MIN, SR_T_BOOL, "hold_min",
+		"Hold min", NULL},
+	{SR_CONF_SPL_MEASUREMENT_RANGE, SR_T_UINT64_RANGE, "spl_meas_range",
+		"Sound pressure level measurement range", NULL},
+	{SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
+		"Power off", NULL},
+	{SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source",
+		"Data source", NULL},
 	{0, 0, NULL, NULL, NULL},
 };
 
@@ -90,6 +104,9 @@ static struct sr_config_info sr_config_info_data[] = {
 #ifdef HAVE_HW_BRYMEN_DMM
 extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
 #endif
+#ifdef HAVE_HW_CEM_DT_885X
+extern SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
+#endif
 #ifdef HAVE_HW_COLEAD_SLM
 extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 #endif
@@ -99,6 +116,12 @@ extern SR_PRIV struct sr_dev_driver demo_driver_info;
 #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
 extern SR_PRIV struct sr_dev_driver ikalogic_scanalogic2_driver_info;
 #endif
+#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
+extern SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info;
+#endif
+#ifdef HAVE_HW_KECHENG_KC_330B
+extern SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info;
+#endif
 #ifdef HAVE_HW_LASCAR_EL_USB
 extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 #endif
@@ -106,9 +129,6 @@ extern SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info;
 extern SR_PRIV struct sr_dev_driver mic_98581_driver_info;
 extern SR_PRIV struct sr_dev_driver mic_98583_driver_info;
 #endif
-#ifdef HAVE_HW_NEXUS_OSCIPRIME
-extern SR_PRIV struct sr_dev_driver nexus_osciprime_driver_info;
-#endif
 #ifdef HAVE_HW_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #endif
@@ -161,19 +181,24 @@ 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_805_driver_info;
 extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
-extern SR_PRIV struct sr_dev_driver tecpel_dmm_8060_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_m3650d_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_vc830_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc840_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut60a_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut60e_ser_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_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 tecpel_dmm_8060_driver_info;
 extern SR_PRIV struct sr_dev_driver tecpel_dmm_8061_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut60a_driver_info;
+extern SR_PRIV struct sr_dev_driver uni_t_ut60e_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61d_driver_info;
 extern SR_PRIV struct sr_dev_driver uni_t_ut61e_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc820_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_vc830_driver_info;
 extern SR_PRIV struct sr_dev_driver voltcraft_vc840_driver_info;
 #endif
 /** @endcond */
@@ -182,6 +207,9 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_BRYMEN_DMM
 	&brymen_bm857_driver_info,
 #endif
+#ifdef HAVE_HW_CEM_DT_885X
+	&cem_dt_885x_driver_info,
+#endif
 #ifdef HAVE_HW_COLEAD_SLM
 	&colead_slm_driver_info,
 #endif
@@ -191,6 +219,12 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_IKALOGIC_SCANALOGIC2
 	&ikalogic_scanalogic2_driver_info,
 #endif
+#ifdef HAVE_HW_IKALOGIC_SCANAPLUS
+	&ikalogic_scanaplus_driver_info,
+#endif
+#ifdef HAVE_HW_KECHENG_KC_330B
+	&kecheng_kc_330b_driver_info,
+#endif
 #ifdef HAVE_HW_LASCAR_EL_USB
 	&lascar_el_usb_driver_info,
 #endif
@@ -198,9 +232,6 @@ static struct sr_dev_driver *drivers_list[] = {
 	&mic_98581_driver_info,
 	&mic_98583_driver_info,
 #endif
-#ifdef HAVE_HW_NEXUS_OSCIPRIME
-	&nexus_osciprime_driver_info,
-#endif
 #ifdef HAVE_HW_OLS
 	&ols_driver_info,
 #endif
@@ -253,19 +284,24 @@ static struct sr_dev_driver *drivers_list[] = {
 	&radioshack_22_168_driver_info,
 	&radioshack_22_805_driver_info,
 	&radioshack_22_812_driver_info,
-	&tecpel_dmm_8060_ser_driver_info,
 	&tecpel_dmm_8061_ser_driver_info,
+	&voltcraft_m3650d_driver_info,
 	&voltcraft_vc820_ser_driver_info,
+	&voltcraft_vc830_ser_driver_info,
 	&voltcraft_vc840_ser_driver_info,
+	&uni_t_ut60a_ser_driver_info,
+	&uni_t_ut60e_ser_driver_info,
 	&uni_t_ut61d_ser_driver_info,
 	&uni_t_ut61e_ser_driver_info,
 #endif
 #ifdef HAVE_HW_UNI_T_DMM
-	&tecpel_dmm_8060_driver_info,
 	&tecpel_dmm_8061_driver_info,
+	&uni_t_ut60a_driver_info,
+	&uni_t_ut60e_driver_info,
 	&uni_t_ut61d_driver_info,
 	&uni_t_ut61e_driver_info,
 	&voltcraft_vc820_driver_info,
+	&voltcraft_vc830_driver_info,
 	&voltcraft_vc840_driver_info,
 #endif
 	NULL,