Centralise duplicated logging helper defines.

[libsigrok.git] / hardware / lascar-el-usb / protocol.h

diff --git a/hardware/lascar-el-usb/protocol.h b/hardware/lascar-el-usb/protocol.h
index be27f69cd9bd105bcd61cd4e9dfaef5c53ab48e9..4386ef4b5214e5c4afe1e16be1ecb25e85be087a 100644 (file)
--- a/hardware/lascar-el-usb/protocol.h
+++ b/hardware/lascar-el-usb/protocol.h
@@ -24,14 +24,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "lascar-el-usb: "
-#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 LOG_PREFIX "lascar-el-usb"
 
 #define LASCAR_VENDOR "Lascar"
 #define LASCAR_INTERFACE 0
@@ -45,7 +38,6 @@
 struct dev_context {
        void *cb_data;
        const struct elusb_profile *profile;
-       int usbfd[10];
        /* Generic EL-USB */
        unsigned char config[MAX_CONFIGBLOCK_SIZE];
        unsigned int log_size;