X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fsaleae-logic%2Fsaleae-logic.h;h=e7fe9c00385bfe195e509fc7108d153afcf8844d;hb=c73d2ea421c2b425c3f0ae33bce2bfd0c448ca5f;hp=9ccd8a1a68491dd2cc630ef6f69a6e6c0ec87db0;hpb=9c939c5132d82575cc1ce8f8fef5b6c4289aec5b;p=libsigrok.git

diff --git a/hardware/saleae-logic/saleae-logic.h b/hardware/saleae-logic/saleae-logic.h
index 9ccd8a1a..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,9 +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
@@ -60,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];
@@ -73,8 +71,7 @@ struct fx2_device {
 	 */
 	void *session_data;
 
+	struct sr_usb_device_instance *usb;
 };
 
-
-
-#endif /* SALEAE_LOGIC_H_ */
+#endif