kingst-la2016: style nits, remove not needed include directives

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

diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c
index 11fc36a6d8ac81de2fc56628c366cc74216d3e5b..91d05b90427fc349eec28299f76ae901cee49f39 100644 (file)
--- a/src/input/chronovu_la8.c
+++ b/src/input/chronovu_la8.c
@@ -47,6 +47,36 @@
 #define CHRONOVU_LA8_HDRSIZE    (sizeof(uint8_t) + sizeof(uint32_t))
 #define CHRONOVU_LA8_FILESIZE   (CHRONOVU_LA8_DATASIZE + CHRONOVU_LA8_HDRSIZE)
 
+/*
+ * Implementation note:
+ *
+ * The .format_match() routine only checks the file size, but none of
+ * the header fields. Only little would be gained (only clock divider
+ * 0xff could get tested), but complexity would increase dramatically.
+ * Also the .format_match() routine is unlikely to receive large enough
+ * a buffer to include the header. Neither is the filename available to
+ * the .format_match() routine.
+ *
+ * There is no way to programmatically tell whether the file was created
+ * by LA8 or LA16 software, i.e. with 8 or 16 logic channels. If the
+ * filename was available, one might guess based on the file extension,
+ * but still would require user specs if neither of the known extensions
+ * were used or the input is fed from a pipe.
+ *
+ * The current input module implementation assumes that users specify
+ * the (channel count and) sample rate. Input data gets processed and
+ * passed along to the session bus, before the file "header" is seen.
+ * A future implementation could move channel creation from init() to
+ * receive() or end() (actually: a common routine called from those two
+ * routines), and could defer sample processing and feeding the session
+ * until the header was seen, including deferred samplerate calculation
+ * after having seen the header. But again this improvement depends on
+ * the availability of either the filename or the device type. Also note
+ * that applications then had to keep sending data to the input module's
+ * receive() routine until sufficient amounts of input data were seen
+ * including the header (see bug #1017).
+ */
+
 struct context {
        gboolean started;
        uint64_t samplerate;
@@ -100,9 +130,7 @@ static int init(struct sr_input *in, GHashTable *options)
 static int process_buffer(struct sr_input *in)
 {
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_meta meta;
        struct sr_datafeed_logic logic;
-       struct sr_config *src;
        struct context *inc;
        gsize chunk_size, i;
        gsize chunk;
@@ -115,13 +143,8 @@ static int process_buffer(struct sr_input *in)
                std_session_send_df_header(in->sdi);
 
                if (inc->samplerate) {
-                       packet.type = SR_DF_META;
-                       packet.payload = &meta;
-                       src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
-                       meta.config = g_slist_append(NULL, src);
-                       sr_session_send(in->sdi, &packet);
-                       g_slist_free(meta.config);
-                       sr_config_free(src);
+                       (void)sr_session_send_meta(in->sdi, SR_CONF_SAMPLERATE,
+                               g_variant_new_uint64(inc->samplerate));
                }
 
                inc->samples_remain = CHRONOVU_LA8_DATASIZE;
@@ -214,9 +237,9 @@ static const struct sr_option *get_options(void)
 
 SR_PRIV struct sr_input_module input_chronovu_la8 = {
        .id = "chronovu-la8",
-       .name = "ChronoVu LA8",
-       .desc = "ChronoVu LA8 native file format data",
-       .exts = (const char*[]){"kdt", NULL},
+       .name = "ChronoVu LA8/LA16",
+       .desc = "ChronoVu LA8/LA16 native file format data",
+       .exts = (const char*[]){"kdt", "kd1", NULL},
        .metadata = { SR_INPUT_META_FILESIZE | SR_INPUT_META_REQUIRED },
        .options = get_options,
        .format_match = format_match,