asix-sigma: rework scan for USB devices, add support for conn= specs

[libsigrok.git] / src / hardware / asix-sigma / protocol.h

diff --git a/src/hardware/asix-sigma/protocol.h b/src/hardware/asix-sigma/protocol.h
index 388b44bc9f659e0b96838dce8f35fda368781357..929c930c63a2bcbed8b45c1b6232fb6cb829d336 100644 (file)
--- a/src/hardware/asix-sigma/protocol.h
+++ b/src/hardware/asix-sigma/protocol.h
@@ -30,6 +30,8 @@
 #include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
+#define LOG_PREFIX "asix-sigma"
+
 /*
  * Triggers are not working in this implementation. Stop claiming
  * support for the feature which effectively is not available, until
@@ -38,13 +40,18 @@
  */
 #define ASIX_SIGMA_WITH_TRIGGER        0
 
-#define LOG_PREFIX "asix-sigma"
+/* Experimental support for OMEGA (scan only, operation is ENOIMPL). */
+#define ASIX_WITH_OMEGA 0
 
-#define USB_VENDOR                     0xa600
-#define USB_PRODUCT                    0xa000
-#define USB_DESCRIPTION                        "ASIX SIGMA"
-#define USB_VENDOR_NAME                        "ASIX"
-#define USB_MODEL_NAME                 "SIGMA"
+#define USB_VENDOR_ASIX                        0xa600
+#define USB_PRODUCT_SIGMA              0xa000
+#define USB_PRODUCT_OMEGA              0xa004
+
+enum asix_device_type {
+       ASIX_TYPE_NONE,
+       ASIX_TYPE_SIGMA,
+       ASIX_TYPE_OMEGA,
+};
 
 enum sigma_write_register {
        WRITE_CLOCK_SELECT      = 0,
@@ -248,26 +255,31 @@ struct sigma_state {
                SIGMA_UNINITIALIZED = 0,
                SIGMA_IDLE,
                SIGMA_CAPTURE,
+               SIGMA_STOPPING,
                SIGMA_DOWNLOAD,
        } state;
-
        uint16_t lastts;
        uint16_t lastsample;
 };
 
-/* Private, per-device-instance driver context. */
 struct dev_context {
+       struct {
+               uint16_t vid, pid;
+               uint32_t serno;
+               uint16_t prefix;
+               enum asix_device_type type;
+       } id;
        struct ftdi_context ftdic;
        uint64_t cur_samplerate;
        uint64_t limit_msec;
        uint64_t limit_samples;
        uint64_t sent_samples;
-       struct timeval start_tv;
+       uint64_t start_time;
        int cur_firmware;
        int num_channels;
        int cur_channels;
        int samples_per_event;
-       int capture_ratio;
+       uint64_t capture_ratio;
        struct sigma_trigger trigger;
        int use_triggers;
        struct sigma_state state;
@@ -276,11 +288,10 @@ struct dev_context {
 extern SR_PRIV const uint64_t samplerates[];
 extern SR_PRIV const size_t samplerates_count;
 
-SR_PRIV int sigma_write_register(uint8_t reg, uint8_t *data, size_t len, 
+SR_PRIV int sigma_write_register(uint8_t reg, uint8_t *data, size_t len,
                                 struct dev_context *devc);
 SR_PRIV int sigma_set_register(uint8_t reg, uint8_t value, struct dev_context *devc);
 SR_PRIV int sigma_write_trigger_lut(struct triggerlut *lut, struct dev_context *devc);
-SR_PRIV void sigma_clear_helper(void *priv);
 SR_PRIV uint64_t sigma_limit_samples_to_msec(const struct dev_context *devc,
                                             uint64_t limit_samples);
 SR_PRIV int sigma_set_samplerate(const struct sr_dev_inst *sdi, uint64_t samplerate);