Input/raw_analog: Add reset() function

[libsigrok.git] / src / input / raw_analog.c

diff --git a/src/input/raw_analog.c b/src/input/raw_analog.c
index bb1aa06bdadf8d552df67d802e44ab94dbc779c3..5241e74ca5261c005861ac3eca15f2d198523710 100644 (file)
--- a/src/input/raw_analog.c
+++ b/src/input/raw_analog.c
@@ -48,26 +48,26 @@ struct context {
 };
 
 struct sample_format {
-       const char const *fmt_name;
+       const char *fmt_name;
        struct sr_analog_encoding encoding;
 };
 
-static const struct sample_format const sample_formats[] =
+static const struct sample_format sample_formats[] =
 {
-       { "S8",         { 1, TRUE,  FALSE, FALSE, 0, TRUE, { 1,         128}, { 0, 1}}},
-       { "U8",         { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1,         255}, {-1, 2}}},
-       { "S16_LE",     { 2, TRUE,  FALSE, FALSE, 0, TRUE, { 1, INT16_MAX+1}, { 0, 1}}},
-       { "U16_LE",     { 2, FALSE, FALSE, FALSE, 0, TRUE, { 1,  UINT16_MAX}, {-1, 2}}},
-       { "S16_BE",     { 2, TRUE,  FALSE, TRUE,  0, TRUE, { 1, INT16_MAX+1}, { 0, 1}}},
-       { "U16_BE",     { 2, FALSE, FALSE, TRUE,  0, TRUE, { 1,  UINT16_MAX}, {-1, 2}}},
-       { "S32_LE",     { 4, TRUE,  FALSE, FALSE, 0, TRUE, { 1, INT32_MAX+1}, { 0, 1}}},
-       { "U32_LE",     { 4, FALSE, FALSE, FALSE, 0, TRUE, { 1,  UINT32_MAX}, {-1, 2}}},
-       { "S32_BE",     { 4, TRUE,  FALSE, TRUE,  0, TRUE, { 1, INT32_MAX+1}, { 0, 1}}},
-       { "U32_BE",     { 4, FALSE, FALSE, TRUE,  0, TRUE, { 1,  UINT32_MAX}, {-1, 2}}},
-       { "FLOAT_LE",   { 4, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,           1}, { 0, 1}}},
-       { "FLOAT_BE",   { 4, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,           1}, { 0, 1}}},
-       { "FLOAT64_LE", { 8, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,           1}, { 0, 1}}},
-       { "FLOAT64_BE", { 8, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,           1}, { 0, 1}}},
+       { "S8",         { 1, TRUE,  FALSE, FALSE, 0, TRUE, { 1,                     128}, { 0, 1}}},
+       { "U8",         { 1, FALSE, FALSE, FALSE, 0, TRUE, { 1,                     255}, {-1, 2}}},
+       { "S16_LE",     { 2, TRUE,  FALSE, FALSE, 0, TRUE, { 1,           INT16_MAX + 1}, { 0, 1}}},
+       { "U16_LE",     { 2, FALSE, FALSE, FALSE, 0, TRUE, { 1,              UINT16_MAX}, {-1, 2}}},
+       { "S16_BE",     { 2, TRUE,  FALSE, TRUE,  0, TRUE, { 1,           INT16_MAX + 1}, { 0, 1}}},
+       { "U16_BE",     { 2, FALSE, FALSE, TRUE,  0, TRUE, { 1,              UINT16_MAX}, {-1, 2}}},
+       { "S32_LE",     { 4, TRUE,  FALSE, FALSE, 0, TRUE, { 1, (uint64_t)INT32_MAX + 1}, { 0, 1}}},
+       { "U32_LE",     { 4, FALSE, FALSE, FALSE, 0, TRUE, { 1,              UINT32_MAX}, {-1, 2}}},
+       { "S32_BE",     { 4, TRUE,  FALSE, TRUE,  0, TRUE, { 1, (uint64_t)INT32_MAX + 1}, { 0, 1}}},
+       { "U32_BE",     { 4, FALSE, FALSE, TRUE,  0, TRUE, { 1,              UINT32_MAX}, {-1, 2}}},
+       { "FLOAT_LE",   { 4, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,                       1}, { 0, 1}}},
+       { "FLOAT_BE",   { 4, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,                       1}, { 0, 1}}},
+       { "FLOAT64_LE", { 8, TRUE,  TRUE,  FALSE, 0, TRUE, { 1,                       1}, { 0, 1}}},
+       { "FLOAT64_BE", { 8, TRUE,  TRUE,  TRUE,  0, TRUE, { 1,                       1}, { 0, 1}}},
 };
 
 static int parse_format_string(const char *format)
@@ -217,7 +217,6 @@ static int receive(struct sr_input *in, GString *buf)
 
 static int end(struct sr_input *in)
 {
-       struct sr_datafeed_packet packet;
        struct context *inc;
        int ret;
 
@@ -227,10 +226,8 @@ static int end(struct sr_input *in)
                ret = SR_OK;
 
        inc = in->priv;
-       if (inc->started) {
-               packet.type = SR_DF_END;
-               sr_session_send(in->sdi, &packet);
-       }
+       if (inc->started)
+               std_session_send_df_end(in->sdi, LOG_PREFIX);
 
        return ret;
 }
@@ -270,6 +267,17 @@ static void cleanup(struct sr_input *in)
        in->priv = NULL;
 }
 
+static int reset(struct sr_input *in)
+{
+       struct context *inc = in->priv;
+
+       cleanup(in);
+       inc->started = FALSE;
+       g_string_truncate(in->buf, 0);
+
+       return SR_OK;
+}
+
 SR_PRIV struct sr_input_module input_raw_analog = {
        .id = "raw_analog",
        .name = "RAW analog",
@@ -280,4 +288,5 @@ SR_PRIV struct sr_input_module input_raw_analog = {
        .receive = receive,
        .end = end,
        .cleanup = cleanup,
+       .reset = reset,
 };