scpi-pps: Seperate existing HP 66xxA and 66xxB profiles.

[libsigrok.git] / src / scpi / scpi_serial.c

diff --git a/src/scpi/scpi_serial.c b/src/scpi/scpi_serial.c
index 464924ce3086f2253c034339d22b0830917a5ce8..96fb70d60658883e0473349a66155239a86fe2c6 100644 (file)
--- a/src/scpi/scpi_serial.c
+++ b/src/scpi/scpi_serial.c
@@ -98,6 +98,17 @@ static int scpi_serial_open(struct sr_scpi_dev_inst *scpi)
        return SR_OK;
 }
 
+static int scpi_serial_connection_id(struct sr_scpi_dev_inst *scpi,
+               char **connection_id)
+{
+       struct scpi_serial *sscpi = scpi->priv;
+       struct sr_serial_dev_inst *serial = sscpi->serial;
+
+       *connection_id = g_strdup(serial->port);
+
+       return SR_OK;
+}
+
 static int scpi_serial_source_add(struct sr_session *session, void *priv,
                int events, int timeout, sr_receive_data_callback cb, void *cb_data)
 {
@@ -123,7 +134,8 @@ static int scpi_serial_send(void *priv, const char *command)
 
        result = serial_write_blocking(serial, command, strlen(command), 0);
        if (result < 0) {
-               sr_err("Error while sending SCPI command: '%s'.", command);
+               sr_err("Error while sending SCPI command '%s': %d.",
+                       command, result);
                return SR_ERR;
        }
 
@@ -152,8 +164,6 @@ static int scpi_serial_read_data(void *priv, char *buf, int maxlen)
                return ret;
 
        if (ret > 0) {
-               sr_spew("Read %d bytes into buffer.", ret);
-
                if (buf[ret - 1] == '\n') {
                        sscpi->got_newline = TRUE;
                        sr_spew("Received terminator");
@@ -189,10 +199,12 @@ static void scpi_serial_free(void *priv)
 SR_PRIV const struct sr_scpi_dev_inst scpi_serial_dev = {
        .name          = "serial",
        .prefix        = "",
+       .transport     = SCPI_TRANSPORT_SERIAL,
        .priv_size     = sizeof(struct scpi_serial),
        .scan          = scpi_serial_scan,
        .dev_inst_new  = scpi_serial_dev_inst_new,
        .open          = scpi_serial_open,
+       .connection_id = scpi_serial_connection_id,
        .source_add    = scpi_serial_source_add,
        .source_remove = scpi_serial_source_remove,
        .send          = scpi_serial_send,