X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=hardware%2Ffx2lafw%2Ffx2lafw.h;h=41cccc891015b3a1a1fd212d99beddbb9b42fabf;hb=18bc270461d656460db8a167c10d390fe665f3b9;hp=6f6e967e8e875dcdefea3f8ae6b8303dfa97398f;hpb=dc9dbe949a2c195ec0c5afff34bec3cc03a5613b;p=libsigrok.git
diff --git a/hardware/fx2lafw/fx2lafw.h b/hardware/fx2lafw/fx2lafw.h
index 6f6e967e..41cccc89 100644
--- a/hardware/fx2lafw/fx2lafw.h
+++ b/hardware/fx2lafw/fx2lafw.h
@@ -18,11 +18,20 @@
* along with this program. If not, see .
*/
-#include
-
#ifndef LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
#define LIBSIGROK_HARDWARE_FX2LAFW_FX2LAFW_H
+#include
+
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "fx2lafw: "
+#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
+#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
+#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+
#define USB_INTERFACE 0
#define USB_CONFIGURATION 1
#define NUM_TRIGGER_STAGES 4
@@ -60,17 +69,12 @@ 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.
*/