X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fagilent-dmm%2Fagilent-dmm.h;h=43fed2406ef00c3409deb73eb4aca5d98b71336f;hb=5d03743096a1e850c6ccbb1eb902705a62604e80;hp=179d0013cfb4947102a1c0350484c843344c84d0;hpb=b186aa78b8302942c8853c9aed40e3e5eaba8e34;p=libsigrok.git

diff --git a/hardware/agilent-dmm/agilent-dmm.h b/hardware/agilent-dmm/agilent-dmm.h
index 179d0013..43fed240 100644
--- a/hardware/agilent-dmm/agilent-dmm.h
+++ b/hardware/agilent-dmm/agilent-dmm.h
@@ -1,5 +1,5 @@
 /*
- * This file is part of the sigrok project.
+ * This file is part of the libsigrok project.
  *
  * Copyright (C) 2012 Bert Vermeulen <bert@biot.com>
  *
@@ -17,9 +17,17 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef LIBSIGROK_HARDWARE_AGILENT_DMM_AGILENT_DMM_H
+#define LIBSIGROK_HARDWARE_AGILENT_DMM_AGILENT_DMM_H
 
-#ifndef LIBSIGROK_AGILENT_DMM_H
-#define LIBSIGROK_AGILENT_DMM_H
+/* Message logging helpers with subsystem-specific prefix string. */
+#define LOG_PREFIX "agilent-dmm: "
+#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 AGDMM_BUFSIZE  256
 
@@ -37,22 +45,15 @@ enum {
 struct agdmm_profile {
 	int model;
 	const char *modelname;
-	int serial_speed;
 	const struct agdmm_job *jobs;
 	const struct agdmm_recv *recvs;
 };
 
-/* Private driver context. */
-struct drv_context {
-	GSList *instances;
-};
-
 /* Private, per-device-instance driver context. */
 struct dev_context {
 	const struct agdmm_profile *profile;
 	uint64_t limit_samples;
 	uint64_t limit_msec;
-	struct sr_serial_dev_inst *serial;
 
 	/* Opaque pointer passed in by the frontend. */
 	void *cb_data;
@@ -83,4 +84,4 @@ struct agdmm_recv {
 
 SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data);
 
-#endif /* LIBSIGROK_AGILENT_DMM_H */
+#endif