Rename 'struct sr_probe' to 'struct sr_channel' everywhere.

[libsigrok.git] / hardware / ikalogic-scanalogic2 / protocol.h

diff --git a/hardware/ikalogic-scanalogic2/protocol.h b/hardware/ikalogic-scanalogic2/protocol.h
index 1756ed966e56d30af8e642f363f16ba041591dc2..6cdb607254a0d10b3eb69649d57133ff05ac5567 100644 (file)
--- a/hardware/ikalogic-scanalogic2/protocol.h
+++ b/hardware/ikalogic-scanalogic2/protocol.h
@@ -27,14 +27,7 @@
 #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"
@@ -49,6 +42,7 @@
 #define USB_REQUEST_TYPE_OUT           (LIBUSB_REQUEST_TYPE_CLASS | \
        LIBUSB_RECIPIENT_INTERFACE | LIBUSB_ENDPOINT_OUT)
 
+#define USB_HID_GET_REPORT             0x01
 #define USB_HID_SET_REPORT             0x09
 #define USB_HID_REPORT_TYPE_FEATURE    0x300
 
@@ -158,10 +152,7 @@ struct dev_context {
        void *cb_data;
 
        /* Array to provide an index based access to all probes. */
-       const struct sr_probe *probes[NUM_PROBES];
-
-       unsigned int num_usbfd;
-       int *usbfd;
+       const struct sr_channel *probes[NUM_PROBES];
 
        struct libusb_transfer *xfer_in, *xfer_out;