X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=50615f55b56f596f3b91b0a5af72f5f5c38a5086;hb=568dcacc1a43f5bfb5a103e6e9b6a5ad50ea2d08;hp=fd8dc49d174515f0470dac69703ddd841b9f6110;hpb=26aec7fdc4c5d1f3e7ec6c373b16b6605b4a6e38;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index fd8dc49d..50615f55 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", @@ -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}, }; @@ -90,12 +110,28 @@ 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_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 -#ifdef HAVE_LA_DEMO +#ifdef HAVE_HW_DEMO extern SR_PRIV struct sr_dev_driver demo_driver_info; #endif +#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 @@ -103,31 +139,40 @@ 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_LA_OLS +#ifdef HAVE_HW_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_SALEAE_LOGIC16 +extern SR_PRIV struct sr_dev_driver saleae_logic16_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 -#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE +#ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE extern SR_PRIV struct sr_dev_driver zeroplus_logic_cube_driver_info; #endif -#ifdef HAVE_LA_ASIX_SIGMA +#ifdef HAVE_HW_ASIX_SIGMA extern SR_PRIV struct sr_dev_driver asix_sigma_driver_info; #endif -#ifdef HAVE_LA_CHRONOVU_LA8 +#ifdef HAVE_HW_CHRONOVU_LA8 extern SR_PRIV struct sr_dev_driver chronovu_la8_driver_info; #endif +#ifdef HAVE_HW_LINK_MSO19 +extern SR_PRIV struct sr_dev_driver link_mso19_driver_info; +#endif #ifdef HAVE_HW_ALSA extern SR_PRIV struct sr_dev_driver alsa_driver_info; #endif -#ifdef HAVE_LA_FX2LAFW +#ifdef HAVE_HW_FX2LAFW extern SR_PRIV struct sr_dev_driver fx2lafw_driver_info; #endif #ifdef HAVE_HW_HANTEK_DSO @@ -152,19 +197,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 */ @@ -173,12 +224,28 @@ 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_CENTER_3XX + ¢er_309_driver_info, + &voltcraft_k204_driver_info, +#endif #ifdef HAVE_HW_COLEAD_SLM &colead_slm_driver_info, #endif -#ifdef HAVE_LA_DEMO +#ifdef HAVE_HW_DEMO &demo_driver_info, #endif +#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 @@ -186,31 +253,40 @@ static struct sr_dev_driver *drivers_list[] = { &mic_98581_driver_info, &mic_98583_driver_info, #endif -#ifdef HAVE_LA_OLS +#ifdef HAVE_HW_OLS &ols_driver_info, #endif #ifdef HAVE_HW_RIGOL_DS1XX2 &rigol_ds1xx2_driver_info, #endif +#ifdef HAVE_HW_SALEAE_LOGIC16 + &saleae_logic16_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 -#ifdef HAVE_LA_ZEROPLUS_LOGIC_CUBE +#ifdef HAVE_HW_ZEROPLUS_LOGIC_CUBE &zeroplus_logic_cube_driver_info, #endif -#ifdef HAVE_LA_ASIX_SIGMA +#ifdef HAVE_HW_ASIX_SIGMA &asix_sigma_driver_info, #endif -#ifdef HAVE_LA_CHRONOVU_LA8 +#ifdef HAVE_HW_CHRONOVU_LA8 &chronovu_la8_driver_info, #endif +#ifdef HAVE_HW_LINK_MSO19 + &link_mso19_driver_info, +#endif #ifdef HAVE_HW_ALSA &alsa_driver_info, #endif -#ifdef HAVE_LA_FX2LAFW +#ifdef HAVE_HW_FX2LAFW &fx2lafw_driver_info, #endif #ifdef HAVE_HW_HANTEK_DSO @@ -235,19 +311,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, @@ -359,7 +441,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; @@ -372,6 +455,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) {