agilent-dmm: Use sr_dev_inst to store connection handle

[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 978e13fabe9ce20e332a177e03290bd3ab8930d2..f3922a1fe9b314be86e46bfbf65cf08468daf2b4 100644 (file)
--- a/hardware/agilent-dmm/agilent-dmm.h
+++ b/hardware/agilent-dmm/agilent-dmm.h
@@ -21,33 +21,40 @@
 #ifndef LIBSIGROK_AGILENT_DMM_H
 #define LIBSIGROK_AGILENT_DMM_H
 
+/* Message logging helpers with driver-specific prefix string. */
+#define DRIVER_LOG_DOMAIN "agilent-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 AGDMM_BUFSIZE  256
 
 /* Supported models */
 enum {
-       AGILENT_U1232A = 1,
+       AGILENT_U1231A = 1,
+       AGILENT_U1232A,
+       AGILENT_U1233A,
+       AGILENT_U1251A,
+       AGILENT_U1252A,
+       AGILENT_U1253A,
 };
 
 /* Supported device profiles */
 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;