std: Rename std_dev_clear() to std_dev_clear_with_callback().

diff --git a/src/device.c b/src/device.c
index 1394fb3be34b6aa874dab6e15e111a5d01d58a66..069ad1534cf47270155056044bec728ae75c2df8 100644 (file)
--- a/src/device.c
+++ b/src/device.c
@@ -551,7 +551,7 @@ SR_API int sr_dev_clear(const struct sr_dev_driver *driver)
        if (driver->dev_clear)
                ret = driver->dev_clear(driver);
        else
-               ret = std_dev_clear(driver, NULL);
+               ret = std_dev_clear_with_callback(driver, NULL);
 
        return ret;
 }

diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index 41a775a53254b502214ce4e5da521da50c8fb3cd..542aadbb16c7df56a4a782ab793a5ebe0eb8a9ca 100644 (file)
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -61,7 +61,7 @@ static const int32_t trigger_matches[] = {
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, sigma_clear_helper);
+       return std_dev_clear_with_callback(di, sigma_clear_helper);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 8824abbd0d3f274ab2269bc84a7b64ea45e04f45..d6ed20d9277807a6d674dc94b557046d5745ca20 100644 (file)
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -55,7 +55,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int add_device(int model, struct libusb_device_descriptor *des,

diff --git a/src/hardware/demo/api.c b/src/hardware/demo/api.c
index 3dd32433a5a503a37e81cb2c5e5db5d98218a5b4..55b17376d90a4a05c7c4809e3da2dc011f03732e 100644 (file)
--- a/src/hardware/demo/api.c
+++ b/src/hardware/demo/api.c
@@ -198,7 +198,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,

diff --git a/src/hardware/dreamsourcelab-dslogic/api.c b/src/hardware/dreamsourcelab-dslogic/api.c
index d11861bbdae876bbaeee495a756aadd79e13946e..177932245aa673ece4f7d590c3a71b500aef2976 100644 (file)
--- a/src/hardware/dreamsourcelab-dslogic/api.c
+++ b/src/hardware/dreamsourcelab-dslogic/api.c
@@ -293,7 +293,7 @@ static void clear_dev_context(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_dev_context);
+       return std_dev_clear_with_callback(di, clear_dev_context);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index b1832ee3940b5054eced43cda2a1a5aab7fcf71f..8e4f5edae04167b92f4a83e2ceab493c55b99daa 100644 (file)
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -251,7 +251,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index 547f7229d4169c0741879d60857f7e28d9ef994e..1f6aef2981efdac537f4dadb89e3dd5dd640912d 100644 (file)
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -356,7 +356,7 @@ static void clear_dev_context(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_dev_context);
+       return std_dev_clear_with_callback(di, clear_dev_context);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 9245869b35b2cb7f167fe2d26726062c13769359..afdeb456ed6b6c5a9054d413e6f707bdd643ab26 100644 (file)
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -126,7 +126,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index a17ec668987d6537cd307e4078df0fe20e277973..e815603fac7ba6cf4a497b9ca35ef1600a6352e5 100644 (file)
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -167,7 +167,7 @@ static void clear_dev_context(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_dev_context);
+       return std_dev_clear_with_callback(di, clear_dev_context);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 84ee45b85f3f3d03dd1a4d96b9f707a62a0e1562..8d624edd5cdf8bf8e7a84e0f9a854993f401f1e4 100644 (file)
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -244,7 +244,7 @@ static void clear_dev_context(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_dev_context);
+       return std_dev_clear_with_callback(di, clear_dev_context);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/hung-chang-dso-2100/api.c b/src/hardware/hung-chang-dso-2100/api.c
index 0aa012a1a3b54e90d1ed3a15137aa565e8eefac0..419b40bc2075ecf5f6ba735ae1fb867ce78e2be0 100644 (file)
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -238,7 +238,7 @@ static int dev_clear(const struct sr_dev_driver *di)
                }
        }
 
-       return std_dev_clear(di, clear_private);
+       return std_dev_clear_with_callback(di, clear_private);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/ikalogic-scanalogic2/api.c b/src/hardware/ikalogic-scanalogic2/api.c
index 3b8175c80c2ee323d3ae6f4219d12b5b60a79de1..3189909cdad14705d20cd430ad2e5b999aeb2680 100644 (file)
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -167,7 +167,7 @@ static void clear_dev_context(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, &clear_dev_context);
+       return std_dev_clear_with_callback(di, &clear_dev_context);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/ikalogic-scanaplus/api.c b/src/hardware/ikalogic-scanaplus/api.c
index 9f8f2506d41c11acec9876eeed795d9c841fa004..8ea351824460700abbe2861dfcf88ff3ec924c14 100644 (file)
--- a/src/hardware/ikalogic-scanaplus/api.c
+++ b/src/hardware/ikalogic-scanaplus/api.c
@@ -57,7 +57,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/lecroy-xstream/api.c b/src/hardware/lecroy-xstream/api.c
index 245c421a967484f67d5fa5292575fd53b145e72b..cf9df601e36932d233296fe513dddc9bd4a12aee 100644 (file)
--- a/src/hardware/lecroy-xstream/api.c
+++ b/src/hardware/lecroy-xstream/api.c
@@ -130,7 +130,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/motech-lps-30x/api.c b/src/hardware/motech-lps-30x/api.c
index 88e4449e55ac385d04bf2a743864cc177e0d5f65..fe396199ee98a13e5b822c4f96a04b5ac9395a7d 100644 (file)
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -507,7 +507,7 @@ static void dev_clear_private(struct dev_context *devc)
 
 static int dev_clear_lps301(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, (std_dev_clear_callback)dev_clear_private);
+       return std_dev_clear_with_callback(di, (std_dev_clear_callback)dev_clear_private);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,

diff --git a/src/hardware/pce-322a/api.c b/src/hardware/pce-322a/api.c
index 5dd4d7b837ace809c5e9ba43bae9ae01b1b80ec8..3ac85730c65b419fd18a126e4c21fcf4eb415268 100644 (file)
--- a/src/hardware/pce-322a/api.c
+++ b/src/hardware/pce-322a/api.c
@@ -105,7 +105,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, NULL);
+       return std_dev_clear_with_callback(di, NULL);
 }
 
 static int config_get(uint32_t key, GVariant **data,

diff --git a/src/hardware/pipistrello-ols/api.c b/src/hardware/pipistrello-ols/api.c
index 7dd94f8c355dc5dfd418972e95aab27ef76914c4..4440be67f52695fd4613dac506381a93c253efae 100644 (file)
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -201,7 +201,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,

diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index bd4c71181264907c8df6f8c09220b6d02ccb4f68..59e29fb9e2a36624234683ca9b0fab89dad14caf 100644 (file)
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -293,7 +293,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static struct sr_dev_inst *probe_device(struct sr_scpi_dev_inst *scpi)

diff --git a/src/hardware/rohde-schwarz-sme-0x/api.c b/src/hardware/rohde-schwarz-sme-0x/api.c
index 25096dd1c5e678d31f85f1418f8795de20539359..25c56a34a7d3092dcfe339af2ae1e7d5abe536fa 100644 (file)
--- a/src/hardware/rohde-schwarz-sme-0x/api.c
+++ b/src/hardware/rohde-schwarz-sme-0x/api.c
@@ -157,7 +157,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, NULL);
+       return std_dev_clear_with_callback(di, NULL);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/saleae-logic-pro/api.c b/src/hardware/saleae-logic-pro/api.c
index a5b59e4f61685245cc4c8eeb88be7440978f537e..d568f3ead0b1a15adeecb7c23bdf84a0a15197dd 100644 (file)
--- a/src/hardware/saleae-logic-pro/api.c
+++ b/src/hardware/saleae-logic-pro/api.c
@@ -182,7 +182,7 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, NULL);
+       return std_dev_clear_with_callback(di, NULL);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index 707d26263198c4f039c8d61b73e1a5ef49957325..f4514d8e0e225efb313e1b4410ad24c057a4baef 100644 (file)
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -300,7 +300,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi,

diff --git a/src/hardware/serial-lcr/api.c b/src/hardware/serial-lcr/api.c
index 580add493ae3b42cfb36302f52e8bd59e18bb32d..1beeefbbc6608b2bc6cd0791b02290039b740e54 100644 (file)
--- a/src/hardware/serial-lcr/api.c
+++ b/src/hardware/serial-lcr/api.c
@@ -35,7 +35,7 @@ struct lcr_es51919_info {
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, es51919_serial_clean);
+       return std_dev_clear_with_callback(di, es51919_serial_clean);
 }
 
 static GSList *scan(struct sr_dev_driver *di, GSList *options)

diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 34dc884d83e58a89d573a6be8d78115288492d4c..8373a0eb1a83e1a5043d312a056270bfebb9a1bb 100644 (file)
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -224,7 +224,7 @@ static void clear_dev_context(void *priv)
  */
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, &clear_dev_context);
+       return std_dev_clear_with_callback(di, &clear_dev_context);
 }
 
 /* Drain any pending data from the USB transfer buffers on the device.

diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 606dc2be03f3bacf84a3aa31d97f509cea3a0438..95a345b9a6718c3410c58c76e7bdcf5434a77f2c 100644 (file)
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -136,7 +136,7 @@ static void clear_helper(void *priv)
 
 static int dev_clear(const struct sr_dev_driver *di)
 {
-       return std_dev_clear(di, clear_helper);
+       return std_dev_clear_with_callback(di, clear_helper);
 }
 
 static int dev_open(struct sr_dev_inst *sdi)

diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 6ce65ff7b072e3481a5d284e1e3f96c00801dccc..97d1cddeca456253cfcf316ddf61ff06abf4584f 100644 (file)
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -940,7 +940,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi);
 #endif
 SR_PRIV int std_session_send_df_header(const struct sr_dev_inst *sdi);
 SR_PRIV int std_session_send_df_end(const struct sr_dev_inst *sdi);
-SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
+SR_PRIV int std_dev_clear_with_callback(const struct sr_dev_driver *driver,
                std_dev_clear_callback clear_private);
 SR_PRIV GSList *std_dev_list(const struct sr_dev_driver *di);
 SR_PRIV int std_serial_dev_close(struct sr_dev_inst *sdi);

diff --git a/src/std.c b/src/std.c
index 8ce27615e2a7069df2fc3eb9fa8ab618c00b6c3b..915a245594e82449c937a845fbd767a33cfe827e 100644 (file)
--- a/src/std.c
+++ b/src/std.c
@@ -349,7 +349,7 @@ SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi)
  * @retval SR_ERR_BUG Implementation bug.
  * @retval other Other error.
  */
-SR_PRIV int std_dev_clear(const struct sr_dev_driver *driver,
+SR_PRIV int std_dev_clear_with_callback(const struct sr_dev_driver *driver,
                std_dev_clear_callback clear_private)
 {
        struct drv_context *drvc;