X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hwdriver.c;h=37edf415a554a8ffb83b08a2d099ecfa48d444cb;hb=ab988ecb237c6aa8510eaa4a53e4e3d1ba78fd9b;hp=a94acc9ec9f89ae79caf73859e6f6a5e9dd6ed6b;hpb=5e7a8e57d4c042b4a4673e9f9cef19306a8b861b;p=libsigrok.git diff --git a/hwdriver.c b/hwdriver.c index a94acc9e..37edf415 100644 --- a/hwdriver.c +++ b/hwdriver.c @@ -27,14 +27,7 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -/* Message logging helpers with subsystem-specific prefix string. */ -#define LOG_PREFIX "hwdriver: " -#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args) -#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args) -#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args) -#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args) -#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args) -#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args) +#define LOG_PREFIX "hwdriver" /** * @file @@ -103,6 +96,28 @@ static struct sr_config_info sr_config_info_data[] = { "Power off", NULL}, {SR_CONF_DATA_SOURCE, SR_T_CHAR, "data_source", "Data source", NULL}, + {SR_CONF_NUM_LOGIC_PROBES, SR_T_INT32, "logic_probes", + "Number of logic probes", NULL}, + {SR_CONF_NUM_ANALOG_PROBES, SR_T_INT32, "analog_probes", + "Number of analog probes", NULL}, + {SR_CONF_MAX_UNCOMPRESSED_SAMPLES, SR_T_UINT64, "max_uncompressed_samples", + "Maximum number of uncompressed samples", NULL}, + {SR_CONF_OUTPUT_VOLTAGE, SR_T_FLOAT, "output_voltage", + "Current output voltage", NULL}, + {SR_CONF_OUTPUT_VOLTAGE_MAX, SR_T_FLOAT, "output_voltage_max", + "Maximum output voltage", NULL}, + {SR_CONF_OUTPUT_CURRENT, SR_T_FLOAT, "output_current", + "Current output current", NULL}, + {SR_CONF_OUTPUT_CURRENT_MAX, SR_T_FLOAT, "output_current_max", + "Maximum output current", NULL}, + {SR_CONF_OUTPUT_ENABLED, SR_T_BOOL, "output_enabled", + "Output enabled", NULL}, + {SR_CONF_OUTPUT_CHANNEL, SR_T_CHAR, "output_channel", + "Output channel modes", NULL}, + {SR_CONF_OVER_VOLTAGE_PROTECTION, SR_T_BOOL, "ovp", + "Over-voltage protection", NULL}, + {SR_CONF_OVER_CURRENT_PROTECTION, SR_T_BOOL, "ocp", + "Over-current protection", NULL}, {0, 0, NULL, NULL, NULL}, }; @@ -110,6 +125,9 @@ static struct sr_config_info sr_config_info_data[] = { #ifdef HAVE_HW_APPA_55II extern SR_PRIV struct sr_dev_driver appa_55ii_driver_info; #endif +#ifdef HAVE_HW_ATTEN_PPS3XXX +extern SR_PRIV struct sr_dev_driver atten_pps3203_driver_info; +#endif #ifdef HAVE_HW_BRYMEN_DMM extern SR_PRIV struct sr_dev_driver brymen_bm857_driver_info; #endif @@ -207,6 +225,7 @@ 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 va_va40b_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; @@ -222,20 +241,29 @@ 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_ut60g_ser_driver_info; +extern SR_PRIV struct sr_dev_driver uni_t_ut61b_ser_driver_info; +extern SR_PRIV struct sr_dev_driver uni_t_ut61c_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; +extern SR_PRIV struct sr_dev_driver tenma_72_7745_ser_driver_info; +extern SR_PRIV struct sr_dev_driver tenma_72_7750_ser_driver_info; #endif #ifdef HAVE_HW_UNI_T_DMM 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_ut60g_driver_info; +extern SR_PRIV struct sr_dev_driver uni_t_ut61b_driver_info; +extern SR_PRIV struct sr_dev_driver uni_t_ut61c_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; extern SR_PRIV struct sr_dev_driver tenma_72_7745_driver_info; +extern SR_PRIV struct sr_dev_driver tenma_72_7750_driver_info; #endif /** @endcond */ @@ -243,6 +271,9 @@ static struct sr_dev_driver *drivers_list[] = { #ifdef HAVE_HW_APPA_55II &appa_55ii_driver_info, #endif +#ifdef HAVE_HW_ATTEN_PPS3XXX + &atten_pps3203_driver_info, +#endif #ifdef HAVE_HW_BRYMEN_DMM &brymen_bm857_driver_info, #endif @@ -340,6 +371,7 @@ static struct sr_dev_driver *drivers_list[] = { &peaktech_3410_driver_info, &mastech_mas345_driver_info, &va_va18b_driver_info, + &va_va40b_driver_info, &metex_m3640d_driver_info, &metex_m4650cr_driver_info, &peaktech_4370_driver_info, @@ -355,20 +387,29 @@ static struct sr_dev_driver *drivers_list[] = { &voltcraft_vc840_ser_driver_info, &uni_t_ut60a_ser_driver_info, &uni_t_ut60e_ser_driver_info, + &uni_t_ut60g_ser_driver_info, + &uni_t_ut61b_ser_driver_info, + &uni_t_ut61c_ser_driver_info, &uni_t_ut61d_ser_driver_info, &uni_t_ut61e_ser_driver_info, &iso_tech_idm103n_driver_info, + &tenma_72_7745_ser_driver_info, + &tenma_72_7750_ser_driver_info, #endif #ifdef HAVE_HW_UNI_T_DMM &tecpel_dmm_8061_driver_info, &uni_t_ut60a_driver_info, &uni_t_ut60e_driver_info, + &uni_t_ut60g_driver_info, + &uni_t_ut61b_driver_info, + &uni_t_ut61c_driver_info, &uni_t_ut61d_driver_info, &uni_t_ut61e_driver_info, &voltcraft_vc820_driver_info, &voltcraft_vc830_driver_info, &voltcraft_vc840_driver_info, &tenma_72_7745_driver_info, + &tenma_72_7750_driver_info, #endif NULL, };