Rename SR_HWOPT_* and SR_HWCAP_* to SR_CONF_*

[libsigrok.git] / hardware / nexus-osciprime / api.c

diff --git a/hardware/nexus-osciprime/api.c b/hardware/nexus-osciprime/api.c
index 8624b841b987a32baf87e2f229658970b23315bd..dc97b9a720f864a326adc4fb465f202d5d316feb 100644 (file)
--- a/hardware/nexus-osciprime/api.c
+++ b/hardware/nexus-osciprime/api.c
@@ -30,17 +30,17 @@
 #define OSCI_VIDPID "04b4.1004"
 
 static const int hwopts[] = {
-       SR_HWOPT_CONN,
-       SR_HWOPT_SERIALCOMM,
+       SR_CONF_CONN,
+       SR_CONF_SERIALCOMM,
        0,
 };
 
 static const int hwcaps[] = {
-       SR_HWCAP_OSCILLOSCOPE,
-       SR_HWCAP_LIMIT_SAMPLES,
-       SR_HWCAP_CONTINUOUS,
-       SR_HWCAP_TIMEBASE,
-       SR_HWCAP_VDIV,
+       SR_CONF_OSCILLOSCOPE,
+       SR_CONF_LIMIT_SAMPLES,
+       SR_CONF_CONTINUOUS,
+       SR_CONF_TIMEBASE,
+       SR_CONF_VDIV,
        0,
 };
 
@@ -158,7 +158,7 @@ static GSList *hw_scan(GSList *options)
        struct dev_context *devc;
        struct sr_dev_inst *sdi;
        struct sr_usb_dev_inst *usb;
-       struct sr_hwopt *opt;
+       struct sr_config *src;
        struct sr_probe *probe;
        libusb_device *dev;
        GSList *usb_devices, *devices, *l;
@@ -177,10 +177,10 @@ static GSList *hw_scan(GSList *options)
 
        conn = NULL;
        for (l = options; l; l = l->next) {
-               opt = l->data;
-               switch (opt->hwopt) {
-               case SR_HWOPT_CONN:
-                       conn = opt->value;
+               src = l->data;
+               switch (src->key) {
+               case SR_CONF_CONN:
+                       conn = src->value;
                        break;
                }
        }
@@ -268,14 +268,12 @@ static int hw_cleanup(void)
 static int hw_info_get(int info_id, const void **data,
                       const struct sr_dev_inst *sdi)
 {
-
        /* TODO */
        (void)data;
        (void)sdi;
 
        switch (info_id) {
        default:
-               sr_err("Unknown info_id: %d.", info_id);
                return SR_ERR_ARG;
        }