X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=hardware%2Fsaleae-logic%2Fsaleae-logic.h;h=e7fe9c00385bfe195e509fc7108d153afcf8844d;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=1dfc39d9f562201ab01508e858a4aed0cbc5ba3a;hpb=b7f09cf86dd57a59dc1bdece2cac9e4a176900b1;p=libsigrok.git

diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index 1dfc39d9..e7fe9c00 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,8 +17,8 @@
  * 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
@@ -59,7 +59,6 @@ struct fx2_device {
 	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];
@@ -71,6 +70,8 @@ struct fx2_device {
 	 * on the session bus along with samples.
 	 */
 	void *session_data;
+
+	struct sr_usb_device_instance *usb;
 };
 
-#endif /* SALEAE_LOGIC_H_ */
+#endif