NULL,
};
-extern const struct agdmm_job u123x_jobs[];
-extern const struct agdmm_recv u123x_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, u123x_jobs, u123x_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 }
};
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));