X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fagilent-dmm%2Fagilent-dmm.h;h=43fed2406ef00c3409deb73eb4aca5d98b71336f;hb=5d03743096a1e850c6ccbb1eb902705a62604e80;hp=f3922a1fe9b314be86e46bfbf65cf08468daf2b4;hpb=fb3a15059938770a064fb7d35a813cfa20d8e363;p=libsigrok.git diff --git a/hardware/agilent-dmm/agilent-dmm.h b/hardware/agilent-dmm/agilent-dmm.h index f3922a1f..43fed240 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,18 +17,17 @@ * 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 - -/* 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) +/* 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 @@ -85,4 +84,4 @@ struct agdmm_recv { SR_PRIV int agdmm_receive_data(int fd, int revents, void *cb_data); -#endif /* LIBSIGROK_AGILENT_DMM_H */ +#endif