salae: Only terminate session after all transfers have been aborted

[libsigrok.git] / hardware / saleae-logic / saleae-logic.h

diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index 5b8f489c2857b9ca8c7b22c31ce1406985ed716a..6a96d458b93f40cb2fc1e621b975182aeab390b1 100644 (file)
--- a/hardware/saleae-logic/saleae-logic.h
+++ b/hardware/saleae-logic/saleae-logic.h
@@ -25,7 +25,6 @@
 #define NUM_TRIGGER_STAGES     4
 #define TRIGGER_TYPES          "01"
 #define FIRMWARE               FIRMWARE_DIR "/saleae-logic.fw"
-#define GTV_TO_MSEC(gtv)       (gtv.tv_sec * 1000 + gtv.tv_usec / 1000)
 
 /* delay in ms */
 #define MAX_RENUM_DELAY        3000
@@ -48,7 +47,8 @@ struct fx2_profile {
        int num_probes;
 };
 
-struct fx2_dev {
+/* Private, per-device-instance driver context. */
+struct context {
        struct fx2_profile *profile;
        /*
         * Since we can't keep track of a Saleae Logic device after upgrading
@@ -65,11 +65,14 @@ struct fx2_dev {
        uint8_t trigger_value[NUM_TRIGGER_STAGES];
        int trigger_stage;
        uint8_t trigger_buffer[NUM_TRIGGER_STAGES];
+       int num_samples;
+       int submitted_transfers;
+
        /*
         * opaque session data passed in by the frontend, will be passed back
         * on the session bus along with samples.
         */
-       void *session_data;
+       void *session_dev_id;
 
        struct sr_usb_dev_inst *usb;
 };