X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fhantek-6xxx%2Fapi.c;h=408d1fcdcc03ec026edd2a57ba9c140855d7c9d2;hb=713a3f352496f928b9911bfdc7e87a67134113df;hp=1d600648ce15420124a89da34f32cd537d9d91a4;hpb=c01bf34ca264b268fee2e71ab918c71d28dc3018;p=libsigrok.git diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c index 1d600648..408d1fcd 100644 --- a/src/hardware/hantek-6xxx/api.c +++ b/src/hardware/hantek-6xxx/api.c @@ -18,12 +18,13 @@ */ #include +#include #include "protocol.h" /* Max time in ms before we want to check on USB events */ #define TICK 200 -#define RANGE(ch) (((float)vdivs[devc->voltage[ch]][0] / vdivs[devc->voltage[ch]][1]) * VDIV_MULTIPLIER) +#define RANGE(ch) (((float)devc->vdivs[devc->voltage[ch]][0] / devc->vdivs[devc->voltage[ch]][1]) * VDIV_MULTIPLIER) static const uint32_t scanopts[] = { SR_CONF_CONN, @@ -35,57 +36,100 @@ 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[] = { - SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; static const char *channel_names[] = { "CH1", "CH2", }; -static const char *coupling[] = { +static const char *dc_coupling[] = { + "DC", +}; + +static const char *acdc_coupling[] = { "AC", "DC", }; -static const struct hantek_6xxx_profile dev_profiles[] = { - { - 0x04b4, 0x6022, 0x04b5, 0x6022, - "Hantek", "6022BE", "hantek-6022be.fw", - }, - { - 0x8102, 0x8102, 0x1D50, 0x608E, - "Sainsmart", "DDS120", "sainsmart-dds120.fw", - }, - ALL_ZERO +static const uint64_t vdivs[][2] = { + VDIV_VALUES +}; + +static const uint64_t vdivs_instrustar[][2] = { + VDIV_VALUES_INSTRUSTAR }; static const uint64_t samplerates[] = { SAMPLERATE_VALUES }; -static const uint64_t vdivs[][2] = { - VDIV_VALUES +static const struct hantek_6xxx_profile dev_profiles[] = { + { + /* Windows: "Hantek6022BE DRIVER 1": 04b4:6022 */ + 0x04b4, 0x6022, 0x1d50, 0x608e, 0x0001, + "Hantek", "6022BE", "fx2lafw-hantek-6022be.fw", + ARRAY_AND_SIZE(dc_coupling), FALSE, + ARRAY_AND_SIZE(vdivs), + }, + { + /* Windows: "Hantek6022BE DRIVER 2": 04b5:6022 */ + 0x04b5, 0x6022, 0x1d50, 0x608e, 0x0001, + "Hantek", "6022BE", "fx2lafw-hantek-6022be.fw", + ARRAY_AND_SIZE(dc_coupling), FALSE, + ARRAY_AND_SIZE(vdivs), + }, + { + 0x8102, 0x8102, 0x1d50, 0x608e, 0x0002, + "Sainsmart", "DDS120", "fx2lafw-sainsmart-dds120.fw", + ARRAY_AND_SIZE(acdc_coupling), TRUE, + ARRAY_AND_SIZE(vdivs), + }, + { + /* Windows: "Hantek6022BL DRIVER 1": 04b4:602a */ + 0x04b4, 0x602a, 0x1d50, 0x608e, 0x0003, + "Hantek", "6022BL", "fx2lafw-hantek-6022bl.fw", + ARRAY_AND_SIZE(dc_coupling), FALSE, + ARRAY_AND_SIZE(vdivs), + }, + { + /* Windows: "Hantek6022BL DRIVER 2": 04b5:602a */ + 0x04b5, 0x602a, 0x1d50, 0x608e, 0x0003, + "Hantek", "6022BL", "fx2lafw-hantek-6022bl.fw", + ARRAY_AND_SIZE(dc_coupling), FALSE, + ARRAY_AND_SIZE(vdivs), + }, + { + 0xd4a2, 0x5660, 0x1d50, 0x608e, 0x0004, + "YiXingDianZi", "MDSO", "fx2lafw-yixingdianzi-mdso.fw", + ARRAY_AND_SIZE(dc_coupling), FALSE, + ARRAY_AND_SIZE(vdivs), + }, + { + /*"InstrustarISDS205": d4a2:5661 */ + 0xd4a2, 0x5661, 0x1d50, 0x608e, 0x0005, + "Instrustar", "ISDS205B", "fx2lafw-instrustar-isds205b.fw", + ARRAY_AND_SIZE(acdc_coupling), TRUE, + ARRAY_AND_SIZE(vdivs_instrustar), + }, + ALL_ZERO }; -SR_PRIV struct sr_dev_driver hantek_6xxx_driver_info; 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; struct sr_channel *ch; struct sr_channel_group *cg; - struct drv_context *drvc; struct dev_context *devc; unsigned int i; @@ -93,7 +137,6 @@ static struct sr_dev_inst *hantek_6xxx_dev_new(const struct hantek_6xxx_profile sdi->status = SR_ST_INITIALIZING; sdi->vendor = g_strdup(prof->vendor); sdi->model = g_strdup(prof->model); - sdi->driver = &hantek_6xxx_driver_info; for (i = 0; i < ARRAY_SIZE(channel_names); i++) { ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, channel_names[i]); @@ -110,18 +153,17 @@ static struct sr_dev_inst *hantek_6xxx_dev_new(const struct hantek_6xxx_profile devc->voltage[i] = DEFAULT_VOLTAGE; devc->coupling[i] = DEFAULT_COUPLING; } - - devc->sample_buf = NULL; - devc->sample_buf_write = 0; - devc->sample_buf_size = 0; + devc->coupling_vals = prof->coupling_vals; + devc->coupling_tab_size = prof->coupling_tab_size; + devc->has_coupling = prof->has_coupling; + devc->vdivs = prof->vdivs; + devc->vdivs_size = prof->vdivs_size; devc->profile = prof; devc->dev_state = IDLE; devc->samplerate = DEFAULT_SAMPLERATE; sdi->priv = devc; - drvc = sdi->driver->context; - drvc->instances = g_slist_append(drvc->instances, sdi); return sdi; } @@ -149,23 +191,14 @@ static int configure_channels(const struct sr_dev_inst *sdi) return SR_OK; } -static void clear_dev_context(void *priv) +static void clear_helper(struct dev_context *devc) { - struct dev_context *devc; - - devc = priv; g_slist_free(devc->enabled_channels); - g_free(devc); } static int dev_clear(const struct sr_dev_driver *di) { - return std_dev_clear(di, clear_dev_context); -} - -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); + return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper); } static GSList *scan(struct sr_dev_driver *di, GSList *options) @@ -219,10 +252,11 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) libusb_get_device_descriptor(devlist[i], &des); - usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)); + if (usb_get_port_path(devlist[i], connection_id, sizeof(connection_id)) < 0) + continue; prof = NULL; - for (j = 0; j < (int)ARRAY_SIZE(dev_profiles); j++) { + for (j = 0; dev_profiles[j].orig_vid; j++) { if (des.idVendor == dev_profiles[j].orig_vid && des.idProduct == dev_profiles[j].orig_pid) { /* Device matches the pre-firmware profile. */ @@ -233,17 +267,19 @@ 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); 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); @@ -264,7 +300,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) } libusb_free_device_list(devlist, 1); - return devices; + return std_scan_complete(di, devices); } static int dev_open(struct sr_dev_inst *sdi) @@ -309,7 +345,7 @@ static int dev_open(struct sr_dev_inst *sdi) err = libusb_claim_interface(usb->devhdl, USB_INTERFACE); if (err != 0) { sr_err("Unable to claim interface: %s.", - libusb_error_name(err)); + libusb_error_name(err)); return SR_ERR; } @@ -323,25 +359,25 @@ static int dev_close(struct sr_dev_inst *sdi) return SR_OK; } -static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; struct sr_usb_dev_inst *usb; - char str[128]; const uint64_t *vdiv; int ch_idx; + if (!sdi) + return SR_ERR_ARG; + + devc = sdi->priv; + switch (key) { case SR_CONF_NUM_VDIV: - *data = g_variant_new_int32(ARRAY_SIZE(vdivs)); + *data = g_variant_new_int32(devc->vdivs_size); break; } - if (!sdi) - return SR_ERR_ARG; - - devc = sdi->priv; if (!cg) { switch (key) { case SR_CONF_SAMPLERATE: @@ -361,8 +397,7 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s /* Device still needs to re-enumerate after firmware * upload, so we don't know its (future) address. */ return SR_ERR; - snprintf(str, 128, "%d.%d", usb->bus, usb->address); - *data = g_variant_new_string(str); + *data = g_variant_new_printf("%d.%d", usb->bus, usb->address); break; default: return SR_ERR_NA; @@ -376,11 +411,12 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return SR_ERR_ARG; switch (key) { case SR_CONF_VDIV: - vdiv = vdivs[devc->voltage[ch_idx]]; + vdiv = devc->vdivs[devc->voltage[ch_idx]]; *data = g_variant_new("(tt)", vdiv[0], vdiv[1]); break; case SR_CONF_COUPLING: - *data = g_variant_new_string(coupling[devc->coupling[ch_idx]]); + *data = g_variant_new_string((devc->coupling[ch_idx] \ + == COUPLING_DC) ? "DC" : "AC"); break; } } @@ -388,19 +424,12 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s return SR_OK; } -static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_set(uint32_t key, GVariant *data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; - uint64_t p, q; - int tmp_int, ch_idx, ret; - unsigned int i; - const char *tmp_str; + int ch_idx, idx; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - ret = SR_OK; devc = sdi->priv; if (!cg) { switch (key) { @@ -415,8 +444,7 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd devc->limit_samples = g_variant_get_uint64(data); break; default: - ret = SR_ERR_NA; - break; + return SR_ERR_NA; } } else { if (sdi->channel_groups->data == cg) @@ -427,74 +455,40 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd return SR_ERR_ARG; switch (key) { case SR_CONF_VDIV: - g_variant_get(data, "(tt)", &p, &q); - tmp_int = -1; - for (i = 0; i < ARRAY_SIZE(vdivs); i++) { - if (vdivs[i][0] == p && vdivs[i][1] == q) { - tmp_int = i; - break; - } - } - if (tmp_int >= 0) { - devc->voltage[ch_idx] = tmp_int; - hantek_6xxx_update_vdiv(sdi); - } else - ret = SR_ERR_ARG; + if ((idx = std_u64_tuple_idx(data, devc->vdivs, devc->vdivs_size)) < 0) + return SR_ERR_ARG; + devc->voltage[ch_idx] = idx; + hantek_6xxx_update_vdiv(sdi); break; case SR_CONF_COUPLING: - tmp_str = g_variant_get_string(data, NULL); - for (i = 0; coupling[i]; i++) { - if (!strcmp(tmp_str, coupling[i])) { - devc->coupling[ch_idx] = i; - break; - } - } - if (coupling[i] == 0) - ret = SR_ERR_ARG; + if ((idx = std_str_idx(data, devc->coupling_vals, + devc->coupling_tab_size)) < 0) + return SR_ERR_ARG; + devc->coupling[ch_idx] = idx; + hantek_6xxx_update_coupling(sdi); break; default: - ret = SR_ERR_NA; - break; + return SR_ERR_NA; } } - return ret; + return SR_OK; } -static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *cg) +static int config_list(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - GVariant *tuple, *rational[2]; - GVariantBuilder gvb; - unsigned int i; - GVariant *gvar; - - if (key == SR_CONF_SCAN_OPTIONS) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - return SR_OK; - } else if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); - return SR_OK; - } + struct dev_context *devc; - if (!sdi) - return SR_ERR_ARG; + devc = (sdi) ? sdi->priv : NULL; if (!cg) { switch (key) { + case SR_CONF_SCAN_OPTIONS: case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_SAMPLERATE: - g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); - gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), - samplerates, ARRAY_SIZE(samplerates), - sizeof(uint64_t)); - g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar); - *data = g_variant_builder_end(&gvb); + *data = std_gvar_samplerates(ARRAY_AND_SIZE(samplerates)); break; default: return SR_ERR_NA; @@ -502,21 +496,17 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * } else { switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(uint32_t)); + *data = std_gvar_array_u32(ARRAY_AND_SIZE(devopts_cg)); break; case SR_CONF_COUPLING: - *data = g_variant_new_strv(coupling, ARRAY_SIZE(coupling)); + if (!devc) + return SR_ERR_ARG; + *data = g_variant_new_strv(devc->coupling_vals, devc->coupling_tab_size); break; case SR_CONF_VDIV: - g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY); - for (i = 0; i < ARRAY_SIZE(vdivs); i++) { - rational[0] = g_variant_new_uint64(vdivs[i][0]); - rational[1] = g_variant_new_uint64(vdivs[i][1]); - tuple = g_variant_new_tuple(rational, 2); - g_variant_builder_add_value(&gvb, tuple); - } - *data = g_variant_builder_end(&gvb); + if (!devc) + return SR_ERR_ARG; + *data = std_gvar_tuple_array(devc->vdivs,devc->vdivs_size); break; default: return SR_ERR_NA; @@ -530,7 +520,7 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * static uint32_t data_amount(const struct sr_dev_inst *sdi) { struct dev_context *devc = sdi->priv; - uint32_t data_left; + uint32_t data_left, data_left_2, i; int32_t time_left; if (devc->limit_msec) { @@ -542,88 +532,78 @@ static uint32_t data_amount(const struct sr_dev_inst *sdi) data_left = devc->samplerate * NUM_CHANNELS; } - data_left += MIN_PACKET_SIZE; /* Driver does not handle small buffers. */ + /* Round up to nearest power of two. */ + for (i = MIN_PACKET_SIZE; i < data_left; i *= 2) + ; + data_left_2 = i; - sr_spew("data_amount %u", data_left); + sr_spew("data_amount: %u (rounded to power of 2: %u)", data_left, data_left_2); - return data_left; + return data_left_2; } static void send_chunk(struct sr_dev_inst *sdi, unsigned char *buf, int num_samples) { struct sr_datafeed_packet packet; - struct sr_datafeed_analog_old analog; + struct sr_datafeed_analog analog; + struct sr_analog_encoding encoding; + struct sr_analog_meaning meaning; + struct sr_analog_spec spec; struct dev_context *devc = sdi->priv; - int num_channels, data_offset, i; + GSList *channels = devc->enabled_channels; - const float ch1_bit = RANGE(0) / 255; - const float ch2_bit = RANGE(1) / 255; - const float ch1_center = RANGE(0) / 2; - const float ch2_center = RANGE(1) / 2; + const float ch_bit[] = { RANGE(0) / 255, RANGE(1) / 255 }; + const float ch_center[] = { RANGE(0) / 2, RANGE(1) / 2 }; - const gboolean ch1_ena = !!devc->ch_enabled[0]; - const gboolean ch2_ena = !!devc->ch_enabled[1]; + sr_analog_init(&analog, &encoding, &meaning, &spec, 0); - num_channels = (ch1_ena && ch2_ena) ? 2 : 1; - packet.type = SR_DF_ANALOG_OLD; + packet.type = SR_DF_ANALOG; packet.payload = &analog; - analog.channels = devc->enabled_channels; analog.num_samples = num_samples; - analog.mq = SR_MQ_VOLTAGE; - analog.unit = SR_UNIT_VOLT; - analog.mqflags = 0; + analog.meaning->mq = SR_MQ_VOLTAGE; + analog.meaning->unit = SR_UNIT_VOLT; + analog.meaning->mqflags = 0; - analog.data = g_try_malloc(analog.num_samples * sizeof(float) * num_channels); + analog.data = g_try_malloc(num_samples * sizeof(float)); if (!analog.data) { sr_err("Analog data buffer malloc failed."); devc->dev_state = STOPPING; return; } - data_offset = 0; - for (i = 0; i < num_samples; i++) { - /* - * The device always sends data for both channels. If a channel - * is disabled, it contains a copy of the enabled channel's - * data. However, we only send the requested channels to - * the bus. - * - * Voltage values are encoded as a value 0-255, where the - * value is a point in the range represented by the vdiv - * setting. There are 10 vertical divs, so e.g. 500mV/div - * represents 5V peak-to-peak where 0 = -2.5V and 255 = +2.5V. - */ - if (ch1_ena) - analog.data[data_offset++] = (ch1_bit * *(buf + i * 2) - ch1_center); - if (ch2_ena) - analog.data[data_offset++] = (ch2_bit * *(buf + i * 2 + 1) - ch2_center); - } - - sr_session_send(sdi, &packet); - g_free(analog.data); -} + for (int ch = 0; ch < NUM_CHANNELS; ch++) { + if (!devc->ch_enabled[ch]) + continue; -static void send_data(struct sr_dev_inst *sdi, struct libusb_transfer *buf[], uint64_t samples) -{ - int i = 0; - uint64_t send = 0; - uint32_t chunk; + float vdivlog = log10f(ch_bit[ch]); + int digits = -(int)vdivlog + (vdivlog < 0.0); + analog.encoding->digits = digits; + analog.spec->spec_digits = digits; + analog.meaning->channels = g_slist_append(NULL, channels->data); + + for (int i = 0; i < num_samples; i++) { + /* + * The device always sends data for both channels. If a channel + * is disabled, it contains a copy of the enabled channel's + * data. However, we only send the requested channels to + * the bus. + * + * Voltage values are encoded as a value 0-255, where the + * value is a point in the range represented by the vdiv + * setting. There are 10 vertical divs, so e.g. 500mV/div + * represents 5V peak-to-peak where 0 = -2.5V and 255 = +2.5V. + */ + ((float *)analog.data)[i] = ch_bit[ch] * *(buf + i * 2 + ch) - ch_center[ch]; + } - while (send < samples) { - chunk = MIN(samples - send, (uint64_t)(buf[i]->actual_length / NUM_CHANNELS)); - send += chunk; - send_chunk(sdi, buf[i]->buffer, chunk); + sr_session_send(sdi, &packet); + g_slist_free(analog.meaning->channels); - /* - * Everything in this transfer was either copied to the buffer - * or sent to the session bus. - */ - g_free(buf[i]->buffer); - libusb_free_transfer(buf[i]); - i++; + channels = channels->next; } + g_free(analog.data); } /* @@ -652,26 +632,6 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) if (devc->dev_state != CAPTURE) return; - if (!devc->sample_buf) { - devc->sample_buf_size = 10; - devc->sample_buf = g_try_malloc(devc->sample_buf_size * sizeof(transfer)); - devc->sample_buf_write = 0; - } - - if (devc->sample_buf_write >= devc->sample_buf_size) { - devc->sample_buf_size += 10; - devc->sample_buf = g_try_realloc(devc->sample_buf, - devc->sample_buf_size * sizeof(transfer)); - if (!devc->sample_buf) { - sr_err("Sample buffer malloc failed."); - devc->dev_state = STOPPING; - return; - } - } - - devc->sample_buf[devc->sample_buf_write++] = transfer; - devc->samp_received += transfer->actual_length / NUM_CHANNELS; - sr_spew("receive_transfer(): calculated samplerate == %" PRIu64 "ks/s", (uint64_t)(transfer->actual_length * 1000 / (g_get_monotonic_time() - devc->read_start_ts + 1) / @@ -684,21 +644,24 @@ static void LIBUSB_CALL receive_transfer(struct libusb_transfer *transfer) /* Nothing to send to the bus. */ return; + unsigned samples_received = transfer->actual_length / NUM_CHANNELS; + send_chunk(sdi, transfer->buffer, samples_received); + devc->samp_received += samples_received; + + g_free(transfer->buffer); + libusb_free_transfer(transfer); + if (devc->limit_samples && devc->samp_received >= devc->limit_samples) { sr_info("Requested number of samples reached, stopping. %" 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", (uint32_t)devc->limit_msec, (uint32_t)(g_get_monotonic_time() - devc->aq_started) / 1000); - 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)); } @@ -714,7 +677,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; } @@ -750,7 +712,7 @@ static int handle_event(int fd, int revents, void *cb_data) */ usb_source_remove(sdi->session, drvc->sr_ctx); - std_session_send_df_end(sdi, LOG_PREFIX); + std_session_send_df_end(sdi); devc->dev_state = IDLE; @@ -766,9 +728,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct sr_dev_driver *di = sdi->driver; struct drv_context *drvc = di->context; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; if (configure_channels(sdi) != SR_OK) { @@ -779,7 +738,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) if (hantek_6xxx_init(sdi) != SR_OK) return SR_ERR; - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); devc->samp_received = 0; devc->dev_state = FLUSH; @@ -798,22 +757,17 @@ 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; - return SR_OK; } -SR_PRIV struct sr_dev_driver hantek_6xxx_driver_info = { +static struct sr_dev_driver hantek_6xxx_driver_info = { .name = "hantek-6xxx", .longname = "Hantek 6xxx", .api_version = 1, - .init = init, + .init = std_init, .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list, @@ -827,3 +781,4 @@ SR_PRIV struct sr_dev_driver hantek_6xxx_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(hantek_6xxx_driver_info);