X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fcommon%2Fscpi_serial.c;h=dc0996349937a181aef67b71012ed23abe61fddc;hb=3544f848e0d7f67af8e11ce7ec344b34cd797df3;hp=5c07c43c6fb5cbae6b6a552d77b2d07898f6903d;hpb=abc4b3356d184401cb62aaa521d1c80ebd7d6f0f;p=libsigrok.git diff --git a/hardware/common/scpi_serial.c b/hardware/common/scpi_serial.c index 5c07c43c..dc099634 100644 --- a/hardware/common/scpi_serial.c +++ b/hardware/common/scpi_serial.c @@ -24,13 +24,7 @@ #include #include -/* Message logging helpers with subsystem-specific prefix string. */ -#define LOG_PREFIX "scpi_serial: " -#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 LOG_PREFIX "scpi_serial" #define SCPI_READ_RETRIES 100 #define SCPI_READ_RETRY_TIMEOUT 10000 @@ -60,7 +54,7 @@ SR_PRIV int scpi_serial_source_remove(void *priv) { struct sr_serial_dev_inst *serial = priv; - return sr_source_remove(serial->fd); + return serial_source_remove(serial); } SR_PRIV int scpi_serial_send(void *priv, const char *command)