Centralise duplicated logging helper defines.

[libsigrok.git] / hardware / agilent-dmm / agilent-dmm.h

diff --git a/hardware/agilent-dmm/agilent-dmm.h b/hardware/agilent-dmm/agilent-dmm.h
index 179d0013cfb4947102a1c0350484c843344c84d0..2277111f62c3d3ecc74f760af40f7b437dbc3799 100644 (file)
--- 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,10 @@
  * 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
+#define LOG_PREFIX "agilent-dmm"
 
 #define AGDMM_BUFSIZE  256
 
@@ -37,22 +38,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 +77,4 @@ struct agdmm_recv {
 
 SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data);
 
-#endif /* LIBSIGROK_AGILENT_DMM_H */
+#endif