drivers: Use ARRAY_AND_SIZE where possible.

[libsigrok.git] / src / hardware / yokogawa-dlm / protocol.c

diff --git a/src/hardware/yokogawa-dlm/protocol.c b/src/hardware/yokogawa-dlm/protocol.c
index 5c9866e412a14bcba7a23fe9ac5759f3103c8bf5..1937a71c996929d262a1cb4161e15ce1c37cc64a 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -18,18 +18,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/**
- * @file
- *
- * <em>Yokogawa DL/DLM series</em> oscilloscope driver
- * @internal
- */
-
 #include <config.h>
 #include "scpi.h"
 #include "protocol.h"
 
-static const char *dlm_coupling_options[] = {
+static const char *coupling_options[] = {
        "AC",
        "DC",
        "DC50",
@@ -37,7 +30,7 @@ static const char *dlm_coupling_options[] = {
        NULL,
 };
 
-static const char *dlm_2ch_trigger_sources[] = {
+static const char *trigger_sources_2ch[] = {
        "1",
        "2",
        "LINE",
@@ -46,7 +39,7 @@ static const char *dlm_2ch_trigger_sources[] = {
 };
 
 /* TODO: Is BITx handled correctly or is Dx required? */
-static const char *dlm_4ch_trigger_sources[] = {
+static const char *trigger_sources_4ch[] = {
        "1",
        "2",
        "3",
@@ -200,15 +193,15 @@ static const struct scope_config scope_models[] = {
                .analog_names = &scope_analog_channel_names,
                .digital_names = &scope_digital_channel_names_8,
 
-               .coupling_options = &dlm_coupling_options,
-               .trigger_sources = &dlm_2ch_trigger_sources,
+               .coupling_options = &coupling_options,
+               .trigger_sources = &trigger_sources_2ch,
 
                .num_xdivs = 10,
                .num_ydivs = 8,
        },
        {
-               .model_id    = {"710110",  "710120",  "710130",  NULL},
-               .model_name  = {"DLM2024", "DLM2034", "DLM2054", NULL},
+               .model_id   = {"710110",  "710120",  "710130",  NULL},
+               .model_name = {"DLM2024", "DLM2034", "DLM2054", NULL},
                .analog_channels = 4,
                .digital_channels = 8,
                .pods = 1,
@@ -216,17 +209,17 @@ static const struct scope_config scope_models[] = {
                .analog_names = &scope_analog_channel_names,
                .digital_names = &scope_digital_channel_names_8,
 
-               .coupling_options = &dlm_coupling_options,
-               .trigger_sources = &dlm_4ch_trigger_sources,
+               .coupling_options = &coupling_options,
+               .trigger_sources = &trigger_sources_4ch,
 
                .num_xdivs = 10,
                .num_ydivs = 8,
        },
        {
                .model_id   = {"701307", "701308",  "701310", "701311",
-                               "701312", "701313",  NULL},
+                              "701312", "701313",  NULL},
                .model_name = {"DL9040", "DL9040L", "DL9140", "DL9140L",
-                               "DL9240", "DL9240L", NULL},
+                              "DL9240", "DL9240L", NULL},
                .analog_channels = 4,
                .digital_channels = 0,
                .pods = 0,
@@ -234,8 +227,8 @@ static const struct scope_config scope_models[] = {
                .analog_names = &scope_analog_channel_names,
                .digital_names = NULL,
 
-               .coupling_options = &dlm_coupling_options,
-               .trigger_sources = &dlm_4ch_trigger_sources,
+               .coupling_options = &coupling_options,
+               .trigger_sources = &trigger_sources_4ch,
 
                .num_xdivs = 10,
                .num_ydivs = 8,
@@ -250,8 +243,8 @@ static const struct scope_config scope_models[] = {
                .analog_names = &scope_analog_channel_names,
                .digital_names = &scope_digital_channel_names_32,
 
-               .coupling_options = &dlm_coupling_options,
-               .trigger_sources = &dlm_4ch_trigger_sources,
+               .coupling_options = &coupling_options,
+               .trigger_sources = &trigger_sources_4ch,
 
                .num_xdivs = 10,
                .num_ydivs = 8,
@@ -266,8 +259,8 @@ static const struct scope_config scope_models[] = {
                .analog_names = &scope_analog_channel_names,
                .digital_names = &scope_digital_channel_names_32,
 
-               .coupling_options = &dlm_coupling_options,
-               .trigger_sources = &dlm_4ch_trigger_sources,
+               .coupling_options = &coupling_options,
+               .trigger_sources = &trigger_sources_4ch,
 
                .num_xdivs = 10,
                .num_ydivs = 8,
@@ -305,7 +298,7 @@ static void scope_state_dump(const struct scope_config *config,
                                state->pod_states[i] ? "On" : "Off");
        }
 
-       tmp = sr_period_string(dlm_timebases[state->timebase][0] *
+       tmp = sr_period_string(dlm_timebases[state->timebase][0],
                        dlm_timebases[state->timebase][1]);
        sr_info("Current timebase: %s", tmp);
        g_free(tmp);
@@ -461,7 +454,7 @@ static int analog_channel_state_get(const struct sr_dev_inst *sdi,
                if (dlm_analog_chan_vdiv_get(scpi, i + 1, &response) != SR_OK)
                        return SR_ERR;
 
-               if (array_float_get(response, dlm_vdivs, ARRAY_SIZE(dlm_vdivs),
+               if (array_float_get(response, ARRAY_AND_SIZE(dlm_vdivs),
                                &j) != SR_OK) {
                        g_free(response);
                        return SR_ERR;
@@ -699,8 +692,7 @@ SR_PRIV int dlm_scope_state_query(struct sr_dev_inst *sdi)
        if (dlm_timebase_get(sdi->conn, &response) != SR_OK)
                return SR_ERR;
 
-       if (array_float_get(response, dlm_timebases,
-                       ARRAY_SIZE(dlm_timebases), &i) != SR_OK) {
+       if (array_float_get(response, ARRAY_AND_SIZE(dlm_timebases), &i) != SR_OK) {
                g_free(response);
                return SR_ERR;
        }
@@ -1171,7 +1163,7 @@ SR_PRIV int dlm_data_receive(int fd, int revents, void *cb_data)
                 * As of now we only support importing the current acquisition
                 * data so we're going to stop at this point.
                 */
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
                return TRUE;
        } else
                devc->current_channel = devc->current_channel->next;