Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[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..6955baaeec23bf2e11f894d7247d21880c3d3231 100644 (file)
--- a/src/hardware/yokogawa-dlm/protocol.c
+++ b/src/hardware/yokogawa-dlm/protocol.c
@@ -207,8 +207,8 @@ static const struct scope_config scope_models[] = {
                .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,
@@ -224,9 +224,9 @@ static const struct scope_config scope_models[] = {
        },
        {
                .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,
@@ -305,7 +305,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);
@@ -1171,7 +1171,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;