#include "libsigrok.h"
#include "libsigrok-internal.h"
-/* Message logging helpers with subsystem-specific prefix string. */
-#define LOG_PREFIX "ikalogic-scanalogic2: "
-#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 "ikalogic-scanalogic2"
#define VENDOR_NAME "IKALOGIC"
#define MODEL_NAME "Scanalogic-2"
void *cb_data;
- /* Array to provide an index based access to all probes. */
- const struct sr_probe *probes[NUM_PROBES];
+ /* Array to provide an index based access to all channels. */
+ const struct sr_channel *channels[NUM_PROBES];
struct libusb_transfer *xfer_in, *xfer_out;
/* Channel number that is currently processed. */
uint8_t channel;
- /* Number of enabled probes. */
- unsigned int num_enabled_probes;
+ /* Number of enabled channels. */
+ unsigned int num_enabled_channels;
- /* Array to provide a sequential access to all enabled probe indices. */
- uint8_t probe_map[NUM_PROBES];
+ /* Array to provide a sequential access to all enabled channel indices. */
+ uint8_t channel_map[NUM_PROBES];
/* Indicates whether a transfer failed. */
gboolean transfer_error;