Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*

[libsigrok.git] / hardware / serial-dmm / api.c

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index 944972d96c0f50bc03ae4a05119b979ef8dc621d..b143a358e71499bb86d839ca10dc4e29ba88de37 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -30,16 +30,16 @@
 #include "protocol.h"
 
 static const int hwopts[] = {
-       SR_HWOPT_CONN,
-       SR_HWOPT_SERIALCOMM,
+       SR_CONF_CONN,
+       SR_CONF_SERIALCOMM,
        0,
 };
 
 static const int hwcaps[] = {
-       SR_HWCAP_MULTIMETER,
-       SR_HWCAP_LIMIT_SAMPLES,
-       SR_HWCAP_LIMIT_MSEC,
-       SR_HWCAP_CONTINUOUS,
+       SR_CONF_MULTIMETER,
+       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_LIMIT_MSEC,
+       SR_CONF_CONTINUOUS,
        0,
 };
 
@@ -301,10 +301,10 @@ static GSList *hw_scan(GSList *options, int dmm)
        for (l = options; l; l = l->next) {
                src = l->data;
                switch (src->key) {
-               case SR_HWOPT_CONN:
+               case SR_CONF_CONN:
                        conn = src->value;
                        break;
-               case SR_HWOPT_SERIALCOMM:
+               case SR_CONF_SERIALCOMM:
                        serialcomm = src->value;
                        break;
                }
@@ -406,12 +406,12 @@ static int hw_dev_config_set(const struct sr_dev_inst *sdi, int hwcap,
        }
 
        switch (hwcap) {
-       case SR_HWCAP_LIMIT_SAMPLES:
+       case SR_CONF_LIMIT_SAMPLES:
                devc->limit_samples = *(const uint64_t *)value;
                sr_dbg("Setting sample limit to %" PRIu64 ".",
                       devc->limit_samples);
                break;
-       case SR_HWCAP_LIMIT_MSEC:
+       case SR_CONF_LIMIT_MSEC:
                devc->limit_msec = *(const uint64_t *)value;
                sr_dbg("Setting time limit to %" PRIu64 "ms.",
                       devc->limit_msec);