Remove unnecessary std_serial_dev_acquisition_stop() wrappers

Now that std_serial_dev_acquisition_stop() has the same signature as
the sr_dev_driver dev_acquisition_stop() callback it is possible to remove
the wrapper functions and use std_serial_dev_acquisition_stop() directly
has the callback function.

Signed-off-by: Lars-Peter Clausen <redacted>

diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index 27db616202d4c356dec9fa958ea88cb7ff51a977..47e38fb28ee50a60d375a07c4dc1e2cf090a2399 100644 (file)
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -208,11 +208,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver agdmm_driver_info = {
        .name = "agilent-dmm",
        .longname = "Agilent U12xx series DMMs",
@@ -228,7 +223,7 @@ static struct sr_dev_driver agdmm_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(agdmm_driver_info);

diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c
index ca1ac4014a157edb2e8c223dff896a9c98ced2e7..ff0e1aede590b0603612de7dea0a177796b98d4d 100644 (file)
--- a/src/hardware/appa-55ii/api.c
+++ b/src/hardware/appa-55ii/api.c
@@ -215,11 +215,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver appa_55ii_driver_info = {
        .name = "appa-55ii",
        .longname = "APPA 55II",
@@ -235,7 +230,7 @@ static struct sr_dev_driver appa_55ii_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(appa_55ii_driver_info);

diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c b/src/hardware/arachnid-labs-re-load-pro/api.c
index 49db531f65feaeb71f4c9b4cb55df712f7be00ba..d0a74fa7445f6c99ef492ae9940298ee403e3a39 100644 (file)
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -335,11 +335,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
        .name = "arachnid-labs-re-load-pro",
        .longname = "Arachnid Labs Re:load Pro",
@@ -354,7 +349,7 @@ static struct sr_dev_driver arachnid_labs_re_load_pro_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(arachnid_labs_re_load_pro_driver_info);

diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index d4825362af44785d8b5d3aff1a48a74a74115a41..00ff6cf110783be92707c3e42c8d53183b069a91 100644 (file)
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -176,11 +176,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver brymen_bm857_driver_info = {
        .name = "brymen-bm857",
        .longname = "Brymen BM857",
@@ -196,7 +191,7 @@ static struct sr_dev_driver brymen_bm857_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(brymen_bm857_driver_info);

diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index 8c649c855b1911d3b3715c02d5050abe8d6dbf07..5b8bb94cab9132e29cea329b25a8677cd97ccf1e 100644 (file)
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -364,14 +364,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver cem_dt_885x_driver_info = {
        .name = "cem-dt-885x",
        .longname = "CEM DT-885x",
@@ -387,7 +379,7 @@ static struct sr_dev_driver cem_dt_885x_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(cem_dt_885x_driver_info);

diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c
index c503da665b82539a4d5c892dc1a78a1dcd0d7158..70a14699b90d520036101b8fe119bc1a35f86821 100644 (file)
--- a/src/hardware/center-3xx/api.c
+++ b/src/hardware/center-3xx/api.c
@@ -183,11 +183,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 /* Driver-specific API function wrappers */
 #define HW_SCAN(X) \
 static GSList *scan_##X(struct sr_dev_driver *d, GSList *options) { \
@@ -214,7 +209,7 @@ static struct sr_dev_driver ID##_driver_info = { \
        .dev_open = std_serial_dev_open, \
        .dev_close = std_serial_dev_close, \
        .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \
-       .dev_acquisition_stop = dev_acquisition_stop, \
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop, \
        .context = NULL, \
 }; \
 SR_REGISTER_DEV_DRIVER(ID##_driver_info);

diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index 3bfa91a13c48f3e0c6de20ae554edf2ee45195fe..762cda19df7809a859c4aadc5ce82693debf8b29 100644 (file)
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -137,11 +137,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver colead_slm_driver_info = {
        .name = "colead-slm",
        .longname = "Colead SLM",
@@ -157,7 +152,7 @@ static struct sr_dev_driver colead_slm_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(colead_slm_driver_info);

diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 2544b5e16992f2735484dc14052943aca77789d0..a20f817a4a732a6189035e47469f3420199d2cf8 100644 (file)
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -57,7 +57,7 @@ static struct sr_dev_driver deree_de5000_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = es51919_serial_acquisition_start,
-       .dev_acquisition_stop = es51919_serial_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(deree_de5000_driver_info);

diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 423ca309f98ee96e4e60469f4c47b1ebc966d46b..158e6f90b29bdf49e1d06b02c428378a9086285b 100644 (file)
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -244,11 +244,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver flukedmm_driver_info = {
        .name = "fluke-dmm",
        .longname = "Fluke 18x/28x series DMMs",
@@ -264,7 +259,7 @@ static struct sr_dev_driver flukedmm_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(flukedmm_driver_info);

diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 6b2508dd76c6f8b5f6f2a304e80ac63501cbfb10..048a0afc6e3d2909853e4b49ca7c91accd92c249 100644 (file)
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -468,11 +468,6 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi)
        return req_meas14(sdi);
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
        .name = "gmc-mh-1x-2x-rs232",
        .longname = "Gossen Metrawatt Metrahit 1x/2x, RS232 interface",
@@ -488,7 +483,7 @@ static struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start_1x_2x_rs232,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(gmc_mh_1x_2x_rs232_driver_info);
@@ -508,7 +503,7 @@ static struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start_2x_bd232,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(gmc_mh_2x_bd232_driver_info);

diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index ed6c70e880f8c9c8bf0a78a55e075e67f8fdec00..5a7afee6f26f82e03c8351578e2db360cbab989b 100644 (file)
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -174,11 +174,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 #define SCALE(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \
                        VALID, PARSE) \
        &((struct scale_info) { \
@@ -196,7 +191,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
                        .dev_open = std_serial_dev_open, \
                        .dev_close = std_serial_dev_close, \
                        .dev_acquisition_start = dev_acquisition_start, \
-                       .dev_acquisition_stop = dev_acquisition_stop, \
+                       .dev_acquisition_stop = std_serial_dev_acquisition_stop, \
                        .context = NULL, \
                }, \
                VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, \

diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index da6c0de9f0719ab04cadf3c8f12323261c0e6258..c6e752551f3b5eeeac98aff69be27b5832414551 100644 (file)
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -360,14 +360,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       if (sdi->status != SR_ST_ACTIVE)
-               return SR_ERR_DEV_CLOSED;
-
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver korad_kaxxxxp_driver_info = {
        .name = "korad-kaxxxxp",
        .longname = "Korad KAxxxxP",
@@ -382,7 +374,7 @@ static struct sr_dev_driver korad_kaxxxxp_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(korad_kaxxxxp_driver_info);

diff --git a/src/hardware/manson-hcs-3xxx/api.c b/src/hardware/manson-hcs-3xxx/api.c
index d49f6129312790b637d0c002caa70d2f7c75b6ba..97a9a30076b5b60e0ca45d7370067e002f064aaf 100644 (file)
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -369,11 +369,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
        .name = "manson-hcs-3xxx",
        .longname = "Manson HCS-3xxx",
@@ -388,7 +383,7 @@ static struct sr_dev_driver manson_hcs_3xxx_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(manson_hcs_3xxx_driver_info);

diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index 4a070bcc0a8c28b38a70ef71f9096145863dfa85..5f9ea71aac88fd26ef0dd25841ee6f22d841f931 100644 (file)
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -195,11 +195,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, int idx)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 /* Driver-specific API function wrappers */
 #define HW_SCAN(X) \
 static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \
@@ -231,7 +226,7 @@ static struct sr_dev_driver ID##_driver_info = { \
        .dev_open = std_serial_dev_open, \
        .dev_close = std_serial_dev_close, \
        .dev_acquisition_start = dev_acquisition_start_##ID_UPPER, \
-       .dev_acquisition_stop = dev_acquisition_stop, \
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop, \
        .context = NULL, \
 }; \
 SR_REGISTER_DEV_DRIVER(ID##_driver_info)

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 1b227e7844b143318caa8bf4ed750fe03b5643b6..1fe0d86cc15fe194c3a737ede8030f351cc4bc70 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -780,11 +780,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver motech_lps_301_driver_info = {
        .name = "motech-lps-301",
        .longname = "Motech LPS-301",
@@ -800,7 +795,7 @@ static struct sr_dev_driver motech_lps_301_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(motech_lps_301_driver_info);

diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index a4f33c078baafd968eaa0e68faddcb40129d8c72..eb2ba25cf81bb3a8116b130b2c4bfb5bc86283c4 100644 (file)
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -219,11 +219,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver norma_dmm_driver_info = {
        .name = "norma-dmm",
        .longname = "Norma DM9x0 DMMs",
@@ -239,7 +234,7 @@ static struct sr_dev_driver norma_dmm_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(norma_dmm_driver_info);
@@ -259,7 +254,7 @@ static struct sr_dev_driver siemens_b102x_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(siemens_b102x_driver_info);

diff --git a/src/hardware/pce-322a/api.c b/src/hardware/pce-322a/api.c
index f40db9e6a5d29303fa4d7dbcc5e9181416a3fe2c..202e3122a26cbb4ec7be226bf6e9759aee7ca70d 100644 (file)
--- a/src/hardware/pce-322a/api.c
+++ b/src/hardware/pce-322a/api.c
@@ -319,11 +319,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver pce_322a_driver_info = {
        .name = "pce-322a",
        .longname = "PCE PCE-322A",
@@ -339,7 +334,7 @@ static struct sr_dev_driver pce_322a_driver_info = {
        .dev_open = dev_open,
        .dev_close = dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(pce_322a_driver_info);

diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 570ec7850c519d3dc6105e8b70ece70298331309..2c436f080e313c8866d2388e5612b6b63028c0bb 100644 (file)
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -195,11 +195,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 #define DMM(ID, CHIPSET, VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, \
                        DELAY, REQUEST, VALID, PARSE, DETAILS) \
        &((struct dmm_info) { \
@@ -217,7 +212,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi)
                        .dev_open = std_serial_dev_open, \
                        .dev_close = std_serial_dev_close, \
                        .dev_acquisition_start = dev_acquisition_start, \
-                       .dev_acquisition_stop = dev_acquisition_stop, \
+                       .dev_acquisition_stop = std_serial_dev_acquisition_stop, \
                        .context = NULL, \
                }, \
                VENDOR, MODEL, CONN, BAUDRATE, PACKETSIZE, TIMEOUT, DELAY, \

diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index 51ea11862a52182d61f9e6fa5bfbdce9013fd533..4cfadf4b3e43678e333b4c34e56252b285250101 100644 (file)
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -179,11 +179,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver teleinfo_driver_info = {
        .name = "teleinfo",
        .longname = "Teleinfo",
@@ -199,7 +194,7 @@ static struct sr_dev_driver teleinfo_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(teleinfo_driver_info);

diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index 68c02026d36b83f0f1a2146ef284083c04a4cdc9..ecf26d1dc1ade10e0291f8d7797df70daa750e37 100644 (file)
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -149,11 +149,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
        return SR_OK;
 }
 
-static int dev_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}
-
 static struct sr_dev_driver tondaj_sl_814_driver_info = {
        .name = "tondaj-sl-814",
        .longname = "Tondaj SL-814",
@@ -169,7 +164,7 @@ static struct sr_dev_driver tondaj_sl_814_driver_info = {
        .dev_open = std_serial_dev_open,
        .dev_close = std_serial_dev_close,
        .dev_acquisition_start = dev_acquisition_start,
-       .dev_acquisition_stop = dev_acquisition_stop,
+       .dev_acquisition_stop = std_serial_dev_acquisition_stop,
        .context = NULL,
 };
 SR_REGISTER_DEV_DRIVER(tondaj_sl_814_driver_info);

diff --git a/src/lcr/es51919.c b/src/lcr/es51919.c
index ad36461171902320ab0ff19fb2fefea477ef4305..15e524b818f6f598eea9b51fffa54010da9833a9 100644 (file)
--- a/src/lcr/es51919.c
+++ b/src/lcr/es51919.c
@@ -923,8 +923,3 @@ SR_PRIV int es51919_serial_acquisition_start(const struct sr_dev_inst *sdi)
 
        return SR_OK;
 }
-
-SR_PRIV int es51919_serial_acquisition_stop(struct sr_dev_inst *sdi)
-{
-       return std_serial_dev_acquisition_stop(sdi);
-}