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

Deprecate SR_DI_TIMEBASES. 

This is replaced by SR_CONF_TIMEBASE.
This commit is contained in:
Bert Vermeulen 2013-01-25 11:22:20 +01:00
parent 6e1fbcc41b
commit 41f5bd09b0
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

@ -432,9 +432,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
case SR_DI_HWCAPS: case SR_DI_HWCAPS:
*data = hwcaps; *data = hwcaps;
break; break;
case SR_DI_TIMEBASES:
*data = timebases;
break;
case SR_DI_TRIGGER_SOURCES: case SR_DI_TRIGGER_SOURCES:
*data = trigger_sources; *data = trigger_sources;
break; break;
@ -586,6 +583,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
case SR_CONF_FILTER: case SR_CONF_FILTER:
*data = filter_targets; *data = filter_targets;
break; break;
case SR_CONF_TIMEBASE:
*data = timebases;
break;
default: default:
return SR_ERR_ARG; return SR_ERR_ARG;
} }

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

@ -332,9 +332,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
case SR_DI_HWCAPS: case SR_DI_HWCAPS:
*data = hwcaps; *data = hwcaps;
break; break;
case SR_DI_TIMEBASES:
*data = timebases;
break;
case SR_DI_TRIGGER_SOURCES: case SR_DI_TRIGGER_SOURCES:
*data = trigger_sources; *data = trigger_sources;
break; break;
@ -445,6 +442,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
case SR_CONF_VDIV: case SR_CONF_VDIV:
*data = vdivs; *data = vdivs;
break; break;
case SR_CONF_TIMEBASE:
*data = timebases;
break;
default: default:
return SR_ERR_ARG; return SR_ERR_ARG;
} }

2
libsigrok.h
View File

@ -553,8 +553,6 @@ enum {
SR_DI_HWCAPS, SR_DI_HWCAPS,
/** Types of logic trigger supported, out of "01crf" (char *). */ /** Types of logic trigger supported, out of "01crf" (char *). */
SR_DI_TRIGGER_TYPES, SR_DI_TRIGGER_TYPES,
/** Supported time bases. */
SR_DI_TIMEBASES,
/** Supported trigger sources. */ /** Supported trigger sources. */
SR_DI_TRIGGER_SOURCES, SR_DI_TRIGGER_SOURCES,
}; };