X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.h;h=6a96d458b93f40cb2fc1e621b975182aeab390b1;hb=ec888f62fe4298229e6ed0865937d74476715bf7;hp=50cca6280bc47990644a4a0591f28ab2077f0689;hpb=69890f7399f086c38670961dc72166f00de89af6;p=libsigrok.git

diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index 50cca628..6a96d458 100644
--- a/hardware/saleae-logic/saleae-logic.h
+++ b/hardware/saleae-logic/saleae-logic.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the sigrok project.
  *
- * Copyright (C) 2011 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,15 +17,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef SALEAE_LOGIC_H_
-#define SALEAE_LOGIC_H_
+#ifndef LIBSIGROK_HARDWARE_SALEAE_LOGIC_SALEAE_LOGIC_H
+#define LIBSIGROK_HARDWARE_SALEAE_LOGIC_SALEAE_LOGIC_H
 
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
 #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,31 +47,34 @@ struct fx2_profile {
 	int num_probes;
 };
 
-struct fx2_device {
+/* 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 the
-	 * firmware (it re-enumerates into a different device address after the
-	 * upgrade) this is like a global lock. No device will open until a proper
-	 * delay after the last device was upgraded.
+	 * Since we can't keep track of a Saleae Logic device after upgrading
+	 * the firmware (it re-enumerates into a different device address
+	 * after the upgrade) this is like a global lock. No device will open
+	 * until a proper delay after the last device was upgraded.
 	 */
 	GTimeVal fw_updated;
 	/* device/capture settings */
 	uint64_t cur_samplerate;
-	uint64_t period_ps;
 	uint64_t limit_samples;
 	uint8_t probe_mask;
 	uint8_t trigger_mask[NUM_TRIGGER_STAGES];
 	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_device_instance *usb;
+	struct sr_usb_dev_inst *usb;
 };
 
-#endif /* SALEAE_LOGIC_H_ */
+#endif