X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fvictor-dmm%2Fprotocol.h;h=8f12680314e0a1fe75aa0236eb4177b4a7687f7c;hb=67bd805523f52030a6459786388ce3385be00501;hp=cab7777402c8c19b78bcacf0a01527a318572666;hpb=7a36037546aaf11b91ff5d63fbd571e15407e357;p=libsigrok.git

diff --git a/hardware/victor-dmm/protocol.h b/hardware/victor-dmm/protocol.h
index cab77774..8f126803 100644
--- a/hardware/victor-dmm/protocol.h
+++ b/hardware/victor-dmm/protocol.h
@@ -24,14 +24,9 @@
 #include "libsigrok.h"
 #include "libsigrok-internal.h"
 
-/* Message logging helpers with driver-specific prefix string. */
-#define DRIVER_LOG_DOMAIN "victor-dmm: "
-#define sr_log(l, s, args...) sr_log(l, DRIVER_LOG_DOMAIN s, ## args)
-#define sr_spew(s, args...) sr_spew(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_dbg(s, args...) sr_dbg(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_info(s, args...) sr_info(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_warn(s, args...) sr_warn(DRIVER_LOG_DOMAIN s, ## args)
-#define sr_err(s, args...) sr_err(DRIVER_LOG_DOMAIN s, ## args)
+#define LOG_PREFIX "victor-dmm"
+
+#define DMM_DATA_SIZE 14
 
 /** Private, per-device-instance driver context. */
 struct dev_context {
@@ -47,12 +42,8 @@ struct dev_context {
 	/** The current number of already received samples. */
 	uint64_t num_samples;
 	gint64 end_time;
-
-	struct sr_usb_dev_inst *usb;
-	/* Only requires 3 really. */
-	int usbfd[10];
 };
 
-SR_PRIV int victor_dmm_receive_data(int fd, int revents, void *cb_data);
+SR_PRIV int victor_dmm_receive_data(struct sr_dev_inst *sdi, unsigned char *buf);
 
 #endif