Deprecate SR_DI_HWOPTS.
This is replaced by SR_CONF_SCAN_OPTIONS.
This commit is contained in:
parent
9a6517d14b
commit
0d485e30c6
|
@ -252,9 +252,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
|
|||
(void)sdi;
|
||||
|
||||
switch (id) {
|
||||
case SR_DI_HWOPTS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
default:
|
||||
return SR_ERR_ARG;
|
||||
}
|
||||
|
@ -305,6 +302,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
|
|||
(void)sdi;
|
||||
|
||||
switch (key) {
|
||||
case SR_CONF_SCAN_OPTIONS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_DEVICE_OPTIONS:
|
||||
*data = hwcaps;
|
||||
break;
|
||||
|
|
|
@ -196,9 +196,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
|
|||
(void)sdi;
|
||||
|
||||
switch (id) {
|
||||
case SR_DI_HWOPTS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
default:
|
||||
return SR_ERR_ARG;
|
||||
}
|
||||
|
@ -249,6 +246,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
|
|||
(void)sdi;
|
||||
|
||||
switch (key) {
|
||||
case SR_CONF_SCAN_OPTIONS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_DEVICE_OPTIONS:
|
||||
*data = hwcaps;
|
||||
break;
|
||||
|
|
|
@ -286,9 +286,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
|
|||
(void)sdi;
|
||||
|
||||
switch (id) {
|
||||
case SR_DI_HWOPTS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
default:
|
||||
return SR_ERR_ARG;
|
||||
}
|
||||
|
@ -339,6 +336,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
|
|||
(void)sdi;
|
||||
|
||||
switch (key) {
|
||||
case SR_CONF_SCAN_OPTIONS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_DEVICE_OPTIONS:
|
||||
*data = hwcaps;
|
||||
break;
|
||||
|
|
|
@ -218,9 +218,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
|
|||
(void)sdi;
|
||||
|
||||
switch (id) {
|
||||
case SR_DI_HWOPTS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
default:
|
||||
return SR_ERR_ARG;
|
||||
}
|
||||
|
@ -264,6 +261,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
|
|||
(void)sdi;
|
||||
|
||||
switch (key) {
|
||||
case SR_CONF_SCAN_OPTIONS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_DEVICE_OPTIONS:
|
||||
*data = hwcaps;
|
||||
break;
|
||||
|
|
|
@ -255,9 +255,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
|
|||
struct dev_context *devc;
|
||||
|
||||
switch (id) {
|
||||
case SR_DI_HWOPTS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_SAMPLERATE:
|
||||
if (sdi) {
|
||||
devc = sdi->priv;
|
||||
|
@ -326,6 +323,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
|
|||
(void)sdi;
|
||||
|
||||
switch (key) {
|
||||
case SR_CONF_SCAN_OPTIONS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_DEVICE_OPTIONS:
|
||||
*data = hwcaps;
|
||||
break;
|
||||
|
|
|
@ -378,9 +378,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
|
|||
(void)sdi;
|
||||
|
||||
switch (id) {
|
||||
case SR_DI_HWOPTS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
default:
|
||||
return SR_ERR_ARG;
|
||||
}
|
||||
|
@ -426,6 +423,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
|
|||
(void)sdi;
|
||||
|
||||
switch (key) {
|
||||
case SR_CONF_SCAN_OPTIONS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_DEVICE_OPTIONS:
|
||||
*data = hwcaps;
|
||||
break;
|
||||
|
|
|
@ -200,9 +200,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
|
|||
(void)sdi;
|
||||
|
||||
switch (id) {
|
||||
case SR_DI_HWOPTS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
default:
|
||||
return SR_ERR_ARG;
|
||||
}
|
||||
|
@ -241,6 +238,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
|
|||
(void)sdi;
|
||||
|
||||
switch (key) {
|
||||
case SR_CONF_SCAN_OPTIONS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_DEVICE_OPTIONS:
|
||||
*data = hwcaps;
|
||||
break;
|
||||
|
|
|
@ -193,9 +193,6 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi)
|
|||
sr_spew("Backend requested info_id %d.", id);
|
||||
|
||||
switch (id) {
|
||||
case SR_DI_HWOPTS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_SAMPLERATE:
|
||||
/* TODO: Get rid of this. */
|
||||
*data = NULL;
|
||||
|
@ -251,6 +248,9 @@ static int config_list(int key, const void **data, const struct sr_dev_inst *sdi
|
|||
(void)sdi;
|
||||
|
||||
switch (key) {
|
||||
case SR_CONF_SCAN_OPTIONS:
|
||||
*data = hwopts;
|
||||
break;
|
||||
case SR_CONF_DEVICE_OPTIONS:
|
||||
*data = hwcaps;
|
||||
break;
|
||||
|
|
11
libsigrok.h
11
libsigrok.h
|
@ -549,17 +549,6 @@ enum {
|
|||
SR_ST_STOPPING,
|
||||
};
|
||||
|
||||
/*
|
||||
* TODO: This sucks, you just kinda have to "know" the returned type.
|
||||
* TODO: Need a DI to return the number of trigger stages supported.
|
||||
*/
|
||||
|
||||
/** Device info IDs. */
|
||||
enum {
|
||||
/** A list of options supported by the driver. */
|
||||
SR_DI_HWOPTS = 10000,
|
||||
};
|
||||
|
||||
/*
|
||||
* A device supports either a range of samplerates with steps of a given
|
||||
* granularity, or is limited to a set of defined samplerates. Use either
|
||||
|
|
Loading…
Reference in New Issue