X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fikalogic-scanalogic2%2Fprotocol.h;h=add5dda89553dfcff8b36e40693f4789a5fd8841;hb=625763e2c2b69f79b950ad0b0cd8b779500f5d95;hp=1756ed966e56d30af8e642f363f16ba041591dc2;hpb=79914b3a62adb1b0b054d23c2721ce80eb7ba9ea;p=libsigrok.git

diff --git a/hardware/ikalogic-scanalogic2/protocol.h b/hardware/ikalogic-scanalogic2/protocol.h
index 1756ed96..add5dda8 100644
--- 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
 
@@ -160,9 +154,6 @@ struct dev_context {
 	/* Array to provide an index based access to all probes. */
 	const struct sr_probe *probes[NUM_PROBES];
 
-	unsigned int num_usbfd;
-	int *usbfd;
-
 	struct libusb_transfer *xfer_in, *xfer_out;
 
 	/*