Add sr_dev_acquisition_stop(), factor out SR_ERR_DEV_CLOSED check.

[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 0f00cd3ea25b7a6fef2e7b9e46f84b2318432955..025695e1df41cf1b913664be95e5e38e85752545 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -36,10 +36,10 @@ static const uint32_t drvopts[] = {
 
 static const uint32_t devopts[] = {
        SR_CONF_CONN | SR_CONF_GET,
-       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
-       SR_CONF_NUM_VDIV | SR_CONF_GET,
        SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET,
        SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET,
+       SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
+       SR_CONF_NUM_VDIV | SR_CONF_GET,
 };
 
 static const uint32_t devopts_cg[] = {
@@ -52,7 +52,7 @@ static const char *channel_names[] = {
 };
 
 static const char *dc_coupling[] = {
-       "DC", "DC",
+       "DC",
 };
 
 static const char *acdc_coupling[] = {
@@ -61,15 +61,20 @@ static const char *acdc_coupling[] = {
 
 static const struct hantek_6xxx_profile dev_profiles[] = {
        {
-               0x04b4, 0x6022, 0x04b5, 0x6022,
-               "Hantek", "6022BE", "hantek-6022be.fw",
+               0x04b4, 0x6022, 0x1d50, 0x608e, 0x0001,
+               "Hantek", "6022BE", "fx2lafw-hantek-6022be.fw",
                dc_coupling, ARRAY_SIZE(dc_coupling), FALSE,
        },
        {
-               0x8102, 0x8102, 0x1D50, 0x608E,
-               "Sainsmart", "DDS120", "sainsmart-dds120.fw",
+               0x8102, 0x8102, 0x1d50, 0x608e, 0x0002,
+               "Sainsmart", "DDS120", "fx2lafw-sainsmart-dds120.fw",
                acdc_coupling, ARRAY_SIZE(acdc_coupling), TRUE,
        },
+       {
+               0x04b4, 0x602a, 0x1d50, 0x608e, 0x0003,
+               "Hantek", "6022BL", "fx2lafw-hantek-6022bl.fw",
+               dc_coupling, ARRAY_SIZE(dc_coupling), FALSE,
+       },
        ALL_ZERO
 };
 
@@ -83,8 +88,6 @@ static const uint64_t vdivs[][2] = {
 
 static int read_channel(const struct sr_dev_inst *sdi, uint32_t amount);
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi);
-
 static struct sr_dev_inst *hantek_6xxx_dev_new(const struct hantek_6xxx_profile *prof)
 {
        struct sr_dev_inst *sdi;
@@ -115,6 +118,7 @@ static struct sr_dev_inst *hantek_6xxx_dev_new(const struct hantek_6xxx_profile
        }
        devc->coupling_vals = prof->coupling_vals;
        devc->coupling_tab_size = prof->coupling_tab_size;
+       devc->has_coupling = prof->has_coupling;
 
        devc->sample_buf = NULL;
        devc->sample_buf_write = 0;
@@ -241,7 +245,8 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
                                                libusb_get_bus_number(devlist[i]), 0xff, NULL);
                                break;
                        } else if (des.idVendor == dev_profiles[j].fw_vid
-                               && des.idProduct == dev_profiles[j].fw_pid) {
+                               && des.idProduct == dev_profiles[j].fw_pid
+                               && des.bcdDevice == dev_profiles[j].fw_prod_ver) {
                                /* Device matches the post-firmware profile. */
                                prof = &dev_profiles[j];
                                sr_dbg("Found a %s %s.", prof->vendor, prof->model);
@@ -378,7 +383,8 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
                        *data = g_variant_new("(tt)", vdiv[0], vdiv[1]);
                        break;
                case SR_CONF_COUPLING:
-                       *data = g_variant_new_string(devc->coupling_vals[devc->coupling[ch_idx]]);
+                       *data = g_variant_new_string((devc->coupling[ch_idx] \
+                                       == COUPLING_DC) ? "DC" : "AC");
                        break;
                }
        }
@@ -701,7 +707,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
                        PRIu64 " <= %" PRIu64, devc->limit_samples,
                        devc->samp_received);
                send_data(sdi, devc->sample_buf, devc->limit_samples);
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
        } else if (devc->limit_msec && (g_get_monotonic_time() -
                        devc->aq_started) / 1000 >= devc->limit_msec) {
                sr_info("Requested time limit reached, stopping. %d <= %d",
@@ -710,7 +716,7 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer)
                send_data(sdi, devc->sample_buf, devc->samp_received);
                g_free(devc->sample_buf);
                devc->sample_buf = NULL;
-               sdi->driver->dev_acquisition_stop(sdi);
+               sr_dev_acquisition_stop(sdi);
        } else {
                read_channel(sdi, data_amount(sdi));
        }
@@ -810,13 +816,11 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
 {
        struct dev_context *devc;
 
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR;
-
        devc = sdi->priv;
        devc->dev_state = STOPPING;
 
-       g_free(devc->sample_buf); devc->sample_buf = NULL;
+       g_free(devc->sample_buf);
+       devc->sample_buf = NULL;
 
        return SR_OK;
 }