X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=input%2Fchronovu_la8.c;h=d83b547f280fe218b28dcd644435a8e9c4b69f09;hb=cd2f0fe22c35dcf3b010411ff6f123701be2a2d6;hp=146d9da9d581154c2caf029e1c58eaf0d9f1ca24;hpb=8e7f1cfd99a37d21ebe3365067cd21b76e866d1c;p=libsigrok.git diff --git a/input/chronovu_la8.c b/input/chronovu_la8.c index 146d9da9..d83b547f 100644 --- a/input/chronovu_la8.c +++ b/input/chronovu_la8.c @@ -137,10 +137,10 @@ 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; @@ -165,18 +165,13 @@ static int loadfile(struct sr_input *in, const char *filename) sr_dbg("%s: samplerate is %" PRIu64, __func__, samplerate); /* Send header packet to the session bus. */ - sr_dbg("%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->sdi, &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_LOGIC; + packet.type = SR_DF_META; packet.payload = &meta; - meta.samplerate = samplerate; - meta.num_probes = num_probes; + 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. */