X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=input%2Fchronovu_la8.c;h=d83b547f280fe218b28dcd644435a8e9c4b69f09;hb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;hp=f0a1a07142631e88a53a7eb4bfba043e70ccb8c7;hpb=3217b032053d6eb89ca31b01968715813bcbe1bb;p=libsigrok.git diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c index f0a1a071..d83b547f 100644 --- a/input/chronovu_la8.c +++ b/input/chronovu_la8.c @@ -21,8 +21,18 @@ #include #include #include -#include "sigrok.h" -#include "sigrok-internal.h" +#include +#include "libsigrok.h" +#include "libsigrok-internal.h" + +/* Message logging helpers with driver-specific prefix string. */ +#define DRIVER_LOG_DOMAIN "input/chronovu-la8: " +#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args) +#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args) +#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args) +#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args) +#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args) +#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args) #define NUM_PACKETS 2048 #define PACKET_SIZE 4096 @@ -53,20 +63,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; @@ -75,12 +85,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; @@ -93,26 +103,33 @@ static int format_match(const char *filename) static int init(struct sr_input *in) { + struct sr_probe *probe; 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_err("la8 in: %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("%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; @@ -120,20 +137,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; 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! */ @@ -144,22 +162,22 @@ 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); - header.num_logic_probes = num_probes; - header.samplerate = samplerate; - sr_session_send(in->vdev, &packet); + std_session_send_df_header(in->sdi, DRIVER_LOG_DOMAIN); + + /* Send metadata about the SR_DF_LOGIC packets to come. */ + packet.type = SR_DF_META; + packet.payload = &meta; + src = sr_config_make(SR_CONF_SAMPLERATE, (const void *)&samplerate); + meta.config = g_slist_append(NULL, src); + sr_session_send(in->sdi, &packet); /* 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; @@ -170,15 +188,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; }