Initial Comma-separated values (CSV) input support.

[libsigrok.git] / hwdriver.c

diff --git a/hwdriver.c b/hwdriver.c
index a3eb3b7459450619806f4005007d06eed44b8147..48b91ac9b6cd9700f84ed7fc7d826321c0228d0f 100644 (file)
--- 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",
@@ -83,6 +87,22 @@ 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_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",
+               "Data source", NULL},
        {0, 0, NULL, NULL, NULL},
 };
 
@@ -93,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
@@ -102,6 +126,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
@@ -109,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;
@@ -118,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
@@ -164,20 +203,25 @@ 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;
+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;
 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 */
@@ -189,6 +233,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
@@ -198,6 +246,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
@@ -205,8 +259,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,
@@ -214,9 +268,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
@@ -260,20 +323,25 @@ 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,
+       &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,
        &uni_t_ut61d_driver_info,
        &uni_t_ut61e_driver_info,
        &voltcraft_vc820_driver_info,
+       &voltcraft_vc830_driver_info,
        &voltcraft_vc840_driver_info,
 #endif
        NULL,
@@ -385,7 +453,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;
@@ -398,6 +467,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)
 {