X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fkingst-la2016%2Fprotocol.h;h=ffdd09a242be17d364df7bbfe092797f9f839a50;hb=0fbb464bdf0951228d4430794263bb48bc668821;hp=30bf05782cb65b89cc7682da51abf4482882f4c0;hpb=7de0f6c1ffc52f6f96e2733d66d8d85cf3526000;p=libsigrok.git diff --git a/src/hardware/kingst-la2016/protocol.h b/src/hardware/kingst-la2016/protocol.h index 30bf0578..ffdd09a2 100644 --- a/src/hardware/kingst-la2016/protocol.h +++ b/src/hardware/kingst-la2016/protocol.h @@ -1,6 +1,7 @@ /* * This file is part of the libsigrok project. * + * Copyright (C) 2022 Gerhard Sittig * Copyright (C) 2020 Florian Schmidt * Copyright (C) 2013 Marcus Comstedt * Copyright (C) 2013 Bert Vermeulen @@ -44,10 +45,12 @@ * but libusb does not expose this function. Typically, max size is 2MB. */ #define LA2016_EP6_PKTSZ 512 /* Max packet size of USB endpoint 6. */ -#define LA2016_USB_BUFSZ (256 * 2 * LA2016_EP6_PKTSZ) /* 256KiB buffer. */ +#define LA2016_USB_BUFSZ (512 * 1024) /* 512KiB buffer. */ +#define LA2016_USB_XFER_COUNT 8 /* Size of USB bulk transfers pool. */ /* USB communication timeout during regular operation. */ #define DEFAULT_TIMEOUT_MS 200 +#define CAPTURE_TIMEOUT_MS 500 /* * Check for MCU firmware to take effect after upload. Check the device @@ -67,27 +70,19 @@ #define LA2016_EP2_PADDING 2048 /* - * The complex logic input threshold voltage support with a custom level - * is not operational yet. Ideally we could support the set of pre-made - * voltages with their pretty text labels, and one of them referencing - * a voltage which is user specified. But not all applications support - * this setup equally well, or present it most appropriately to users. - * So let's implement something simpler for the moment until the more - * complex approach becomes accessible in all applications. - * - * Strictly speaking the logic input threshold voltage is a property of - * the "Logic" channel group. Again not all applications support such - * an approach, and like to see them as global device properties. + * Whether the logic input threshold voltage is a config item of the + * "Logic" channel group or a global config item of the device. Ideally + * it would be the former (being strictly related to the Logic channels) + * but mainline applications work better with the latter, and many other + * device drivers implement it that way, too. */ #define WITH_THRESHOLD_DEVCFG 1 -#define WITH_THRESHOLD_SIMPLE 1 -#if !WITH_THRESHOLD_DEVCFG && !WITH_THRESHOLD_SIMPLE -# error "Custom threshold in Logic group is not implemented." -#endif #define LA2016_THR_VOLTAGE_MIN 0.40 #define LA2016_THR_VOLTAGE_MAX 4.00 +/* Properties related to the layout of capture data downloads. */ +#define TRANSFER_PACKET_LENGTH 16 #define LA2016_NUM_SAMPLES_MAX (UINT64_C(10 * 1000 * 1000 * 1000)) /* Maximum device capabilities. May differ between models. */ @@ -96,6 +91,19 @@ #define LA2016_NUM_PWMCH_MAX 2 +/* Streaming mode related thresholds. Not enforced, used for warnings. */ +#define LA2016_STREAM_MBPS_MAX 200 /* In units of Mbps. */ +#define LA2016_STREAM_PUSH_THR 16 /* In units of Mbps. */ +#define LA2016_STREAM_PUSH_IVAL 250 /* In units of ms. */ + +/* + * Whether to de-initialize the device hardware in the driver's close + * callback. It is desirable to e.g. configure PWM channels and leave + * the generator running after the application shuts down. Users can + * always disable channels on their way out if they want to. + */ +#define WITH_DEINIT_IN_CLOSE 0 + #define LA2016_CONVBUFFER_SIZE (4 * 1024 * 1024) struct kingst_model { @@ -123,17 +131,17 @@ struct dev_context { float duty; } pwm_setting[LA2016_NUM_PWMCH_MAX]; size_t threshold_voltage_idx; -#if !WITH_THRESHOLD_SIMPLE - float threshold_voltage; -#endif - uint64_t cur_samplerate; + uint64_t samplerate; struct sr_sw_limits sw_limits; uint64_t capture_ratio; + gboolean continuous; /* Internal acquisition and download state. */ gboolean trigger_involved; + gboolean frame_begin_sent; gboolean completion_seen; gboolean download_finished; + uint32_t packets_per_chunk; struct capture_info { uint32_t n_rep_packets; uint32_t n_rep_packets_before_trigger; @@ -147,11 +155,21 @@ struct dev_context { uint32_t read_pos; struct feed_queue_logic *feed_queue; - struct libusb_transfer *transfer; + GSList *transfers; + size_t transfer_bufsize; + struct stream_state_t { + size_t enabled_count; + uint32_t enabled_mask; + uint32_t channel_masks[32]; + size_t channel_index; + uint32_t sample_data[32]; + uint64_t flush_period_ms; + uint64_t last_flushed; + } stream; }; SR_PRIV int la2016_upload_firmware(const struct sr_dev_inst *sdi, - struct sr_context *sr_ctx, libusb_device *dev, uint16_t product_id); + struct sr_context *sr_ctx, libusb_device *dev, gboolean skip_upload); SR_PRIV int la2016_identify_device(const struct sr_dev_inst *sdi, gboolean show_message); SR_PRIV int la2016_init_hardware(const struct sr_dev_inst *sdi); @@ -162,5 +180,6 @@ SR_PRIV int la2016_setup_acquisition(const struct sr_dev_inst *sdi, SR_PRIV int la2016_start_acquisition(const struct sr_dev_inst *sdi); SR_PRIV int la2016_abort_acquisition(const struct sr_dev_inst *sdi); SR_PRIV int la2016_receive_data(int fd, int revents, void *cb_data); +SR_PRIV void la2016_release_resources(const struct sr_dev_inst *sdi); #endif