uni-t-ut32x: Shorten dev_list().

[libsigrok.git] / hardware / fx2lafw / fx2lafw.h

diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 6f6e967e8e875dcdefea3f8ae6b8303dfa97398f..96aa57c37b22c94eadf2d2904edd9004556d9d79 100644 (file)
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -1,7 +1,7 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
- * Copyright (C) 2010-2012 Bert Vermeulen <bert@biot.com>
+ * Copyright (C) 2013 Bert Vermeulen <bert@biot.com>
  * Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
  *
  * This program is free software: you can redistribute it and/or modify
@@ -18,15 +18,24 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <glib.h>
-
 #ifndef LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
 #define LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
 
+#include <glib.h>
+
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "fx2lafw: "
+#define sr_log(l, s, args...) sr_log(l, LOG_PREFIX s, ## args)
+#define sr_spew(s, args...) sr_spew(LOG_PREFIX s, ## args)
+#define sr_dbg(s, args...) sr_dbg(LOG_PREFIX s, ## args)
+#define sr_info(s, args...) sr_info(LOG_PREFIX s, ## args)
+#define sr_warn(s, args...) sr_warn(LOG_PREFIX s, ## args)
+#define sr_err(s, args...) sr_err(LOG_PREFIX s, ## args)
+
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
 #define NUM_TRIGGER_STAGES     4
-#define TRIGGER_TYPES          "01"
+#define TRIGGER_TYPE           "01"
 
 #define MAX_RENUM_DELAY_MS     3000
 #define NUM_SIMUL_TRANSFERS    32
@@ -60,17 +69,11 @@ struct fx2lafw_profile {
        uint32_t dev_caps;
 };
 
-struct drv_context {
-       libusb_context *usb_context;
-       GSList *instances;
-};
-
 struct dev_context {
        const struct fx2lafw_profile *profile;
-
        /*
         * Since we can't keep track of an fx2lafw device after upgrading
-        * the firmware (it re-enumerates into a different device address
+        * the firmware (it renumerates 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.
         */
@@ -80,8 +83,8 @@ struct dev_context {
        uint64_t cur_samplerate;
        uint64_t limit_samples;
 
+       /* Operational settings */
        gboolean sample_wide;
-
        uint16_t trigger_mask[NUM_TRIGGER_STAGES];
        uint16_t trigger_value[NUM_TRIGGER_STAGES];
        int trigger_stage;
@@ -91,12 +94,10 @@ struct dev_context {
        int submitted_transfers;
        int empty_transfer_count;
 
-       void *session_dev_id;
-
-       struct sr_usb_dev_inst *usb;
-
+       void *cb_data;
        unsigned int num_transfers;
        struct libusb_transfer **transfers;
+       int *usbfd;
 };
 
 #endif