static int init(struct sr_input *in)
{
+ struct sr_probe *probe;
int num_probes, i;
char name[SR_MAX_PROBENAME_LEN + 1];
char *param;
}
/* 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;
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! */
packet.payload = &header;
header.feed_version = 1;
gettimeofday(&header.starttime, NULL);
- sr_session_send(in->vdev, &packet);
+ sr_session_send(in->sdi, &packet);
/* Send metadata about the SR_DF_LOGIC packets to come. */
packet.type = SR_DF_META_LOGIC;
packet.payload = &meta;
meta.samplerate = samplerate;
meta.num_probes = num_probes;
- sr_session_send(in->vdev, &packet);
+ sr_session_send(in->sdi, &packet);
/* TODO: Handle trigger point. */
/* 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 */
sr_dbg("la8 in: %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;
}