X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=main.c;h=43bea06470b2c8c7af37cffb750550c68361ca57;hb=676bf74fb53a0931249719bfa5c4958308f3aa37;hp=5e0e004ef4d6d5e6f47115c6898edae66155297a;hpb=faff5357e11f49194fd08c1e6aac0751e9da4dce;p=sigrok-gtk.git

diff --git a/main.c b/main.c
index 5e0e004..43bea06 100644
--- a/main.c
+++ b/main.c
@@ -34,16 +34,16 @@ static const char *colours[8] = {
 };
 
 static void
-datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
+datafeed_in(struct sr_dev *dev, struct sr_datafeed_packet *packet)
 {
-	static int probelist[65] = { 0 };
+	static int probelist[SR_MAX_NUM_PROBES + 1] = { 0 };
 	static int unitsize = 0;
 	struct sr_probe *probe;
 	struct sr_datafeed_header *header;
 	struct sr_datafeed_logic *logic = NULL;
 	int num_enabled_probes, sample_size, i;
 	uint64_t filter_out_len;
-	char *filter_out;
+	uint8_t *filter_out;
 	GArray *data;
 
 	switch (packet->type) {
@@ -53,7 +53,7 @@ datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
 		num_enabled_probes = 0;
 		gtk_list_store_clear(siglist);
 		for (i = 0; i < header->num_logic_probes; i++) {
-			probe = g_slist_nth_data(device->probes, i);
+			probe = g_slist_nth_data(dev->probes, i);
 			if (probe->enabled) {
 				GtkTreeIter iter;
 				probelist[num_enabled_probes++] = probe->index;
@@ -84,8 +84,6 @@ datafeed_in(struct sr_device *device, struct sr_datafeed_packet *packet)
 		sample_size = logic->unitsize;
 		g_message("fe: received SR_DF_LOGIC, %"PRIu64" bytes", logic->length);
 		break;
-	case SR_DF_ANALOG:
-		break;
 	}
 
 	if (!logic)
@@ -156,7 +154,7 @@ int main(int argc, char **argv)
 	gtk_container_add(GTK_CONTAINER(window), vbox);
 	gtk_widget_show_all(GTK_WIDGET(window));
 
-	sr_set_loglevel(1);
+	sr_log_loglevel_set(SR_LOG_ERR);
 
 	gtk_main();