drivers: Consistently use the exact driver name as LOG_PREFIX.

[libsigrok.git] / src / hardware / hung-chang-dso-2100 / api.c

diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index a3aee05f18458eb401f8983b3d5699a233d487e4..f7515d7432018abd8df46427772e539710fe4869 100644 (file)
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -39,7 +39,7 @@ static const uint32_t devopts[] = {
        SR_CONF_BUFFERSIZE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
 };
 
-static const uint32_t cgopts[] = {
+static const uint32_t devopts_cg[] = {
        SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
        SR_CONF_PROBE_FACTOR | SR_CONF_GET | SR_CONF_SET,
@@ -358,8 +358,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                *data = g_variant_new_uint64(samplerates[devc->rate]);
                break;
        case SR_CONF_TRIGGER_SOURCE:
-               i = reverse_map(devc->cctl[0] & 0xC0, trigger_sources_map,
-                               ARRAY_SIZE(trigger_sources_map));
+               i = reverse_map(devc->cctl[0] & 0xC0, ARRAY_AND_SIZE(trigger_sources_map));
                if (i == -1)
                        return SR_ERR;
                else
@@ -378,8 +377,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                if (ch == -1) {
                        return SR_ERR_CHANNEL_GROUP;
                } else {
-                       i = reverse_map(devc->cctl[ch] & 0x33, vdivs_map,
-                                       ARRAY_SIZE(vdivs_map));
+                       i = reverse_map(devc->cctl[ch] & 0x33, ARRAY_AND_SIZE(vdivs_map));
                        if (i == -1)
                                return SR_ERR;
                        else
@@ -391,8 +389,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                if (ch == -1) {
                        return SR_ERR_CHANNEL_GROUP;
                } else {
-                       i = reverse_map(devc->cctl[ch] & 0x0C, coupling_map,
-                                       ARRAY_SIZE(coupling_map));
+                       i = reverse_map(devc->cctl[ch] & 0x0C, ARRAY_AND_SIZE(coupling_map));
                        if (i == -1)
                                return SR_ERR;
                        else
@@ -428,7 +425,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                break;
        case SR_CONF_SAMPLERATE:
                i = find_in_array(data, G_VARIANT_TYPE_UINT64,
-                                 samplerates, ARRAY_SIZE(samplerates));
+                                 ARRAY_AND_SIZE(samplerates));
                if (i == -1)
                        return SR_ERR_ARG;
                else
@@ -436,7 +433,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                break;
        case SR_CONF_TRIGGER_SOURCE:
                i = find_in_array(data, G_VARIANT_TYPE_STRING,
-                                 trigger_sources, ARRAY_SIZE(trigger_sources));
+                                 ARRAY_AND_SIZE(trigger_sources));
                if (i == -1)
                        return SR_ERR_ARG;
                else
@@ -445,7 +442,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                break;
        case SR_CONF_TRIGGER_SLOPE:
                i = find_in_array(data, G_VARIANT_TYPE_STRING,
-                                 trigger_slopes, ARRAY_SIZE(trigger_slopes));
+                                 ARRAY_AND_SIZE(trigger_slopes));
                if (i == -1)
                        return SR_ERR_ARG;
                else
@@ -453,7 +450,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                break;
        case SR_CONF_BUFFERSIZE:
                i = find_in_array(data, G_VARIANT_TYPE_UINT64,
-                                 buffersizes, ARRAY_SIZE(buffersizes));
+                                 ARRAY_AND_SIZE(buffersizes));
                if (i == -1)
                        return SR_ERR_ARG;
                else
@@ -481,7 +478,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
                        return SR_ERR_CHANNEL_GROUP;
                } else {
                        i = find_in_array(data, G_VARIANT_TYPE_STRING,
-                                         coupling, ARRAY_SIZE(coupling));
+                                         ARRAY_AND_SIZE(coupling));
                        if (i == -1)
                                return SR_ERR_ARG;
                        else
@@ -559,13 +556,10 @@ static int config_commit(const struct sr_dev_inst *sdi)
 static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,
                const struct sr_channel_group *cg)
 {
-       GVariantBuilder gvb;
-       GVariant *gvar, *rational[2];
        GSList *l;
-       int i;
 
        switch (key) {
-               case SR_CONF_SCAN_OPTIONS:
+       case SR_CONF_SCAN_OPTIONS:
        case SR_CONF_DEVICE_OPTIONS:
                break;
        case SR_CONF_SAMPLERATE:
@@ -591,49 +585,29 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
 
        switch (key) {
        case SR_CONF_SCAN_OPTIONS:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                               scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t));
-               break;
+               return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, NULL, NULL);
        case SR_CONF_DEVICE_OPTIONS:
-               if (!sdi)
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                       drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t));
-               else if (!cg)
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                       devopts, ARRAY_SIZE(devopts), sizeof(uint32_t));
-               else
-                       *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32,
-                                       cgopts, ARRAY_SIZE(cgopts), sizeof(uint32_t));
+               if (!cg)
+                       return STD_CONFIG_LIST(key, data, sdi, cg, NULL, drvopts, devopts);
+               *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg));
                break;
        case SR_CONF_SAMPLERATE:
-               g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}"));
-               gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"),
-                               samplerates, ARRAY_SIZE(samplerates), sizeof(uint64_t));
-               g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
-               *data = g_variant_builder_end(&gvb);
+               *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates));
                break;
        case SR_CONF_TRIGGER_SOURCE:
-               *data = g_variant_new_strv(trigger_sources, ARRAY_SIZE(trigger_sources));
+               *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_sources));
                break;
        case SR_CONF_TRIGGER_SLOPE:
-               *data = g_variant_new_strv(trigger_slopes, ARRAY_SIZE(trigger_slopes));
+               *data = g_variant_new_strv(ARRAY_AND_SIZE(trigger_slopes));
                break;
        case SR_CONF_BUFFERSIZE:
-               *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT64,
-                               buffersizes, ARRAY_SIZE(buffersizes), sizeof(uint64_t));
+               *data = std_gvar_array_u64(ARRAY_AND_SIZE(buffersizes));
                break;
        case SR_CONF_VDIV:
-               g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
-               for (i = 0; i < (int)ARRAY_SIZE(vdivs); i++) {
-                       rational[0] = g_variant_new_uint64(vdivs[i][0]);
-                       rational[1] = g_variant_new_uint64(vdivs[i][1]);
-                       gvar = g_variant_new_tuple(rational, 2);
-                       g_variant_builder_add_value(&gvb, gvar);
-               }
-               *data = g_variant_builder_end(&gvb);
+               *data = std_gvar_tuple_array(&vdivs, ARRAY_SIZE(vdivs));
                break;
        case SR_CONF_COUPLING:
-               *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling));
+               *data = g_variant_new_strv(ARRAY_AND_SIZE(coupling));
                break;
        }