X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=ff28465111d7af6fd6561b8d7d3b01f173594a75;hb=6c114fa626e00a39d27288132d8ac234a559fe9e;hp=f092b3142e7c17252b361a29a30424c7b667a0d3;hpb=ed759a08351394a060ad9352bf2617d41bdeea28;p=libsigrok.git

diff --git a/hwdriver.c b/hwdriver.c
index f092b314..ff284651 100644
--- a/hwdriver.c
+++ b/hwdriver.c
@@ -63,6 +63,10 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Pattern generator mode", NULL},
 	{SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
 		"Trigger types", NULL},
+	{SR_CONF_EXTERNAL_CLOCK, SR_T_BOOL, "external_clock",
+		"External clock mode", NULL},
+	{SR_CONF_SWAP, SR_T_BOOL, "swap",
+		"Swap channel order", NULL},
 	{SR_CONF_RLE, SR_T_BOOL, "rle",
 		"Run Length Encoding", NULL},
 	{SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
@@ -93,6 +97,8 @@ static struct sr_config_info sr_config_info_data[] = {
 		"Hold min", NULL},
 	{SR_CONF_SPL_MEASUREMENT_RANGE, SR_T_UINT64_RANGE, "spl_meas_range",
 		"Sound pressure level measurement range", NULL},
+	{SR_CONF_VOLTAGE_THRESHOLD, SR_T_DOUBLE_RANGE, "voltage_threshold",
+		"Voltage threshold", NULL },
 	{SR_CONF_POWER_OFF, SR_T_BOOL, "power_off",
 		"Power off", NULL},
 	{SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source",
@@ -107,6 +113,10 @@ extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info;
 #ifdef HAVE_HW_CEM_DT_885X
 extern SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info;
 #endif
+#ifdef HAVE_HW_CENTER_3XX
+extern SR_PRIV struct sr_dev_driver center_309_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_k204_driver_info;
+#endif
 #ifdef HAVE_HW_COLEAD_SLM
 extern SR_PRIV struct sr_dev_driver colead_slm_driver_info;
 #endif
@@ -118,6 +128,7 @@ 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
@@ -128,8 +139,8 @@ 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;
+#ifdef HAVE_HW_NORMA_DMM
+extern SR_PRIV struct sr_dev_driver norma_dmm_driver_info;
 #endif
 #ifdef HAVE_HW_OLS
 extern SR_PRIV struct sr_dev_driver ols_driver_info;
@@ -137,9 +148,18 @@ extern SR_PRIV struct sr_dev_driver ols_driver_info;
 #ifdef HAVE_HW_RIGOL_DS1XX2
 extern SR_PRIV struct sr_dev_driver rigol_ds1xx2_driver_info;
 #endif
+#ifdef HAVE_HW_SALEAE_LOGIC16
+extern SR_PRIV struct sr_dev_driver saleae_logic16_driver_info;
+#endif
+#ifdef HAVE_HW_TELEINFO
+extern SR_PRIV struct sr_dev_driver teleinfo_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_UNI_T_UT32X
+extern SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info;
+#endif
 #ifdef HAVE_HW_VICTOR_DMM
 extern SR_PRIV struct sr_dev_driver victor_dmm_driver_info;
 #endif
@@ -178,14 +198,15 @@ 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 metex_m4650cr_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_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_m4650cr_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;
@@ -193,9 +214,9 @@ 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;
+extern SR_PRIV struct sr_dev_driver iso_tech_idm103n_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;
@@ -214,6 +235,10 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_CEM_DT_885X
 	&cem_dt_885x_driver_info,
 #endif
+#ifdef HAVE_HW_CENTER_3XX
+	&center_309_driver_info,
+	&voltcraft_k204_driver_info,
+#endif
 #ifdef HAVE_HW_COLEAD_SLM
 	&colead_slm_driver_info,
 #endif
@@ -225,6 +250,7 @@ static struct sr_dev_driver *drivers_list[] = {
 #endif
 #ifdef HAVE_HW_IKALOGIC_SCANAPLUS
 	&ikalogic_scanaplus_driver_info,
+#endif
 #ifdef HAVE_HW_KECHENG_KC_330B
 	&kecheng_kc_330b_driver_info,
 #endif
@@ -235,8 +261,8 @@ 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,
+#ifdef HAVE_HW_NORMA_DMM
+	&norma_dmm_driver_info,
 #endif
 #ifdef HAVE_HW_OLS
 	&ols_driver_info,
@@ -244,9 +270,18 @@ static struct sr_dev_driver *drivers_list[] = {
 #ifdef HAVE_HW_RIGOL_DS1XX2
 	&rigol_ds1xx2_driver_info,
 #endif
+#ifdef HAVE_HW_SALEAE_LOGIC16
+	&saleae_logic16_driver_info,
+#endif
+#ifdef HAVE_HW_TELEINFO
+	&teleinfo_driver_info,
+#endif
 #ifdef HAVE_HW_TONDAJ_SL_814
 	&tondaj_sl_814_driver_info,
 #endif
+#ifdef HAVE_HW_UNI_T_UT32X
+	&uni_t_ut32x_driver_info,
+#endif
 #ifdef HAVE_HW_VICTOR_DMM
 	&victor_dmm_driver_info,
 #endif
@@ -285,14 +320,15 @@ static struct sr_dev_driver *drivers_list[] = {
 	&mastech_mas345_driver_info,
 	&va_va18b_driver_info,
 	&metex_m3640d_driver_info,
+	&metex_m4650cr_driver_info,
 	&peaktech_4370_driver_info,
 	&pce_pce_dm32_driver_info,
 	&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_m4650cr_driver_info,
 	&voltcraft_vc820_ser_driver_info,
 	&voltcraft_vc830_ser_driver_info,
 	&voltcraft_vc840_ser_driver_info,
@@ -300,9 +336,9 @@ static struct sr_dev_driver *drivers_list[] = {
 	&uni_t_ut60e_ser_driver_info,
 	&uni_t_ut61d_ser_driver_info,
 	&uni_t_ut61e_ser_driver_info,
+	&iso_tech_idm103n_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,
@@ -421,7 +457,8 @@ SR_PRIV void sr_hw_cleanup_all(void)
 	}
 }
 
-/** A floating reference can be passed in for data. */
+/** A floating reference can be passed in for data.
+ * @private */
 SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
 {
 	struct sr_config *src;
@@ -434,6 +471,7 @@ SR_PRIV struct sr_config *sr_config_new(int key, GVariant *data)
 	return src;
 }
 
+/** @private */
 SR_PRIV void sr_config_free(struct sr_config *src)
 {