X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=input%2Fchronovu_la8.c;h=43004401e697c5a6b2073cc26e0ed1342bd06d30;hp=a2aab33512e0a7984a9ec4d0e33f331f7a09d5db;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=7c1d391c8b33bf76f7c6617fe9d5174e16a04f95 diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c index a2aab335..43004401 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 * @@ -21,8 +21,11 @@ #include #include #include -#include "sigrok.h" -#include "sigrok-internal.h" +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" + +#define LOG_PREFIX "input/chronovu-la8" #define NUM_PACKETS 2048 #define PACKET_SIZE 4096 @@ -36,6 +39,7 @@ * Max. value for divcount: 0xfe (2550ns sample period, 392.15kHz samplerate). * * @param divcount The divcount value as needed by the hardware. + * * @return The samplerate in Hz, or 0xffffffffffffffff upon errors. */ static uint64_t divcount_to_samplerate(uint8_t divcount) @@ -48,55 +52,79 @@ static uint64_t divcount_to_samplerate(uint8_t divcount) static int format_match(const char *filename) { + struct stat stat_buf; + int ret; + if (!filename) { - sr_warn("la8input: %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_warn("la8input: %s: input file '%s' does not exist", - __func__, filename); + 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_warn("la8input: %s: input file '%s' not a regular file", - __func__, filename); + sr_err("%s: input file '%s' not a regular file", + __func__, filename); // return SR_ERR; /* FIXME */ return FALSE; } - /* TODO: Only accept files of length 8MB + 5 bytes. */ + /* Only accept files of length 8MB + 5 bytes. */ + ret = stat(filename, &stat_buf); + if (ret != 0) { + sr_err("%s: Error getting file size of '%s'", + __func__, filename); + return FALSE; + } + if (stat_buf.st_size != (8 * 1024 * 1024 + 5)) { + 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; + } /* TODO: Check for divcount != 0xff. */ return TRUE; } -static int init(struct sr_input *in) +static int init(struct sr_input *in, const char *filename) { - int num_probes, i; + struct sr_channel *ch; + int num_channels, 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_warn("la8input: %s: strtoul failed", __func__); - return SR_ERR; + (void)filename; + + num_channels = DEFAULT_NUM_PROBES; + + if (in->param) { + param = g_hash_table_lookup(in->param, "numchannels"); + if (param) { + num_channels = strtoul(param, NULL, 10); + if (num_channels < 1) { + sr_err("%s: strtoul failed", __func__); + return SR_ERR; + } } - } else { - num_probes = DEFAULT_NUM_PROBES; } /* Create a virtual device. */ - in->vdevice = sr_device_new(NULL, 0); + in->sdi = sr_dev_inst_new(0, SR_ST_ACTIVE, NULL, NULL, NULL); - for (i = 0; i < num_probes; i++) { + for (i = 0; i < num_channels; i++) { snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i); /* TODO: Check return value. */ - sr_device_probe_add(in->vdevice, name); + if (!(ch = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, name))) + return SR_ERR; + in->sdi->channels = g_slist_append(in->sdi->channels, ch); } return SR_OK; @@ -104,20 +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 meta; struct sr_datafeed_logic logic; + struct sr_config *src; uint8_t buf[PACKET_SIZE], divcount; - int i, fd, size, num_probes; + int i, fd, size, num_channels; uint64_t samplerate; /* TODO: Use glib functions! GIOChannel, g_fopen, etc. */ if ((fd = open(filename, O_RDONLY)) == -1) { - sr_warn("la8input: %s: file open failed", __func__); + sr_err("%s: file open failed", __func__); return SR_ERR; } - num_probes = g_slist_length(in->vdevice->probes); + num_channels = g_slist_length(in->sdi->channels); /* Seek to the end of the file, and read the divcount byte. */ divcount = 0x00; /* TODO: Don't hardcode! */ @@ -128,41 +157,42 @@ static int loadfile(struct sr_input *in, const char *filename) close(fd); /* FIXME */ return SR_ERR; } - sr_dbg("la8input: %s: samplerate is %" PRIu64, __func__, samplerate); + sr_dbg("%s: samplerate is %" PRIu64, __func__, samplerate); /* Send header packet to the session bus. */ - sr_dbg("la8input: %s: sending SR_DF_HEADER packet", __func__); - packet.type = SR_DF_HEADER; - packet.payload = &header; - header.feed_version = 1; - gettimeofday(&header.starttime, NULL); - header.num_logic_probes = num_probes; - header.samplerate = samplerate; - sr_session_bus(in->vdevice, &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; + packet.payload = &meta; + 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("la8input: %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; + logic.unitsize = (num_channels + 7) / 8; logic.data = buf; /* Send 8MB of total data to the session bus in small chunks. */ for (i = 0; i < NUM_PACKETS; i++) { /* TODO: Handle errors, handle incomplete reads. */ size = read(fd, buf, PACKET_SIZE); - logic.length = PACKET_SIZE; - sr_session_bus(in->vdevice, &packet); + logic.length = size; + sr_session_send(in->sdi, &packet); } close(fd); /* FIXME */ /* Send end packet to the session bus. */ - sr_dbg("la8input: %s: sending SR_DF_END", __func__); + sr_dbg("%s: sending SR_DF_END", __func__); packet.type = SR_DF_END; packet.payload = NULL; - sr_session_bus(in->vdevice, &packet); + sr_session_send(in->sdi, &packet); return SR_OK; }