X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fchronovu_la8.c;h=6c5707330934bb833305e0a4195241cb04aae505;hb=2ea1fdf12113311cbe1a4316e9e2efe4d8ac40f0;hp=9c82506a7584a27ce0841b72ae331dc457a6416c;hpb=d0181813315114b88ad38cf276045ee5c311ca3c;p=libsigrok.git
diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c
index 9c82506a..6c570733 100644
--- a/src/input/chronovu_la8.c
+++ b/src/input/chronovu_la8.c
@@ -14,23 +14,23 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
+#include
#include
#include
#include
#include
-#include "libsigrok.h"
+#include
#include "libsigrok-internal.h"
#define LOG_PREFIX "input/chronovu-la8"
#define DEFAULT_NUM_CHANNELS 8
-#define DEFAULT_SAMPLERATE 100000000L
-#define MAX_CHUNK_SIZE 4096
-#define CHRONOVU_LA8_FILESIZE 8 * 1024 * 1024 + 5
+#define DEFAULT_SAMPLERATE SR_MHZ(100)
+#define MAX_CHUNK_SIZE (4 * 1024)
+#define CHRONOVU_LA8_FILESIZE ((8 * 1024 * 1024) + 5)
struct context {
gboolean started;
@@ -51,7 +51,6 @@ static int format_match(GHashTable *metadata)
static int init(struct sr_input *in, GHashTable *options)
{
- struct sr_channel *ch;
struct context *inc;
int num_channels, i;
char name[16];
@@ -62,21 +61,20 @@ static int init(struct sr_input *in, GHashTable *options)
return SR_ERR_ARG;
}
- in->sdi = sr_dev_inst_new(SR_ST_ACTIVE, NULL, NULL, NULL);
+ in->sdi = g_malloc0(sizeof(struct sr_dev_inst));
in->priv = inc = g_malloc0(sizeof(struct context));
inc->samplerate = g_variant_get_uint64(g_hash_table_lookup(options, "samplerate"));
for (i = 0; i < num_channels; i++) {
snprintf(name, 16, "%d", i);
- ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, name);
- in->sdi->channels = g_slist_append(in->sdi->channels, ch);
+ sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name);
}
return SR_OK;
}
-static int receive(struct sr_input *in, GString *buf)
+static int process_buffer(struct sr_input *in)
{
struct sr_datafeed_packet packet;
struct sr_datafeed_meta meta;
@@ -84,22 +82,11 @@ static int receive(struct sr_input *in, GString *buf)
struct sr_config *src;
struct context *inc;
gsize chunk_size, i;
- int chunk, num_channels;
+ int chunk;
inc = in->priv;
-
- g_string_append_len(in->buf, buf->str, buf->len);
-
- num_channels = g_slist_length(in->sdi->channels);
-
- if (!in->sdi_ready) {
- /* sdi is ready, notify frontend. */
- in->sdi_ready = TRUE;
- return SR_OK;
- }
-
if (!inc->started) {
- std_session_send_df_header(in->sdi, LOG_PREFIX);
+ std_session_send_df_header(in->sdi);
if (inc->samplerate) {
packet.type = SR_DF_META;
@@ -107,6 +94,7 @@ static int receive(struct sr_input *in, GString *buf)
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);
}
@@ -115,12 +103,11 @@ static int receive(struct sr_input *in, GString *buf)
packet.type = SR_DF_LOGIC;
packet.payload = &logic;
- logic.unitsize = (num_channels + 7) / 8;
+ logic.unitsize = (g_slist_length(in->sdi->channels) + 7) / 8;
/* Cut off at multiple of unitsize. */
chunk_size = in->buf->len / logic.unitsize * logic.unitsize;
- chunk = 0;
for (i = 0; i < chunk_size; i += chunk) {
logic.data = in->buf->str + i;
chunk = MIN(MAX_CHUNK_SIZE, chunk_size - i);
@@ -132,21 +119,46 @@ static int receive(struct sr_input *in, GString *buf)
return SR_OK;
}
-static int cleanup(struct sr_input *in)
+static int receive(struct sr_input *in, GString *buf)
+{
+ int ret;
+
+ g_string_append_len(in->buf, buf->str, buf->len);
+
+ if (!in->sdi_ready) {
+ /* sdi is ready, notify frontend. */
+ in->sdi_ready = TRUE;
+ return SR_OK;
+ }
+
+ ret = process_buffer(in);
+
+ return ret;
+}
+
+static int end(struct sr_input *in)
{
struct context *inc;
- struct sr_datafeed_packet packet;
+ int ret;
+
+ if (in->sdi_ready)
+ ret = process_buffer(in);
+ else
+ ret = SR_OK;
inc = in->priv;
- if (!inc)
- return SR_OK;
+ if (inc->started)
+ std_session_send_df_end(in->sdi);
- if (inc->started) {
- packet.type = SR_DF_END;
- sr_session_send(in->sdi, &packet);
- }
- g_free(in->priv);
- in->priv = NULL;
+ return ret;
+}
+
+static int reset(struct sr_input *in)
+{
+ struct context *inc = in->priv;
+
+ inc->started = FALSE;
+ g_string_truncate(in->buf, 0);
return SR_OK;
}
@@ -157,7 +169,7 @@ static struct sr_option options[] = {
ALL_ZERO
};
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
{
if (!options[0].def) {
options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS));
@@ -171,10 +183,12 @@ SR_PRIV struct sr_input_module input_chronovu_la8 = {
.id = "chronovu-la8",
.name = "Chronovu-LA8",
.desc = "ChronoVu LA8",
+ .exts = (const char*[]){"kdt", NULL},
.metadata = { SR_INPUT_META_FILESIZE | SR_INPUT_META_REQUIRED },
.options = get_options,
.format_match = format_match,
.init = init,
.receive = receive,
- .cleanup = cleanup,
+ .end = end,
+ .reset = reset,
};