X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fchronovu_la8.c;h=4c7854272aecea801734d2989c7ae2236ba08996;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=ceafd4db0a8366b9cab184ad27e6fcf38c77864a;hpb=45c59c8bdd01954f9214fe7b869d92c55415d109;p=libsigrok.git diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c index ceafd4db..4c785427 100644 --- a/input/chronovu_la8.c +++ b/input/chronovu_la8.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2011 Uwe Hermann * @@ -25,6 +25,8 @@ #include "libsigrok.h" #include "libsigrok-internal.h" +#define LOG_PREFIX "input/chronovu-l8" + #define NUM_PACKETS 2048 #define PACKET_SIZE 4096 #define DEFAULT_NUM_PROBES 8 @@ -54,20 +56,20 @@ static int format_match(const char *filename) int ret; if (!filename) { - sr_err("la8 in: %s: filename was NULL", __func__); + sr_err("%s: filename was NULL", __func__); // return SR_ERR; /* FIXME */ return FALSE; } if (!g_file_test(filename, G_FILE_TEST_EXISTS)) { - sr_err("la8 in: %s: input file '%s' does not exist", + sr_err("%s: input file '%s' does not exist", __func__, filename); // return SR_ERR; /* FIXME */ return FALSE; } if (!g_file_test(filename, G_FILE_TEST_IS_REGULAR)) { - sr_err("la8 in: %s: input file '%s' not a regular file", + sr_err("%s: input file '%s' not a regular file", __func__, filename); // return SR_ERR; /* FIXME */ return FALSE; @@ -76,12 +78,12 @@ static int format_match(const char *filename) /* Only accept files of length 8MB + 5 bytes. */ ret = stat(filename, &stat_buf); if (ret != 0) { - sr_err("la8 in: %s: Error getting file size of '%s'", + sr_err("%s: Error getting file size of '%s'", __func__, filename); return FALSE; } if (stat_buf.st_size != (8 * 1024 * 1024 + 5)) { - sr_dbg("la8 in: %s: File size must be exactly 8388613 bytes (" + sr_dbg("%s: File size must be exactly 8388613 bytes (" "it actually is %d bytes in size), so this is not a " "ChronoVu LA8 file.", __func__, stat_buf.st_size); return FALSE; @@ -92,28 +94,37 @@ static int format_match(const char *filename) return TRUE; } -static int init(struct sr_input *in) +static int init(struct sr_input *in, const char *filename) { + struct sr_probe *probe; int num_probes, i; char name[SR_MAX_PROBENAME_LEN + 1]; + char *param; - if (in->param && in->param[0]) { - num_probes = strtoul(in->param, NULL, 10); - if (num_probes < 1) { - sr_err("la8 in: %s: strtoul failed", __func__); - return SR_ERR; + (void)filename; + + num_probes = DEFAULT_NUM_PROBES; + + if (in->param) { + param = g_hash_table_lookup(in->param, "numprobes"); + if (param) { + num_probes = strtoul(param, NULL, 10); + if (num_probes < 1) { + sr_err("%s: strtoul failed", __func__); + return SR_ERR; + } } - } else { - num_probes = DEFAULT_NUM_PROBES; } /* Create a virtual device. */ - in->vdev = sr_dev_new(NULL, 0); + in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL); for (i = 0; i < num_probes; i++) { snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i); /* TODO: Check return value. */ - sr_dev_probe_add(in->vdev, name); + if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, name))) + return SR_ERR; + in->sdi->probes = g_slist_append(in->sdi->probes, probe); } return SR_OK; @@ -121,21 +132,21 @@ static int init(struct sr_input *in) static int loadfile(struct sr_input *in, const char *filename) { - struct sr_datafeed_header header; struct sr_datafeed_packet packet; - struct sr_datafeed_meta_logic meta; + struct sr_datafeed_meta meta; struct sr_datafeed_logic logic; + struct sr_config *src; uint8_t buf[PACKET_SIZE], divcount; int i, fd, size, num_probes; uint64_t samplerate; /* TODO: Use glib functions! GIOChannel, g_fopen, etc. */ if ((fd = open(filename, O_RDONLY)) == -1) { - sr_err("la8 in: %s: file open failed", __func__); + sr_err("%s: file open failed", __func__); return SR_ERR; } - num_probes = g_slist_length(in->vdev->probes); + num_probes = g_slist_length(in->sdi->probes); /* Seek to the end of the file, and read the divcount byte. */ divcount = 0x00; /* TODO: Don't hardcode! */ @@ -146,27 +157,23 @@ static int loadfile(struct sr_input *in, const char *filename) close(fd); /* FIXME */ return SR_ERR; } - sr_dbg("la8 in: %s: samplerate is %" PRIu64, __func__, samplerate); + sr_dbg("%s: samplerate is %" PRIu64, __func__, samplerate); /* Send header packet to the session bus. */ - sr_dbg("la8 in: %s: sending SR_DF_HEADER packet", __func__); - packet.type = SR_DF_HEADER; - packet.payload = &header; - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - sr_session_send(in->vdev, &packet); + std_session_send_df_header(in->sdi, LOG_PREFIX); /* Send metadata about the SR_DF_LOGIC packets to come. */ - packet.type = SR_DF_META_LOGIC; + packet.type = SR_DF_META; packet.payload = &meta; - meta.samplerate = samplerate; - meta.num_probes = num_probes; - sr_session_send(in->vdev, &packet); + src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(samplerate)); + meta.config = g_slist_append(NULL, src); + sr_session_send(in->sdi, &packet); + sr_config_free(src); /* TODO: Handle trigger point. */ /* Send data packets to the session bus. */ - sr_dbg("la8 in: %s: sending SR_DF_LOGIC data packets", __func__); + sr_dbg("%s: sending SR_DF_LOGIC data packets", __func__); packet.type = SR_DF_LOGIC; packet.payload = &logic; logic.unitsize = (num_probes + 7) / 8; @@ -177,15 +184,15 @@ static int loadfile(struct sr_input *in, const char *filename) /* TODO: Handle errors, handle incomplete reads. */ size = read(fd, buf, PACKET_SIZE); logic.length = size; - sr_session_send(in->vdev, &packet); + sr_session_send(in->sdi, &packet); } close(fd); /* FIXME */ /* Send end packet to the session bus. */ - sr_dbg("la8 in: %s: sending SR_DF_END", __func__); + sr_dbg("%s: sending SR_DF_END", __func__); packet.type = SR_DF_END; packet.payload = NULL; - sr_session_send(in->vdev, &packet); + sr_session_send(in->sdi, &packet); return SR_OK; }