agilent-dmm: don't log anything if no conn params given

[libsigrok.git] / hardware / agilent-dmm / api.c

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index 06d2ba04273d7a6e8408f8f6d89db021e7b1e19d..da5cad6f9e89e099b54d1cf1d323fc58308d73d0 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -47,11 +47,18 @@ static const char *probe_names[] = {
        NULL,
 };
 
-extern const struct agdmm_job agdmm_u123x_jobs[];
-extern const struct agdmm_recv agdmm_recvs[];
+extern const struct agdmm_job agdmm_jobs_u123x[];
+extern const struct agdmm_recv agdmm_recvs_u123x[];
+extern const struct agdmm_job agdmm_jobs_u125x[];
+extern const struct agdmm_recv agdmm_recvs_u125x[];
 
 static const struct agdmm_profile supported_agdmm[] = {
-       { AGILENT_U1232A, "U1232A", 9600, agdmm_u123x_jobs, agdmm_recvs },
+       { AGILENT_U1231A, "U1231A", 9600, agdmm_jobs_u123x, agdmm_recvs_u123x },
+       { AGILENT_U1232A, "U1232A", 9600, agdmm_jobs_u123x, agdmm_recvs_u123x },
+       { AGILENT_U1233A, "U1233A", 9600, agdmm_jobs_u123x, agdmm_recvs_u123x },
+       { AGILENT_U1251A, "U1251A", 9600, agdmm_jobs_u125x, agdmm_recvs_u125x },
+       { AGILENT_U1252A, "U1252A", 9600, agdmm_jobs_u125x, agdmm_recvs_u125x },
+       { AGILENT_U1253A, "U1253A", 9600, agdmm_jobs_u125x, agdmm_recvs_u125x },
        { 0, NULL, 0, NULL, NULL }
 };
 
@@ -167,14 +174,8 @@ static GSList *hw_scan(GSList *options)
                        break;
                }
        }
-       if (!conn) {
-               sr_dbg("no serial port provided");
+       if (!conn || !serialcomm)
                return NULL;
-       }
-       if (!serialcomm) {
-               sr_dbg("no serial communication parameters provided");
-               return NULL;
-       }
 
        if ((fd = serial_open(conn, O_RDWR|O_NONBLOCK)) == -1) {
                sr_err("agilent-dmm: unable to open %s: %s", conn, strerror(errno));