X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcolead-slm%2Fprotocol.h;h=1460f4d602193d7abcb6bca0cd2245b53207bdbb;hb=6045b91aa43bd824db528e2cc52d93ebf8a819d4;hp=0e37cd95ab4b8122bbfed1de0aafad245e57d597;hpb=f306ca61f65cb703b38e447bbd3dbea3ff9c57c0;p=libsigrok.git diff --git a/hardware/colead-slm/protocol.h b/hardware/colead-slm/protocol.h index 0e37cd95..1460f4d6 100644 --- a/hardware/colead-slm/protocol.h +++ b/hardware/colead-slm/protocol.h @@ -24,14 +24,14 @@ #include "libsigrok.h" #include "libsigrok-internal.h" -/* Message logging helpers with driver-specific prefix string. */ -#define DRIVER_LOG_DOMAIN "colead-slm: " -#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 "colead-slm: " +#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) enum { IDLE, @@ -51,7 +51,6 @@ struct dev_context { /** The current number of already received samples. */ uint64_t num_samples; - struct sr_serial_dev_inst *serial; int state; char buf[10]; int buflen;