X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fchronovu_la8.c;h=681b812df4d03e759b4e61dc0fe6476875eb5119;hb=c506a6a688877793752d23e43d692c49d0f52dd2;hp=efc7704c3cbc1057aa4ef1a2e31fc35630abc592;hpb=5c64390e5ac8a0052d8b7eeb49c781d86027c814;p=libsigrok.git diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c index efc7704c..681b812d 100644 --- a/input/chronovu_la8.c +++ b/input/chronovu_la8.c @@ -21,8 +21,9 @@ #include #include #include -#include "sigrok.h" -#include "sigrok-internal.h" +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" #define NUM_PACKETS 2048 #define PACKET_SIZE 4096 @@ -36,6 +37,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,27 +50,42 @@ 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("la8 in: %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("la8 in: %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("la8 in: %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("la8 in: %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 (" + "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. */ @@ -79,24 +96,28 @@ static int init(struct sr_input *in) { int num_probes, i; char name[SR_MAX_PROBENAME_LEN + 1]; - - 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; + char *param; + + 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("la8 in: %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->vdev = sr_dev_new(NULL, 0); for (i = 0; i < num_probes; i++) { snprintf(name, SR_MAX_PROBENAME_LEN, "%d", i); /* TODO: Check return value. */ - sr_device_probe_add(in->vdevice, name); + sr_dev_probe_add(in->vdev, name); } return SR_OK; @@ -106,6 +127,7 @@ 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_logic logic; uint8_t buf[PACKET_SIZE], divcount; int i, fd, size, num_probes; @@ -113,11 +135,11 @@ static int loadfile(struct sr_input *in, const char *filename) /* 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("la8 in: %s: file open failed", __func__); return SR_ERR; } - num_probes = g_slist_length(in->vdevice->probes); + num_probes = g_slist_length(in->vdev->probes); /* Seek to the end of the file, and read the divcount byte. */ divcount = 0x00; /* TODO: Don't hardcode! */ @@ -128,22 +150,27 @@ 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("la8 in: %s: samplerate is %" PRIu64, __func__, samplerate); /* Send header packet to the session bus. */ - sr_dbg("la8input: %s: sending SR_DF_HEADER packet", __func__); + 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); - header.num_logic_probes = num_probes; - header.samplerate = samplerate; - sr_session_bus(in->vdevice, &packet); + sr_session_send(in->vdev, &packet); + + /* Send metadata about the SR_DF_LOGIC packets to come. */ + packet.type = SR_DF_META_LOGIC; + packet.payload = &meta; + meta.samplerate = samplerate; + meta.num_probes = num_probes; + sr_session_send(in->vdev, &packet); /* TODO: Handle trigger point. */ /* Send data packets to the session bus. */ - sr_dbg("la8input: %s: sending SR_DF_LOGIC data packets", __func__); + sr_dbg("la8 in: %s: sending SR_DF_LOGIC data packets", __func__); packet.type = SR_DF_LOGIC; packet.payload = &logic; logic.unitsize = (num_probes + 7) / 8; @@ -153,21 +180,21 @@ static int loadfile(struct sr_input *in, const char *filename) 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->vdev, &packet); } close(fd); /* FIXME */ /* Send end packet to the session bus. */ - sr_dbg("la8input: %s: sending SR_DF_END", __func__); + sr_dbg("la8 in: %s: sending SR_DF_END", __func__); packet.type = SR_DF_END; packet.payload = NULL; - sr_session_bus(in->vdevice, &packet); + sr_session_send(in->vdev, &packet); return SR_OK; } -struct sr_input_format input_chronovu_la8 = { +SR_PRIV struct sr_input_format input_chronovu_la8 = { .id = "chronovu-la8", .description = "ChronoVu LA8", .format_match = format_match,