Drop unneeded std_session_send_df_header() comments.

[libsigrok.git] / src / hardware / hantek-dso / api.c

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index e55f4e09f89b0b648a0ba896c28c1f06406acbed..082d05b6add33ca84080a3a14fa7bd6ae244a128 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -105,7 +105,7 @@ static const struct dso_profile dev_profiles[] = {
                "Hantek", "DSO-5200A",
                buffersizes_512k,
                "hantek-dso-5200A.fw" },
-       { 0, 0, 0, 0, 0, 0, 0, 0 },
+       ALL_ZERO
 };
 
 static const uint64_t timebases[][2] = {
@@ -428,7 +428,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
 {
        struct dev_context *devc;
        struct sr_usb_dev_inst *usb;
-       char str[128], *s;
+       char str[128];
+       const char *s;
        const uint64_t *vdiv;
        int ch_idx;
 
@@ -708,14 +709,14 @@ static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf,
                int num_samples)
 {
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct dev_context *devc;
        float ch1, ch2, range;
        int num_channels, data_offset, i;
 
        devc = sdi->priv;
        num_channels = (devc->ch1_enabled && devc->ch2_enabled) ? 2 : 1;
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        /* TODO: support for 5xxx series 9-bit samples */
        analog.channels = devc->enabled_channels;
@@ -773,8 +774,8 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
 
        sdi = transfer->user_data;
        devc = sdi->priv;
-       sr_spew("receive_transfer(): status %d received %d bytes.",
-                  transfer->status, transfer->actual_length);
+       sr_spew("receive_transfer(): status %s received %d bytes.",
+               libusb_error_name(transfer->status), transfer->actual_length);
 
        if (transfer->actual_length == 0)
                /* Nothing to send to the bus. */
@@ -882,8 +883,7 @@ static int handle_event(int fd, int revents, void *cb_data)
                 */
                usb_source_remove(sdi->session, drvc->sr_ctx);
 
-               packet.type = SR_DF_END;
-               sr_session_send(sdi, &packet);
+               std_session_send_df_end(sdi, LOG_PREFIX);
 
                devc->dev_state = IDLE;
 
@@ -993,7 +993,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        devc->dev_state = CAPTURE;
        usb_source_add(sdi->session, drvc->sr_ctx, TICK, handle_event, (void *)sdi);
 
-       /* Send header packet to the session bus. */
        std_session_send_df_header(cb_data, LOG_PREFIX);
 
        return SR_OK;