"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_NUM_LOGIC_CHANNELS, SR_T_INT32, "logic_channels",
+ "Number of logic channels", NULL},
+ {SR_CONF_NUM_ANALOG_CHANNELS, SR_T_INT32, "analog_channels",
+ "Number of analog channels", 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",
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_8061_ser_driver_info;
+extern SR_PRIV struct sr_dev_driver voltcraft_m3650cr_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_me42_driver_info;
#endif
#ifdef HAVE_HW_GMC_MH_1X_2X
&gmc_mh_1x_2x_rs232_driver_info,
- &gmc_mh_2x_bd232_driver_info,
+ &gmc_mh_2x_bd232_driver_info,
#endif
#ifdef HAVE_HW_HAMEG_HMO
&hameg_hmo_driver_info,
&radioshack_22_805_driver_info,
&radioshack_22_812_driver_info,
&tecpel_dmm_8061_ser_driver_info,
+ &voltcraft_m3650cr_driver_info,
&voltcraft_m3650d_driver_info,
&voltcraft_m4650cr_driver_info,
&voltcraft_me42_driver_info,
* @param[in] sdi (optional) If the key is specific to a device, this must
* contain a pointer to the struct sr_dev_inst to be checked.
* Otherwise it must be NULL.
- * @param[in] probe_group The probe group on the device for which to list the
+ * @param[in] cg The channel group on the device for which to list the
* values, or NULL.
* @param[in] key The configuration key (SR_CONF_*).
* @param[in,out] data Pointer to a GVariant where the value will be stored.
*/
SR_API int sr_config_get(const struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group,
+ const struct sr_channel_group *cg,
int key, GVariant **data)
{
int ret;
if (!driver->config_get)
return SR_ERR_ARG;
- if ((ret = driver->config_get(key, data, sdi, probe_group)) == SR_OK) {
+ if ((ret = driver->config_get(key, data, sdi, cg)) == SR_OK) {
/* Got a floating reference from the driver. Sink it here,
* caller will need to unref when done with it. */
g_variant_ref_sink(*data);
* Set value of a configuration key in a device instance.
*
* @param[in] sdi The device instance.
- * @param[in] probe_group The probe group on the device for which to list the
+ * @param[in] cg The channel group on the device for which to list the
* values, or NULL.
* @param[in] key The configuration key (SR_CONF_*).
* @param data The new value for the key, as a GVariant with GVariantType
* that it's not applicable.
*/
SR_API int sr_config_set(const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group,
+ const struct sr_channel_group *cg,
int key, GVariant *data)
{
int ret;
else if (!sdi->driver->config_set)
ret = SR_ERR_ARG;
else
- ret = sdi->driver->config_set(key, data, sdi, probe_group);
+ ret = sdi->driver->config_set(key, data, sdi, cg);
g_variant_unref(data);
* @param[in] driver The sr_dev_driver struct to query.
* @param[in] sdi (optional) If the key is specific to a device, this must
* contain a pointer to the struct sr_dev_inst to be checked.
- * @param[in] probe_group The probe group on the device for which to list the
+ * @param[in] cg The channel group on the device for which to list the
* values, or NULL.
* @param[in] key The configuration key (SR_CONF_*).
* @param[in,out] data A pointer to a GVariant where the list will be stored.
*/
SR_API int sr_config_list(const struct sr_dev_driver *driver,
const struct sr_dev_inst *sdi,
- const struct sr_probe_group *probe_group,
+ const struct sr_channel_group *cg,
int key, GVariant **data)
{
int ret;
ret = SR_ERR;
else if (!driver->config_list)
ret = SR_ERR_ARG;
- else if ((ret = driver->config_list(key, data, sdi, probe_group)) == SR_OK)
+ else if ((ret = driver->config_list(key, data, sdi, cg)) == SR_OK)
g_variant_ref_sink(*data);
return ret;