X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fagilent-dmm%2Fagilent-dmm.h;h=2277111f62c3d3ecc74f760af40f7b437dbc3799;hb=10afee13a3a08b4852d4214bc6d9f0ff468b1ce6;hp=4c8ecac4c1670d40c04ee205bde596d46329a21a;hpb=e9022f596d9a6d35919445f3aa6394061b3e6681;p=libsigrok.git diff --git a/hardware/agilent-dmm/agilent-dmm.h b/hardware/agilent-dmm/agilent-dmm.h index 4c8ecac4..2277111f 100644 --- 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 * @@ -17,9 +17,10 @@ * along with this program. If not, see . */ +#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,7 +38,6 @@ enum { struct agdmm_profile { int model; const char *modelname; - int serial_speed; const struct agdmm_job *jobs; const struct agdmm_recv *recvs; }; @@ -47,7 +47,6 @@ 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; @@ -78,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