Route sr_source_add for all serial devices through a serial_source_add wrapper.

diff --git a/hardware/agilent-dmm/api.c b/hardware/agilent-dmm/api.c
index e67f0e020a78db3ab3b2329eeeeae8481d549fb3..d4c9427d49b95b89ac515e8446abfde55e35f375 100644 (file)
--- a/hardware/agilent-dmm/api.c
+++ b/hardware/agilent-dmm/api.c
@@ -280,7 +280,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 100, agdmm_receive_data, (void *)sdi);
+       serial_source_add(serial, G_IO_IN, 100, agdmm_receive_data, (void *)sdi);
 
        return SR_OK;
 }

diff --git a/hardware/brymen-dmm/api.c b/hardware/brymen-dmm/api.c
index c03ed668a5b74a1c07596cfdc14aa36b550ee11e..c676d47ea93cc062531009c475eea8a1028939f4 100644 (file)
--- a/hardware/brymen-dmm/api.c
+++ b/hardware/brymen-dmm/api.c
@@ -261,7 +261,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 50,
+       serial_source_add(serial, G_IO_IN, 50,
                      brymen_dmm_receive_data, (void *)sdi);
 
        return SR_OK;

diff --git a/hardware/cem-dt-885x/api.c b/hardware/cem-dt-885x/api.c
index 6628d93d421d62c8a0e17cbf3a76ece6feb8fa2c..9ff8e089f3dede5b96c4a85ba125a03e73803118 100644 (file)
--- a/hardware/cem-dt-885x/api.c
+++ b/hardware/cem-dt-885x/api.c
@@ -415,7 +415,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 150, cem_dt_885x_receive_data,
+       serial_source_add(serial, G_IO_IN, 150, cem_dt_885x_receive_data,
                        (void *)sdi);
 
        return SR_OK;

diff --git a/hardware/center-3xx/api.c b/hardware/center-3xx/api.c
index 4cd8ab122fa17b4a09196fea2b1fbfe5e0524b13..0960af82af3d56037f1cd0b70f66908b2bfc683e 100644 (file)
--- a/hardware/center-3xx/api.c
+++ b/hardware/center-3xx/api.c
@@ -257,7 +257,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        /* Poll every 500ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 500,
+       serial_source_add(serial, G_IO_IN, 500,
                      center_devs[idx].receive_data, (void *)sdi);
 
        return SR_OK;

diff --git a/hardware/colead-slm/api.c b/hardware/colead-slm/api.c
index 98472004e76f63f9920e6ba7374cc41dc7b31635..9848cc59c1aff42db0cb2f99d3359a5be1be30b9 100644 (file)
--- a/hardware/colead-slm/api.c
+++ b/hardware/colead-slm/api.c
@@ -227,7 +227,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        /* Poll every 150ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 150, colead_slm_receive_data,
+       serial_source_add(serial, G_IO_IN, 150, colead_slm_receive_data,
                        (void *)sdi);
 
        return SR_OK;

diff --git a/hardware/common/scpi_serial.c b/hardware/common/scpi_serial.c
index 0b1e30d84dbf7be3cb540dbf5a72a9904b59a6a8..5c07c43c6fb5cbae6b6a552d77b2d07898f6903d 100644 (file)
--- a/hardware/common/scpi_serial.c
+++ b/hardware/common/scpi_serial.c
@@ -53,7 +53,7 @@ SR_PRIV int scpi_serial_source_add(void *priv, int events, int timeout,
 {
        struct sr_serial_dev_inst *serial = priv;
 
-       return sr_source_add(serial->fd, events, timeout, cb, cb_data);
+       return serial_source_add(serial, events, timeout, cb, cb_data);
 }
 
 SR_PRIV int scpi_serial_source_remove(void *priv)

diff --git a/hardware/common/serial.c b/hardware/common/serial.c
index e181f2338562386327bc1e18e71c8a44b2cf651b..a0de0de50b9f075494953eaf2b0621c503ee8099 100644 (file)
--- a/hardware/common/serial.c
+++ b/hardware/common/serial.c
@@ -638,3 +638,9 @@ SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_devic
 
        return SR_OK;
 }
+
+SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
+               int timeout, sr_receive_data_callback_t cb, void *cb_data)
+{
+       return sr_source_add(serial->fd, events, timeout, cb, cb_data);
+}

diff --git a/hardware/fluke-dmm/api.c b/hardware/fluke-dmm/api.c
index 604d65f4f44aeb7ab5722dcf03bbcc0ae88d60e6..0e6c938a161d85c6d44cb304dc781ef5f1c5fd90 100644 (file)
--- a/hardware/fluke-dmm/api.c
+++ b/hardware/fluke-dmm/api.c
@@ -313,7 +313,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 50, fluke_receive_data, (void *)sdi);
+       serial_source_add(serial, G_IO_IN, 50, fluke_receive_data, (void *)sdi);
 
        if (serial_write(serial, "QM\r", 3) == -1) {
                sr_err("Unable to send QM: %s.", strerror(errno));

diff --git a/hardware/gmc-mh-1x-2x/api.c b/hardware/gmc-mh-1x-2x/api.c
index 42969412025c7ebc7d1e8cdfe0f7d9c1142eff6d..615209ec079df84235c19b8f7ad429b268363f83 100644 (file)
--- a/hardware/gmc-mh-1x-2x/api.c
+++ b/hardware/gmc-mh-1x-2x/api.c
@@ -363,7 +363,7 @@ static int dev_acq_start_1x_2x_rs232(const struct sr_dev_inst *sdi,
 
        /* Poll every 40ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 40, gmc_mh_1x_2x_receive_data,
+       serial_source_add(serial, G_IO_IN, 40, gmc_mh_1x_2x_receive_data,
                (void *)sdi);
 
        return SR_OK;

diff --git a/hardware/link-mso19/api.c b/hardware/link-mso19/api.c
index 6a93ba94b4650a9859d6635bc89846409fb95659..56d7700adb84ab740e9f799e8e8c3aa5c2226d00 100644 (file)
--- a/hardware/link-mso19/api.c
+++ b/hardware/link-mso19/api.c
@@ -473,7 +473,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        /* Our first probe is analog, the other 8 are of type 'logic'. */
        /* TODO. */
 
-       sr_source_add(devc->serial->fd, G_IO_IN, -1, mso_receive_data, cb_data);
+       serial_source_add(devc->serial, G_IO_IN, -1, mso_receive_data, cb_data);
 
        return SR_OK;
 }

diff --git a/hardware/mic-985xx/api.c b/hardware/mic-985xx/api.c
index 5785e4eb7837487b5b094d6480ea644edf64b4a0..7983c4aec7e7d6bd808550ce1af6002169738261 100644 (file)
--- a/hardware/mic-985xx/api.c
+++ b/hardware/mic-985xx/api.c
@@ -259,7 +259,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 100,
+       serial_source_add(serial, G_IO_IN, 100,
                      mic_devs[idx].receive_data, (void *)sdi);
 
        return SR_OK;

diff --git a/hardware/norma-dmm/api.c b/hardware/norma-dmm/api.c
index 6523e93a8276bea60fb93bcc6264f95e7ba6c6d0..ed8378ca231b46faa2f982a3d6e61a9ee27fdef2 100644 (file)
--- a/hardware/norma-dmm/api.c
+++ b/hardware/norma-dmm/api.c
@@ -293,7 +293,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        /* Poll every 100ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 100, norma_dmm_receive_data,
+       serial_source_add(serial, G_IO_IN, 100, norma_dmm_receive_data,
                      (void *)sdi);
 
        return SR_OK;

diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c
index a38bbf837ecc6102b63634c0ce4ca4f380c06314..e199f09b69e899f5ec25a75a6052592b69d4912b 100644 (file)
--- a/hardware/openbench-logic-sniffer/api.c
+++ b/hardware/openbench-logic-sniffer/api.c
@@ -537,7 +537,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
        /* Send header packet to the session bus. */
        std_session_send_df_header(cb_data, LOG_PREFIX);
 
-       sr_source_add(serial->fd, G_IO_IN, -1, ols_receive_data, cb_data);
+       serial_source_add(serial, G_IO_IN, -1, ols_receive_data, cb_data);
 
        return SR_OK;
 }

diff --git a/hardware/serial-dmm/api.c b/hardware/serial-dmm/api.c
index ef57f31822e3eaf97b090b332bdc5583d074ad5b..9ec347d7d4fe24d11cbf7630ea160dd4d8498c56 100644 (file)
--- a/hardware/serial-dmm/api.c
+++ b/hardware/serial-dmm/api.c
@@ -495,7 +495,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        /* Poll every 50ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 50,
+       serial_source_add(serial, G_IO_IN, 50,
                      dmms[dmm].receive_data, (void *)sdi);
 
        return SR_OK;

diff --git a/hardware/teleinfo/api.c b/hardware/teleinfo/api.c
index d129987d9d9fc8e93a9f0bff76789b0ac04572d6..861f41044cdb6812e931b251062778c771329474 100644 (file)
--- a/hardware/teleinfo/api.c
+++ b/hardware/teleinfo/api.c
@@ -283,7 +283,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, void *cb_data)
        std_session_send_df_header(cb_data, LOG_PREFIX);
 
        /* Poll every 50ms, or whenever some data comes in. */
-       sr_source_add(serial->fd, G_IO_IN, 50, teleinfo_receive_data, (void *)sdi);
+       serial_source_add(serial, G_IO_IN, 50, teleinfo_receive_data, (void *)sdi);
 
        return SR_OK;
 }

diff --git a/hardware/tondaj-sl-814/api.c b/hardware/tondaj-sl-814/api.c
index bb13e289edab2b441c96e656eb0bd2d8cbb5979c..533f69fb108f24b75321f38de3c8838f91376900 100644 (file)
--- a/hardware/tondaj-sl-814/api.c
+++ b/hardware/tondaj-sl-814/api.c
@@ -223,7 +223,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
 
        /* Poll every 500ms, or whenever some data comes in. */
        serial = sdi->conn;
-       sr_source_add(serial->fd, G_IO_IN, 500,
+       serial_source_add(serial, G_IO_IN, 500,
                      tondaj_sl_814_receive_data, (void *)sdi);
 
        return SR_OK;

diff --git a/libsigrok-internal.h b/libsigrok-internal.h
index e81170c783a703552ddfb170651086589a276d6a..e4eef91ec3b718bcef4a2041376b376011fbf844 100644 (file)
--- a/libsigrok-internal.h
+++ b/libsigrok-internal.h
@@ -228,6 +228,8 @@ SR_PRIV int serial_stream_detect(struct sr_serial_dev_inst *serial,
                                 uint64_t timeout_ms, int baudrate);
 SR_PRIV int sr_serial_extract_options(GSList *options, const char **serial_device,
                                      const char **serial_options);
+SR_PRIV int serial_source_add(struct sr_serial_dev_inst *serial, int events,
+               int timeout, sr_receive_data_callback_t cb, void *cb_data);
 #endif
 
 /*--- hardware/common/ezusb.c -----------------------------------------------*/