- packet.type = SR_DF_ANALOG;
- packet.payload = &analog;
- analog.num_samples = transfer->actual_length / 2;
- analog.data = g_try_malloc(analog.num_samples * sizeof(float) * ctx->profile->num_probes);
- for (i = 0; i < analog.num_samples; i++) {
- /* Hardcoded for two channels, since the order/encoding is specific. */
- /* TODO: support for 5xxx series 9-bit samples */
- ch2 = (*(transfer->buffer + i * 2) / 255.0);
- ch1 = (*(transfer->buffer + i * 2 + 1) / 255.0);
- analog.data[i * ctx->profile->num_probes] = ch1;
- analog.data[i * ctx->profile->num_probes + 1] = ch2;
+ sr_dbg("Got %d-%d/%d samples in frame.", devc->samp_received + 1,
+ devc->samp_received + num_samples, devc->framesize);
+
+ /*
+ * The device always sends a full frame, but the beginning of the frame
+ * doesn't represent the trigger point. The offset at which the trigger
+ * happened came in with the capture state, so we need to start sending
+ * from there up the session bus. The samples in the frame buffer
+ * before that trigger point came after the end of the device's frame
+ * buffer was reached, and it wrapped around to overwrite up until the
+ * trigger point.
+ */
+ if (devc->samp_received < devc->trigger_offset) {
+ /* Trigger point not yet reached. */
+ if (devc->samp_received + num_samples < devc->trigger_offset) {
+ /* The entire chunk is before the trigger point. */
+ memcpy(devc->framebuf + devc->samp_buffered * 2,
+ transfer->buffer, num_samples * 2);
+ devc->samp_buffered += num_samples;
+ } else {
+ /*
+ * This chunk hits or overruns the trigger point.
+ * Store the part before the trigger fired, and
+ * send the rest up to the session bus.
+ */
+ pre = devc->trigger_offset - devc->samp_received;
+ memcpy(devc->framebuf + devc->samp_buffered * 2,
+ transfer->buffer, pre * 2);
+ devc->samp_buffered += pre;
+
+ /* The rest of this chunk starts with the trigger point. */
+ sr_dbg("Reached trigger point, %d samples buffered.",
+ devc->samp_buffered);
+
+ /* Avoid the corner case where the chunk ended at
+ * exactly the trigger point. */
+ if (num_samples > pre)
+ send_chunk(devc, transfer->buffer + pre * 2,
+ num_samples - pre);
+ }
+ } else {
+ /* Already past the trigger point, just send it all out. */
+ send_chunk(devc, transfer->buffer,
+ num_samples);