sr/cli/gtk/qt: s/device/dev/ in many places.

[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 9ccd8a1a68491dd2cc630ef6f69a6e6c0ec87db0..5b8f489c2857b9ca8c7b22c31ce1406985ed716a 100644 (file)
--- 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
@@ -49,18 +48,17 @@ struct fx2_profile {
        int num_probes;
 };
 
-struct fx2_device {
+struct fx2_dev {
        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];
@@ -73,8 +71,7 @@ struct fx2_device {
         */
        void *session_data;
 
+       struct sr_usb_dev_inst *usb;
 };
 
-
-
-#endif /* SALEAE_LOGIC_H_ */
+#endif