Deprecate SR_DI_HWOPTS.

This is replaced by SR_CONF_SCAN_OPTIONS.

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 5f961018f70a5615b38b28a80d36ffff86c7fc2e..227cbfcf3e9251dbd066521658c13c23e8ba6b5f 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -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;

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 8fed762a7d2e2badb49a515651f3f5252980e338..819e1397873a8d481b4c2866c4d24eb4b6b22447 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -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;

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index dd9e7178ff738133f2cf44e43e066ff3025706ab..8980f25e468b66f9ce68b23ec9ce5b997e217e4b 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -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;

diff --git a/hardware/lascar-el-usb/api.c b/hardware/lascar-el-usb/api.c
index c9ccbfda1a967d9054b1bc05d8b659629000d809..8ebb4ca0d4a3a6ba75aa420e2f31902ce0142e62 100644 (file)
--- a/hardware/lascar-el-usb/api.c
+++ b/hardware/lascar-el-usb/api.c
@@ -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;

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index 634a2a570344f84f307f5a8c467a1522b9fc86fa..52b9d975615ef746303093e3cb4a087bfa989da7 100644 (file)
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -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;

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 7ca807c4238f97aef1e504a9056da4b651dec496..69dd3a3e202161a5a089754e36f2a8d18f830f41 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -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;

diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c
index 7f6066310147d04eea938ff69533422202dac9f0..47c2e67fecb8e8ebb4fffe1d06736685b81157de 100644 (file)
--- a/hardware/tondaj-sl-814/api.c
+++ b/hardware/tondaj-sl-814/api.c
@@ -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;

diff --git a/hardware/uni-t-dmm/api.c b/hardware/uni-t-dmm/api.c
index 7511283823b145c95f3af1aca47ca5e520dc96a5..7ac433339e6276fb00afecb5966f983f74b252b2 100644 (file)
--- a/hardware/uni-t-dmm/api.c
+++ b/hardware/uni-t-dmm/api.c
@@ -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;

diff --git a/libsigrok.h b/libsigrok.h
index 2b17a5f61ecf70710590eaef210525a6d96c510b..cfa6613ed428166dda903e54b9b1cfbf0652c5c0 100644 (file)
--- a/libsigrok.h
+++ b/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