drivers: Factor out std_*_idx*().

[libsigrok.git] / src / hardware / lecroy-xstream / protocol.c

diff --git a/src/hardware/lecroy-xstream/protocol.c b/src/hardware/lecroy-xstream/protocol.c
index 18c02061d4bf020a22e334475f52f361fb906b56..7aebdc59004e8b940de06e39686b079f10362022 100644 (file)
--- a/src/hardware/lecroy-xstream/protocol.c
+++ b/src/hardware/lecroy-xstream/protocol.c
@@ -84,19 +84,11 @@ static const char *coupling_options[] = {
 };
 
 static const char *scope_trigger_slopes[] = {
-       "POS",
-       "NEG",
-       NULL,
+       "POS", "NEG", NULL,
 };
 
 static const char *trigger_sources[] = {
-       "C1",
-       "C2",
-       "C3",
-       "C4",
-       "LINE",
-       "EXT",
-       NULL,
+       "C1", "C2", "C3", "C4", "LINE", "EXT", NULL,
 };
 
 static const struct sr_rational timebases[] = {
@@ -170,10 +162,7 @@ static const struct sr_rational vdivs[] = {
 };
 
 static const char *scope_analog_channel_names[] = {
-       "CH1",
-       "CH2",
-       "CH3",
-       "CH4",
+       "CH1", "CH2", "CH3", "CH4",
 };
 
 static const struct scope_config scope_models[] = {
@@ -292,7 +281,7 @@ static int analog_channel_state_get(struct sr_scpi_dev_inst *scpi,
                if (sr_scpi_get_string(scpi, command, &tmp_str) != SR_OK)
                        return SR_ERR;
 
-                if (array_float_get(tmp_str, vdivs, ARRAY_SIZE(vdivs), &j) != SR_OK) {
+                if (array_float_get(tmp_str, ARRAY_AND_SIZE(vdivs), &j) != SR_OK) {
                        g_free(tmp_str);
                        sr_err("Could not determine array index for vertical div scale.");
                        return SR_ERR;
@@ -366,7 +355,7 @@ SR_PRIV int lecroy_xstream_state_get(struct sr_dev_inst *sdi)
        if (sr_scpi_get_string(sdi->conn, "TIME_DIV?", &tmp_str) != SR_OK)
                return SR_ERR;
 
-       if (array_float_get(tmp_str, timebases, ARRAY_SIZE(timebases), &i) != SR_OK) {
+       if (array_float_get(tmp_str, ARRAY_AND_SIZE(timebases), &i) != SR_OK) {
                g_free(tmp_str);
                sr_err("Could not determine array index for timbase scale.");
                return SR_ERR;