X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Finput%2Fchronovu_la8.c;h=f42886ed87e21037b83efc443856952a9dfe3033;hb=00b2a092c3e4b0ab9a12b44a50c6b271f4cf71f8;hp=c28f0e0a811b8afa43006ef86095ab231bbdedf0;hpb=c7bc82ffa1b09a228a8395049e2b691cd7bd85f8;p=libsigrok.git

diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c
index c28f0e0a..f42886ed 100644
--- a/src/input/chronovu_la8.c
+++ b/src/input/chronovu_la8.c
@@ -18,19 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
+#include <config.h>
 #include <stdlib.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/chronovu-la8"
 
 #define DEFAULT_NUM_CHANNELS    8
-#define DEFAULT_SAMPLERATE      100000000L
-#define MAX_CHUNK_SIZE          4096
-#define CHRONOVU_LA8_FILESIZE   8 * 1024 * 1024 + 5
+#define DEFAULT_SAMPLERATE      SR_MHZ(100)
+#define MAX_CHUNK_SIZE          (4 * 1024)
+#define CHRONOVU_LA8_FILESIZE   ((8 * 1024 * 1024) + 5)
 
 struct context {
 	gboolean started;
@@ -51,7 +52,6 @@ static int format_match(GHashTable *metadata)
 
 static int init(struct sr_input *in, GHashTable *options)
 {
-	struct sr_channel *ch;
 	struct context *inc;
 	int num_channels, i;
 	char name[16];
@@ -69,8 +69,7 @@ static int init(struct sr_input *in, GHashTable *options)
 
 	for (i = 0; i < num_channels; i++) {
 		snprintf(name, 16, "%d", i);
-		ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, name);
-		in->sdi->channels = g_slist_append(in->sdi->channels, ch);
+		sr_channel_new(in->sdi, i, SR_CHANNEL_LOGIC, TRUE, name);
 	}
 
 	return SR_OK;
@@ -96,6 +95,7 @@ static int process_buffer(struct sr_input *in)
 			src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
 			meta.config = g_slist_append(NULL, src);
 			sr_session_send(in->sdi, &packet);
+			g_slist_free(meta.config);
 			sr_config_free(src);
 		}
 
@@ -163,7 +163,7 @@ static struct sr_option options[] = {
 	ALL_ZERO
 };
 
-static struct sr_option *get_options(void)
+static const struct sr_option *get_options(void)
 {
 	if (!options[0].def) {
 		options[0].def = g_variant_ref_sink(g_variant_new_int32(DEFAULT_NUM_CHANNELS));