output/csv: use intermediate time_t var, silence compiler warning

[libsigrok.git] / src / hardware / dreamsourcelab-dslogic / protocol.c

diff --git a/src/hardware/dreamsourcelab-dslogic/protocol.c b/src/hardware/dreamsourcelab-dslogic/protocol.c
index 0f171518125c5aa320ba0791de3a875df182f8d9..bb98d61a4b4f467f4eafa5cfb5d487b6a20f79ac 100644 (file)
--- a/src/hardware/dreamsourcelab-dslogic/protocol.c
+++ b/src/hardware/dreamsourcelab-dslogic/protocol.c
@@ -776,7 +776,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
                (DSLOGIC_ATOMIC_BYTES * channel_count);
 
        gboolean packet_has_error = FALSE;
-       struct sr_datafeed_packet packet;
        unsigned int num_samples;
        int trigger_offset;
 
@@ -856,9 +855,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
                        devc->sent_samples += trigger_offset;
                        /* Trigger position. */
                        devc->trigger_pos = 0;
-                       packet.type = SR_DF_TRIGGER;
-                       packet.payload = NULL;
-                       sr_session_send(sdi, &packet);
+                       std_session_send_df_trigger(sdi);
                        /* Post trigger samples. */
                        num_samples -= trigger_offset;
                        send_data(sdi, devc->deinterleave_buffer
@@ -1020,8 +1017,8 @@ static void LIBUSB_CALL trigger_receive(struct libusb_transfer *transfer)
        } else if (transfer->status == LIBUSB_TRANSFER_COMPLETED
                        && transfer->actual_length == sizeof(struct dslogic_trigger_pos)) {
                tpos = (struct dslogic_trigger_pos *)transfer->buffer;
-               sr_info("tpos real_pos %d ram_saddr %d cnt %d", tpos->real_pos,
-                       tpos->ram_saddr, tpos->remain_cnt);
+               sr_info("tpos real_pos %d ram_saddr %d cnt_h %d cnt_l %d", tpos->real_pos,
+                       tpos->ram_saddr, tpos->remain_cnt_h, tpos->remain_cnt_l);
                devc->trigger_pos = tpos->real_pos;
                g_free(tpos);
                start_transfers(sdi);