saleae and other FX2: show firmware name when loading fails

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

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index f8940d8f3a5296b401b4e13e8d8dc43f96d07fce..59b27c2c666163e397e3eb97c0e8cc4dc01e779f 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -120,10 +120,6 @@ static struct sr_dev_inst *hantek_6xxx_dev_new(const struct hantek_6xxx_profile
        devc->coupling_tab_size = prof->coupling_tab_size;
        devc->has_coupling = prof->has_coupling;
 
-       devc->sample_buf = NULL;
-       devc->sample_buf_write = 0;
-       devc->sample_buf_size = 0;
-
        devc->profile = prof;
        devc->dev_state = IDLE;
        devc->samplerate = DEFAULT_SAMPLERATE;
@@ -232,11 +228,12 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                                devices = g_slist_append(devices, sdi);
                                devc = sdi->priv;
                                if (ezusb_upload_firmware(drvc->sr_ctx, devlist[i],
-                                               USB_CONFIGURATION, prof->firmware) == SR_OK)
+                                               USB_CONFIGURATION, prof->firmware) == SR_OK) {
                                        /* Remember when the firmware on this device was updated. */
                                        devc->fw_updated = g_get_monotonic_time();
-                               else
-                                       sr_err("Firmware upload failed.");
+                               } else {
+                                       sr_err("Firmware upload failed, name %s.", prof->firmware);
+                               }
                                /* Dummy USB address of 0xff will get overwritten later. */
                                sdi->conn = sr_usb_dev_inst_new(
                                                libusb_get_bus_number(devlist[i]), 0xff, NULL);
@@ -637,7 +634,6 @@ static int read_channel(const struct sr_dev_inst *sdi, uint32_t amount)
        amount = MIN(amount, MAX_PACKET_SIZE);
        ret = hantek_6xxx_get_channeldata(sdi, receive_transfer, amount);
        devc->read_start_ts = g_get_monotonic_time();
-       devc->read_data_amount = amount;
 
        return ret;
 }
@@ -721,9 +717,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
        devc = sdi->priv;
        devc->dev_state = STOPPING;
 
-       g_free(devc->sample_buf);
-       devc->sample_buf = NULL;
-
        return SR_OK;
 }