BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Deprecate SR_DI_VDIVS. 

This is replaced by SR_CONF_VDIV.
This commit is contained in:
Bert Vermeulen 2013-01-25 11:13:49 +01:00
parent 2a7b113d13
commit e4f2b2adc1
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hardware/hantek-dso/api.c
View File

@ -441,9 +441,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
case SR_DI_FILTERS: case SR_DI_FILTERS:
*data = filter_targets; *data = filter_targets;
break; break;
case SR_DI_VDIVS:
*data = vdivs;
break;
/* TODO remove this */ /* TODO remove this */
case SR_CONF_SAMPLERATE: case SR_CONF_SAMPLERATE:
*data = &tmp; *data = &tmp;
@ -586,6 +583,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
*data = coupling; *data = coupling;
break; break;
case SR_CONF_VDIV:
*data = vdivs;
break;
default: default:
return SR_ERR_ARG; return SR_ERR_ARG;
} }

6
hardware/rigol-ds1xx2/api.c
View File

@ -338,9 +338,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
case SR_DI_TRIGGER_SOURCES: case SR_DI_TRIGGER_SOURCES:
*data = trigger_sources; *data = trigger_sources;
break; break;
case SR_DI_VDIVS:
*data = vdivs;
break;
default: default:
return SR_ERR_ARG; return SR_ERR_ARG;
} }
@ -445,6 +442,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
case SR_CONF_COUPLING: case SR_CONF_COUPLING:
*data = coupling; *data = coupling;
break; break;
case SR_CONF_VDIV:
*data = vdivs;
break;
default: default:
return SR_ERR_ARG; return SR_ERR_ARG;
} }

2
libsigrok.h
View File

@ -559,8 +559,6 @@ enum {
SR_DI_TRIGGER_SOURCES, SR_DI_TRIGGER_SOURCES,
/** Supported filter targets. */ /** Supported filter targets. */
SR_DI_FILTERS, SR_DI_FILTERS,
/** Valid volts/div values. */
SR_DI_VDIVS,
}; };
/* /*