X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=main.c;h=43bea06470b2c8c7af37cffb750550c68361ca57;hb=676bf74fb53a0931249719bfa5c4958308f3aa37;hp=03c1b8a8a3e9e05b014a25a78f8d600299c06fc9;hpb=8ef3f94d595136a456f26c9b492edc8ac3dbb0d0;p=sigrok-gtk.git diff --git a/main.c b/main.c index 03c1b8a..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;