udev rules file: Only list supported devices.

[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 9af01f3e2a68d94c3b149657e5291a9d8fbdf161..ec18c3dae42387d4a73dca0aa67b88ba575cefe6 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>
  *
@@ -21,33 +21,40 @@
 #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
 
 /* 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;
@@ -58,10 +65,12 @@ struct dev_context {
        unsigned char buf[AGDMM_BUFSIZE];
        int buflen;
        int cur_mq;
-       int cur_mq_unit;
-       int cur_mq_flags;
+       int cur_unit;
+       int cur_mqflags;
        int cur_divider;
        int cur_acdc;
+       int mode_tempaux;
+       int mode_continuity;
 };
 
 struct agdmm_job {