Replace 'probe' with 'channel' in most places.

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

diff --git a/hardware/fx2lafw/protocol.h b/hardware/fx2lafw/protocol.h
index 5ccf8c1c208c01bc7475113eac555c9a14741b53..25a8c56a29e42e6d1e0dc5fd77de353a7752962e 100644 (file)
--- a/hardware/fx2lafw/protocol.h
+++ b/hardware/fx2lafw/protocol.h
@@ -29,14 +29,7 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.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 LOG_PREFIX "fx2lafw"
 
 #define USB_INTERFACE          0
 #define USB_CONFIGURATION      1
@@ -103,14 +96,14 @@ struct dev_context {
        void *cb_data;
        unsigned int num_transfers;
        struct libusb_transfer **transfers;
-       int *usbfd;
+       struct sr_context *ctx;
 };
 
 SR_PRIV int fx2lafw_command_start_acquisition(libusb_device_handle *devhdl,
                uint64_t samplerate, gboolean samplewide);
 SR_PRIV gboolean fx2lafw_check_conf_profile(libusb_device *dev);
 SR_PRIV int fx2lafw_dev_open(struct sr_dev_inst *sdi, struct sr_dev_driver *di);
-SR_PRIV int fx2lafw_configure_probes(const struct sr_dev_inst *sdi);
+SR_PRIV int fx2lafw_configure_channels(const struct sr_dev_inst *sdi);
 SR_PRIV struct dev_context *fx2lafw_dev_new(void);
 SR_PRIV void fx2lafw_abort_acquisition(struct dev_context *devc);
 SR_PRIV void fx2lafw_receive_transfer(struct libusb_transfer *transfer);