/*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
*
* Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
*
"Pre-trigger capture ratio", NULL},
{SR_CONF_PATTERN_MODE, SR_T_CHAR, "pattern",
"Pattern generator mode", NULL},
+ {SR_CONF_TRIGGER_TYPE, SR_T_CHAR, "triggertype",
+ "Trigger types", NULL},
{SR_CONF_RLE, SR_T_BOOL, "rle",
"Run Length Encoding", NULL},
{SR_CONF_TRIGGER_SLOPE, SR_T_UINT64, "triggerslope",
extern SR_PRIV struct sr_dev_driver radioshack_22_812_driver_info;
extern SR_PRIV struct sr_dev_driver voltcraft_vc820_ser_driver_info;
extern SR_PRIV struct sr_dev_driver voltcraft_vc840_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_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_vc840_driver_info;
#endif
/** @endcond */
&radioshack_22_812_driver_info,
&voltcraft_vc820_ser_driver_info,
&voltcraft_vc840_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_ut61d_driver_info,
+ &uni_t_ut61e_driver_info,
&voltcraft_vc820_driver_info,
+ &voltcraft_vc840_driver_info,
#endif
NULL,
};
if (!driver || !data)
return SR_ERR;
+ if (!driver->config_get)
+ return SR_ERR_ARG;
+
if ((ret = driver->config_get(key, data, sdi)) == SR_OK) {
/* Got a floating reference from the driver. Sink it here,
* caller will need to unref when done with it. */
{
int ret;
- if (!driver || !data || !driver->config_list)
+ if (!driver || !data)
ret = SR_ERR;
+ else if (!driver->config_list)
+ ret = SR_ERR_ARG;
else if ((ret = driver->config_list(key, data, sdi)) == SR_OK)
g_variant_ref_sink(*data);