std_init() allocates a drv_context struct which needs to be freed by the
driver in its cleanup struct. But the vast majority of drivers does never
does this causing memory leaks.
Instead of addressing the issue by manually adding code to free the struct
to each driver introduce a new helper function std_cleanup() that takes
care of this. In addition to freeing the drv_context struct std_cleanup()
also invokes sr_dev_clear() which takes care of freeing all devices
attached to the driver.
Combining both operations in the same helper function allows to use
std_cleanup() as the cleanup callback for all existing drivers, which
reduces the amount of boiler-plate code quite a bit.
All drivers are updated to use the new helper function.
Signed-off-by: Lars-Peter Clausen <l...@metafoo.de>
---
src/hardware/agilent-dmm/api.c | 7 +------
src/hardware/appa-55ii/api.c | 7 +------
src/hardware/arachnid-labs-re-load-pro/api.c | 7 +------
src/hardware/asix-sigma/api.c | 7 +------
src/hardware/atten-pps3xxx/api.c | 7 +------
src/hardware/baylibre-acme/api.c | 9 +--------
src/hardware/beaglelogic/api.c | 7 +------
src/hardware/brymen-bm86x/api.c | 7 +------
src/hardware/brymen-dmm/api.c | 7 +------
src/hardware/cem-dt-885x/api.c | 7 +------
src/hardware/center-3xx/api.c | 11 +----------
src/hardware/chronovu-la/api.c | 7 +------
src/hardware/colead-slm/api.c | 7 +------
src/hardware/conrad-digi-35-cpu/api.c | 7 +------
src/hardware/demo/demo.c | 7 +------
src/hardware/deree-de5000/api.c | 7 +------
src/hardware/fluke-dmm/api.c | 7 +------
src/hardware/ftdi-la/api.c | 11 +----------
src/hardware/fx2lafw/api.c | 17 +----------------
src/hardware/gmc-mh-1x-2x/api.c | 9 ++-------
src/hardware/gwinstek-gds-800/api.c | 9 +--------
src/hardware/hameg-hmo/api.c | 9 +--------
src/hardware/hantek-6xxx/api.c | 7 +------
src/hardware/hantek-dso/api.c | 7 +------
src/hardware/hp-3457a/api.c | 7 +------
src/hardware/hung-chang-dso-2100/api.c | 14 +-------------
src/hardware/ikalogic-scanalogic2/api.c | 7 +------
src/hardware/ikalogic-scanaplus/api.c | 7 +------
src/hardware/kecheng-kc-330b/api.c | 17 +----------------
src/hardware/kern-scale/api.c | 7 +------
src/hardware/korad-kaxxxxp/api.c | 8 +-------
src/hardware/lascar-el-usb/api.c | 17 +----------------
src/hardware/lecroy-logicstudio/api.c | 16 +---------------
src/hardware/link-mso19/api.c | 7 +------
src/hardware/manson-hcs-3xxx/api.c | 7 +------
src/hardware/maynuo-m97/api.c | 7 +------
src/hardware/mic-985xx/api.c | 11 +----------
src/hardware/motech-lps-30x/api.c | 7 +------
src/hardware/norma-dmm/api.c | 9 ++-------
src/hardware/openbench-logic-sniffer/api.c | 7 +------
src/hardware/pipistrello-ols/api.c | 7 +------
src/hardware/rigol-ds/api.c | 7 +------
src/hardware/saleae-logic16/api.c | 17 +----------------
src/hardware/scpi-pps/api.c | 7 +------
src/hardware/serial-dmm/api.c | 7 +------
src/hardware/sysclk-lwla/api.c | 2 +-
src/hardware/teleinfo/api.c | 7 +------
src/hardware/testo/api.c | 16 +---------------
src/hardware/tondaj-sl-814/api.c | 7 +------
src/hardware/uni-t-dmm/api.c | 7 +------
src/hardware/uni-t-ut32x/api.c | 17 +----------------
src/hardware/victor-dmm/api.c | 17 +----------------
src/hardware/yokogawa-dlm/api.c | 9 +--------
src/hardware/zeroplus-logic-cube/api.c | 7 +------
src/libsigrok-internal.h | 1 +
src/std.c | 22 ++++++++++++++++++++++
56 files changed, 79 insertions(+), 427 deletions(-)
diff --git a/src/hardware/agilent-dmm/api.c b/src/hardware/agilent-dmm/api.c
index 82e4378..21f1f32 100644
--- a/src/hardware/agilent-dmm/api.c
+++ b/src/hardware/agilent-dmm/api.c
@@ -166,11 +166,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -264,7 +259,7 @@ SR_PRIV struct sr_dev_driver agdmm_driver_info = {
.longname = "Agilent U12xx series DMMs",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/appa-55ii/api.c b/src/hardware/appa-55ii/api.c
index 0ed6144..62c5db8 100644
--- a/src/hardware/appa-55ii/api.c
+++ b/src/hardware/appa-55ii/api.c
@@ -126,11 +126,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -271,7 +266,7 @@ SR_PRIV struct sr_dev_driver appa_55ii_driver_info = {
.longname = "APPA 55II",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c
b/src/hardware/arachnid-labs-re-load-pro/api.c
index 86d34a4..ab1d557 100644
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -174,11 +174,6 @@ static int dev_clear(const struct sr_dev_driver *di)
return std_dev_clear(di, NULL);
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_list(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
@@ -388,7 +383,7 @@ SR_PRIV struct sr_dev_driver
arachnid_labs_re_load_pro_driver_info = {
.longname = "Arachnid Labs Re:load Pro",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/asix-sigma/api.c b/src/hardware/asix-sigma/api.c
index 4ac74bd..9396f78 100644
--- a/src/hardware/asix-sigma/api.c
+++ b/src/hardware/asix-sigma/api.c
@@ -188,11 +188,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -430,7 +425,7 @@ SR_PRIV struct sr_dev_driver asix_sigma_driver_info = {
.longname = "ASIX SIGMA/SIGMA2",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/atten-pps3xxx/api.c b/src/hardware/atten-pps3xxx/api.c
index efe06ac..03d6e52 100644
--- a/src/hardware/atten-pps3xxx/api.c
+++ b/src/hardware/atten-pps3xxx/api.c
@@ -204,11 +204,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -512,7 +507,7 @@ SR_PRIV struct sr_dev_driver atten_pps3203_driver_info = {
.longname = "Atten PPS3203T-3S",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan_3203,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index c116cbb..0a500b7 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -172,13 +172,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- dev_clear(di);
-
- return SR_OK;
-}
-
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
@@ -432,7 +425,7 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = {
.longname = "BayLibre ACME (Another Cute Measurement Equipment)",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 4951aff..30b166e 100644
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -200,11 +200,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -393,7 +388,7 @@ SR_PRIV struct sr_dev_driver beaglelogic_driver_info = {
.longname = "BeagleLogic",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/brymen-bm86x/api.c b/src/hardware/brymen-bm86x/api.c
index 64e492c..56f2938 100644
--- a/src/hardware/brymen-bm86x/api.c
+++ b/src/hardware/brymen-bm86x/api.c
@@ -172,11 +172,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return ret;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -294,7 +289,7 @@ SR_PRIV struct sr_dev_driver brymen_bm86x_driver_info = {
.longname = "Brymen BM86X",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/brymen-dmm/api.c b/src/hardware/brymen-dmm/api.c
index 911789f..d8ba7fc 100644
--- a/src/hardware/brymen-dmm/api.c
+++ b/src/hardware/brymen-dmm/api.c
@@ -136,11 +136,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -239,7 +234,7 @@ SR_PRIV struct sr_dev_driver brymen_bm857_driver_info = {
.longname = "Brymen BM857",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/cem-dt-885x/api.c b/src/hardware/cem-dt-885x/api.c
index 8a9a6e1..79282d5 100644
--- a/src/hardware/cem-dt-885x/api.c
+++ b/src/hardware/cem-dt-885x/api.c
@@ -154,11 +154,6 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -421,7 +416,7 @@ SR_PRIV struct sr_dev_driver cem_dt_885x_driver_info = {
.longname = "CEM DT-885x",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c
index 7c459ba..4d2d437 100644
--- a/src/hardware/center-3xx/api.c
+++ b/src/hardware/center-3xx/api.c
@@ -144,11 +144,6 @@ static GSList *dev_list(int idx)
return ((struct drv_context
*)(center_devs[idx].di->context))->instances;
}
-static int cleanup(int idx)
-{
- return dev_clear(idx);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -239,9 +234,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data)
#define HW_INIT(X) \
static int init_##X(struct sr_dev_driver *d, \
struct sr_context *sr_ctx) { (void)d; return init(sr_ctx, X); }
-#define HW_CLEANUP(X) \
-static int cleanup_##X(const struct sr_dev_driver *d) { \
- (void)d; return cleanup(X); }
#define HW_SCAN(X) \
static GSList *scan_##X(struct sr_dev_driver *d, GSList *options) { \
(void)d; return scan(options, X); }
@@ -258,7 +250,6 @@ void *cb_data) { return dev_acquisition_start(sdi, cb_data,
X); }
/* Driver structs and API function wrappers */
#define DRV(ID, ID_UPPER, NAME, LONGNAME) \
HW_INIT(ID_UPPER) \
-HW_CLEANUP(ID_UPPER) \
HW_SCAN(ID_UPPER) \
HW_DEV_LIST(ID_UPPER) \
HW_DEV_CLEAR(ID_UPPER) \
@@ -268,7 +259,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.longname = LONGNAME, \
.api_version = 1, \
.init = init_##ID_UPPER, \
- .cleanup = cleanup_##ID_UPPER, \
+ .cleanup = std_cleanup, \
.scan = scan_##ID_UPPER, \
.dev_list = dev_list_##ID_UPPER, \
.dev_clear = dev_clear_##ID_UPPER, \
diff --git a/src/hardware/chronovu-la/api.c b/src/hardware/chronovu-la/api.c
index 1410458..e77c6de 100644
--- a/src/hardware/chronovu-la/api.c
+++ b/src/hardware/chronovu-la/api.c
@@ -325,11 +325,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -604,7 +599,7 @@ SR_PRIV struct sr_dev_driver chronovu_la_driver_info = {
.longname = "ChronoVu LA8/LA16",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/colead-slm/api.c b/src/hardware/colead-slm/api.c
index cd8647d..2f354cf 100644
--- a/src/hardware/colead-slm/api.c
+++ b/src/hardware/colead-slm/api.c
@@ -114,11 +114,6 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -208,7 +203,7 @@ SR_PRIV struct sr_dev_driver colead_slm_driver_info = {
.longname = "Colead SLM",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/conrad-digi-35-cpu/api.c
b/src/hardware/conrad-digi-35-cpu/api.c
index 1f3abe8..8da6b8f 100644
--- a/src/hardware/conrad-digi-35-cpu/api.c
+++ b/src/hardware/conrad-digi-35-cpu/api.c
@@ -111,11 +111,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -207,7 +202,7 @@ SR_PRIV struct sr_dev_driver conrad_digi_35_cpu_driver_info
= {
.longname = "Conrad DIGI 35 CPU",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/demo/demo.c b/src/hardware/demo/demo.c
index f9da455..6412877 100644
--- a/src/hardware/demo/demo.c
+++ b/src/hardware/demo/demo.c
@@ -394,11 +394,6 @@ static int dev_clear(const struct sr_dev_driver *di)
return std_dev_clear(di, clear_helper);
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -905,7 +900,7 @@ SR_PRIV struct sr_dev_driver demo_driver_info = {
.longname = "Demo driver and pattern generator",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/deree-de5000/api.c b/src/hardware/deree-de5000/api.c
index 8619ccf..8c24eb1 100644
--- a/src/hardware/deree-de5000/api.c
+++ b/src/hardware/deree-de5000/api.c
@@ -54,11 +54,6 @@ static int dev_clear(const struct sr_dev_driver *di)
return std_dev_clear(di, es51919_serial_clean);
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static GSList *scan(struct sr_dev_driver *di, GSList *options)
{
struct sr_dev_inst *sdi;
@@ -76,7 +71,7 @@ SR_PRIV struct sr_dev_driver deree_de5000_driver_info = {
.longname = "DER EE DE-5000",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/fluke-dmm/api.c b/src/hardware/fluke-dmm/api.c
index 23b8adb..6b55bdb 100644
--- a/src/hardware/fluke-dmm/api.c
+++ b/src/hardware/fluke-dmm/api.c
@@ -194,11 +194,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -295,7 +290,7 @@ SR_PRIV struct sr_dev_driver flukedmm_driver_info = {
.longname = "Fluke 18x/28x series DMMs",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/ftdi-la/api.c b/src/hardware/ftdi-la/api.c
index 4657562..3a1d44a 100644
--- a/src/hardware/ftdi-la/api.c
+++ b/src/hardware/ftdi-la/api.c
@@ -348,15 +348,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- dev_clear(di);
-
- /* TODO: Free other driver resources, if any. */
-
- return SR_OK;
-}
-
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
@@ -518,7 +509,7 @@ SR_PRIV struct sr_dev_driver ftdi_la_driver_info = {
.longname = "FTDI LA",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/fx2lafw/api.c b/src/hardware/fx2lafw/api.c
index c6b1456..e0a9952 100644
--- a/src/hardware/fx2lafw/api.c
+++ b/src/hardware/fx2lafw/api.c
@@ -509,21 +509,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->context))
- return SR_OK;
-
- ret = std_dev_clear(di, NULL);
-
- g_free(drvc);
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -919,7 +904,7 @@ SR_PRIV struct sr_dev_driver fx2lafw_driver_info = {
.longname = "fx2lafw (generic driver for FX2 based LAs)",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c
index 85077df..9749b7e 100644
--- a/src/hardware/gmc-mh-1x-2x/api.c
+++ b/src/hardware/gmc-mh-1x-2x/api.c
@@ -375,11 +375,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -540,7 +535,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info
= {
.longname = "Gossen Metrawatt Metrahit 1x/2x, RS232 interface",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan_1x_2x_rs232,
.dev_list = dev_list,
.dev_clear = NULL,
@@ -559,7 +554,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = {
.longname = "Gossen Metrawatt Metrahit 2x, BD232/SI232-II interface",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan_2x_bd232,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/gwinstek-gds-800/api.c
b/src/hardware/gwinstek-gds-800/api.c
index cfec15e..745068d 100644
--- a/src/hardware/gwinstek-gds-800/api.c
+++ b/src/hardware/gwinstek-gds-800/api.c
@@ -135,13 +135,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- dev_clear(di);
-
- return SR_OK;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -267,7 +260,7 @@ SR_PRIV struct sr_dev_driver gwinstek_gds_800_driver_info =
{
.longname = "GW Instek GDS-800 series",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/hameg-hmo/api.c b/src/hardware/hameg-hmo/api.c
index 370b631..879178d 100644
--- a/src/hardware/hameg-hmo/api.c
+++ b/src/hardware/hameg-hmo/api.c
@@ -166,13 +166,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- dev_clear(di);
-
- return SR_OK;
-}
-
static int check_channel_group(struct dev_context *devc,
const struct sr_channel_group *cg)
{
@@ -796,7 +789,7 @@ SR_PRIV struct sr_dev_driver hameg_hmo_driver_info = {
.longname = "Hameg HMO",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/hantek-6xxx/api.c b/src/hardware/hantek-6xxx/api.c
index 480eb1c..bf28508 100644
--- a/src/hardware/hantek-6xxx/api.c
+++ b/src/hardware/hantek-6xxx/api.c
@@ -328,11 +328,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -831,7 +826,7 @@ SR_PRIV struct sr_dev_driver hantek_6xxx_driver_info = {
.longname = "Hantek 6xxx",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/hantek-dso/api.c b/src/hardware/hantek-dso/api.c
index 5fe431d..0787527 100644
--- a/src/hardware/hantek-dso/api.c
+++ b/src/hardware/hantek-dso/api.c
@@ -418,11 +418,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -1020,7 +1015,7 @@ SR_PRIV struct sr_dev_driver hantek_dso_driver_info = {
.longname = "Hantek DSO",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/hp-3457a/api.c b/src/hardware/hp-3457a/api.c
index eae8195..a2e59e0 100644
--- a/src/hardware/hp-3457a/api.c
+++ b/src/hardware/hp-3457a/api.c
@@ -244,11 +244,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
@@ -468,7 +463,7 @@ SR_PRIV struct sr_dev_driver hp_3457a_driver_info = {
.longname = "HP 3457A",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/hung-chang-dso-2100/api.c
b/src/hardware/hung-chang-dso-2100/api.c
index 45fff2b..3d2aba7 100644
--- a/src/hardware/hung-chang-dso-2100/api.c
+++ b/src/hardware/hung-chang-dso-2100/api.c
@@ -311,18 +311,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- struct drv_context *drvc = di->context;
- int ret;
-
- ret = dev_clear(di);
-
- g_free(drvc);
-
- return ret;
-}
-
static int find_in_array(GVariant *data, const GVariantType *type,
const void *arr, int n)
{
@@ -747,7 +735,7 @@ SR_PRIV struct sr_dev_driver
hung_chang_dso_2100_driver_info = {
.longname = "Hung-Chang DSO-2100",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/ikalogic-scanalogic2/api.c
b/src/hardware/ikalogic-scanalogic2/api.c
index 130addc..8fd420d 100644
--- a/src/hardware/ikalogic-scanalogic2/api.c
+++ b/src/hardware/ikalogic-scanalogic2/api.c
@@ -281,11 +281,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -493,7 +488,7 @@ SR_PRIV struct sr_dev_driver
ikalogic_scanalogic2_driver_info = {
.longname = "IKALOGIC Scanalogic-2",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/ikalogic-scanaplus/api.c
b/src/hardware/ikalogic-scanaplus/api.c
index ba4652e..1388592 100644
--- a/src/hardware/ikalogic-scanaplus/api.c
+++ b/src/hardware/ikalogic-scanaplus/api.c
@@ -261,11 +261,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return ret;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -410,7 +405,7 @@ SR_PRIV struct sr_dev_driver ikalogic_scanaplus_driver_info
= {
.longname = "IKALOGIC ScanaPLUS",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/kecheng-kc-330b/api.c
b/src/hardware/kecheng-kc-330b/api.c
index d294bf0..9e06e34 100644
--- a/src/hardware/kecheng-kc-330b/api.c
+++ b/src/hardware/kecheng-kc-330b/api.c
@@ -227,21 +227,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->context))
- /* Can get called on an unused driver, doesn't matter. */
- return SR_OK;
-
- ret = std_dev_clear(di, NULL);
- g_free(drvc);
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -556,7 +541,7 @@ SR_PRIV struct sr_dev_driver kecheng_kc_330b_driver_info = {
.longname = "Kecheng KC-330B",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index 0443f5e..d461b86 100644
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -129,11 +129,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -230,7 +225,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data)
.longname = VENDOR " " MODEL, \
.api_version = 1, \
.init = init, \
- .cleanup = cleanup, \
+ .cleanup = std_cleanup, \
.scan = scan, \
.dev_list = dev_list, \
.dev_clear = dev_clear, \
diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 8753b1a..2ed113f 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -188,12 +188,6 @@ static int dev_clear(const struct sr_dev_driver *di)
return std_dev_clear(di, NULL);
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- dev_clear(di);
- return SR_OK;
-}
-
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
@@ -421,7 +415,7 @@ SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = {
.longname = "Korad KAxxxxP",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/lascar-el-usb/api.c b/src/hardware/lascar-el-usb/api.c
index c8938f2..b5ab39d 100644
--- a/src/hardware/lascar-el-usb/api.c
+++ b/src/hardware/lascar-el-usb/api.c
@@ -144,21 +144,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->context))
- /* Can get called on an unused driver, doesn't matter. */
- return SR_OK;
-
- ret = std_dev_clear(di, NULL);
- g_free(drvc);
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -473,7 +458,7 @@ SR_PRIV struct sr_dev_driver lascar_el_usb_driver_info = {
.longname = "Lascar EL-USB",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/lecroy-logicstudio/api.c
b/src/hardware/lecroy-logicstudio/api.c
index 53e7b01..2480ef4 100644
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -380,20 +380,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- struct drv_context *drvc;
- int ret;
-
- drvc = di->context;
-
- ret = dev_clear(di);
-
- g_free(drvc);
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
@@ -543,7 +529,7 @@ SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info
= {
.longname = "LeCroy LogicStudio",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/link-mso19/api.c b/src/hardware/link-mso19/api.c
index a0f033a..a4d913b 100644
--- a/src/hardware/link-mso19/api.c
+++ b/src/hardware/link-mso19/api.c
@@ -264,11 +264,6 @@ static int dev_open(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear();
-}
-
static int config_get(int key, GVariant **data, const struct sr_dev_inst *sdi,
const struct sr_channel_group *cg)
{
@@ -473,7 +468,7 @@ SR_PRIV struct sr_dev_driver link_mso19_driver_info = {
.longname = "Link Instruments MSO-19",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/manson-hcs-3xxx/api.c
b/src/hardware/manson-hcs-3xxx/api.c
index 917a7c0..92d69f5 100644
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -210,11 +210,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -425,7 +420,7 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = {
.longname = "Manson HCS-3xxx",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index b2f7e11..c089565 100644
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -253,11 +253,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -506,7 +501,7 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = {
.longname = "maynuo M97/M98 series",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index 775bcc0..25f7aeb 100644
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -150,11 +150,6 @@ static GSList *dev_list(int idx)
return ((struct drv_context *)(mic_devs[idx].di->context))->instances;
}
-static int cleanup(int idx)
-{
- return dev_clear(idx);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -247,9 +242,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data)
#define HW_INIT(X) \
static int init_##X(struct sr_dev_driver *di, struct sr_context *sr_ctx) { \
(void)di; return init(sr_ctx, X); }
-#define HW_CLEANUP(X) \
-static int cleanup_##X(const struct sr_dev_driver *di) { \
- (void)di; return cleanup(X); }
#define HW_SCAN(X) \
static GSList *scan_##X(struct sr_dev_driver *di, GSList *options) { \
(void)di; return scan(options, X); }
@@ -270,7 +262,6 @@ void *cb_data) { return dev_acquisition_start(sdi, cb_data,
X); }
/* Driver structs and API function wrappers */
#define DRV(ID, ID_UPPER, NAME, LONGNAME) \
HW_INIT(ID_UPPER) \
-HW_CLEANUP(ID_UPPER) \
HW_SCAN(ID_UPPER) \
HW_DEV_LIST(ID_UPPER) \
HW_DEV_CLEAR(ID_UPPER) \
@@ -281,7 +272,7 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.longname = LONGNAME, \
.api_version = 1, \
.init = init_##ID_UPPER, \
- .cleanup = cleanup_##ID_UPPER, \
+ .cleanup = std_cleanup, \
.scan = scan_##ID_UPPER, \
.dev_list = dev_list_##ID_UPPER, \
.dev_clear = dev_clear_##ID_UPPER, \
diff --git a/src/hardware/motech-lps-30x/api.c
b/src/hardware/motech-lps-30x/api.c
index 0ecfcb0..f56b02e 100644
--- a/src/hardware/motech-lps-30x/api.c
+++ b/src/hardware/motech-lps-30x/api.c
@@ -538,11 +538,6 @@ static int dev_clear_lps301(const struct sr_dev_driver *di)
return std_dev_clear(di, (std_dev_clear_callback)dev_clear_private);
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear_lps301(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -840,7 +835,7 @@ SR_PRIV struct sr_dev_driver motech_lps_301_driver_info = {
.longname = "Motech LPS-301",
.api_version = 1,
.init = init_lps301,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan_lps301,
.dev_list = dev_list_lps301,
.dev_clear = dev_clear_lps301,
diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c
index 9e0be39..5162f40 100644
--- a/src/hardware/norma-dmm/api.c
+++ b/src/hardware/norma-dmm/api.c
@@ -193,11 +193,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -294,7 +289,7 @@ SR_PRIV struct sr_dev_driver norma_dmm_driver_info = {
.longname = "Norma DM9x0 DMMs",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
@@ -313,7 +308,7 @@ SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = {
.longname = "Siemens B102x DMMs",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/openbench-logic-sniffer/api.c
b/src/hardware/openbench-logic-sniffer/api.c
index ddd33e1..78b4ef4 100644
--- a/src/hardware/openbench-logic-sniffer/api.c
+++ b/src/hardware/openbench-logic-sniffer/api.c
@@ -215,11 +215,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -596,7 +591,7 @@ SR_PRIV struct sr_dev_driver ols_driver_info = {
.longname = "Openbench Logic Sniffer",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/pipistrello-ols/api.c
b/src/hardware/pipistrello-ols/api.c
index 44af401..83331c9 100644
--- a/src/hardware/pipistrello-ols/api.c
+++ b/src/hardware/pipistrello-ols/api.c
@@ -220,11 +220,6 @@ static int dev_clear(const struct sr_dev_driver *di)
return std_dev_clear(di, clear_helper);
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -728,7 +723,7 @@ SR_PRIV struct sr_dev_driver p_ols_driver_info = {
.longname = "Pipistrello OLS",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/rigol-ds/api.c b/src/hardware/rigol-ds/api.c
index 1f784cf..7871af5 100644
--- a/src/hardware/rigol-ds/api.c
+++ b/src/hardware/rigol-ds/api.c
@@ -459,11 +459,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int analog_frame_size(const struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
@@ -1078,7 +1073,7 @@ SR_PRIV struct sr_dev_driver rigol_ds_driver_info = {
.longname = "Rigol DS",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/saleae-logic16/api.c
b/src/hardware/saleae-logic16/api.c
index bee0ea4..70b2eac 100644
--- a/src/hardware/saleae-logic16/api.c
+++ b/src/hardware/saleae-logic16/api.c
@@ -402,21 +402,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->context))
- /* Can get called on an unused driver, doesn't matter. */
- return SR_OK;
-
- ret = std_dev_clear(di, NULL);
- g_free(drvc);
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -821,7 +806,7 @@ SR_PRIV struct sr_dev_driver saleae_logic16_driver_info = {
.longname = "Saleae Logic16",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/scpi-pps/api.c b/src/hardware/scpi-pps/api.c
index dbe8dcb..40771f1 100644
--- a/src/hardware/scpi-pps/api.c
+++ b/src/hardware/scpi-pps/api.c
@@ -248,11 +248,6 @@ static int dev_clear(const struct sr_dev_driver *di)
return std_dev_clear(di, clear_helper);
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -648,7 +643,7 @@ SR_PRIV struct sr_dev_driver scpi_pps_driver_info = {
.longname = "SCPI PPS",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index a589d01..0fc2753 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -155,11 +155,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -259,7 +254,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data)
.longname = VENDOR " " MODEL, \
.api_version = 1, \
.init = init, \
- .cleanup = cleanup, \
+ .cleanup = std_cleanup, \
.scan = scan, \
.dev_list = dev_list, \
.dev_clear = dev_clear, \
diff --git a/src/hardware/sysclk-lwla/api.c b/src/hardware/sysclk-lwla/api.c
index 7e61903..1467698 100644
--- a/src/hardware/sysclk-lwla/api.c
+++ b/src/hardware/sysclk-lwla/api.c
@@ -807,7 +807,7 @@ SR_PRIV struct sr_dev_driver sysclk_lwla_driver_info = {
.longname = "SysClk LWLA series",
.api_version = 1,
.init = init,
- .cleanup = dev_clear,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/teleinfo/api.c b/src/hardware/teleinfo/api.c
index dbf7f03..687b9bb 100644
--- a/src/hardware/teleinfo/api.c
+++ b/src/hardware/teleinfo/api.c
@@ -138,11 +138,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -238,7 +233,7 @@ SR_PRIV struct sr_dev_driver teleinfo_driver_info = {
.longname = "Teleinfo",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index 0c37886..e8c7d80 100644
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -230,20 +230,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->context))
- return SR_OK;
-
- ret = dev_clear(di);
- g_free(drvc);
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -525,7 +511,7 @@ SR_PRIV struct sr_dev_driver testo_driver_info = {
.longname = "Testo",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/tondaj-sl-814/api.c b/src/hardware/tondaj-sl-814/api.c
index 5e83def..490f8ca 100644
--- a/src/hardware/tondaj-sl-814/api.c
+++ b/src/hardware/tondaj-sl-814/api.c
@@ -111,11 +111,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -195,7 +190,7 @@ SR_PRIV struct sr_dev_driver tondaj_sl_814_driver_info = {
.longname = "Tondaj SL-814",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index f74d10d..c6a631a 100644
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -139,11 +139,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return dev_clear(di);
-}
-
static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -234,7 +229,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data)
.longname = VENDOR " " MODEL, \
.api_version = 1, \
.init = init, \
- .cleanup = cleanup, \
+ .cleanup = std_cleanup, \
.scan = scan, \
.dev_list = dev_list, \
.dev_clear = dev_clear, \
diff --git a/src/hardware/uni-t-ut32x/api.c b/src/hardware/uni-t-ut32x/api.c
index 433729e..4a9d76a 100644
--- a/src/hardware/uni-t-ut32x/api.c
+++ b/src/hardware/uni-t-ut32x/api.c
@@ -171,21 +171,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->context))
- /* Can get called on an unused driver, doesn't matter. */
- return SR_OK;
-
- ret = std_dev_clear(di, NULL);
- g_free(drvc);
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -355,7 +340,7 @@ SR_PRIV struct sr_dev_driver uni_t_ut32x_driver_info = {
.longname = "UNI-T UT32x",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/victor-dmm/api.c b/src/hardware/victor-dmm/api.c
index 8e8f027..c4e8af0 100644
--- a/src/hardware/victor-dmm/api.c
+++ b/src/hardware/victor-dmm/api.c
@@ -183,21 +183,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- int ret;
- struct drv_context *drvc;
-
- if (!(drvc = di->context))
- /* Can get called on an unused driver, doesn't matter. */
- return SR_OK;
-
- ret = std_dev_clear(di, NULL);
- g_free(drvc);
-
- return ret;
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -435,7 +420,7 @@ SR_PRIV struct sr_dev_driver victor_dmm_driver_info = {
.longname = "Victor DMMs",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c
index 21fa165..52b6668 100644
--- a/src/hardware/yokogawa-dlm/api.c
+++ b/src/hardware/yokogawa-dlm/api.c
@@ -176,13 +176,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- dev_clear(di);
-
- return SR_OK;
-}
-
/**
* Check which category a given channel group belongs to.
*
@@ -703,7 +696,7 @@ SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = {
.longname = "Yokogawa DL/DLM",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = dev_clear,
diff --git a/src/hardware/zeroplus-logic-cube/api.c
b/src/hardware/zeroplus-logic-cube/api.c
index 657e5eb..6542356 100644
--- a/src/hardware/zeroplus-logic-cube/api.c
+++ b/src/hardware/zeroplus-logic-cube/api.c
@@ -377,11 +377,6 @@ static int dev_close(struct sr_dev_inst *sdi)
return SR_OK;
}
-static int cleanup(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst
*sdi,
const struct sr_channel_group *cg)
{
@@ -725,7 +720,7 @@ SR_PRIV struct sr_dev_driver
zeroplus_logic_cube_driver_info = {
.longname = "ZEROPLUS Logic Cube LAP-C series",
.api_version = 1,
.init = init,
- .cleanup = cleanup,
+ .cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
.dev_clear = NULL,
diff --git a/src/libsigrok-internal.h b/src/libsigrok-internal.h
index 0cf5288..3d2ca8c 100644
--- a/src/libsigrok-internal.h
+++ b/src/libsigrok-internal.h
@@ -849,6 +849,7 @@ typedef void (*std_dev_clear_callback)(void *priv);
SR_PRIV int std_init(struct sr_context *sr_ctx, struct sr_dev_driver *di,
const char *prefix);
+SR_PRIV int std_cleanup(const struct sr_dev_driver *di);
#ifdef HAVE_LIBSERIALPORT
SR_PRIV int std_serial_dev_open(struct sr_dev_inst *sdi);
SR_PRIV int std_serial_dev_acquisition_stop(struct sr_dev_inst *sdi,
diff --git a/src/std.c b/src/std.c
index 5595224..a2a62b7 100644
--- a/src/std.c
+++ b/src/std.c
@@ -64,6 +64,28 @@ SR_PRIV int std_init(struct sr_context *sr_ctx, struct
sr_dev_driver *di,
}
/**
+ * Standard driver cleanup() callback API helper
+ *
+ * @param di The driver instance to use.
+ *
+ * Frees all device instances by calling sr_dev_clear() and then releases all
+ * resources allocated by std_init().
+ *
+ * @retval SR_OK Success
+ * @retval SR_ERR_ARG Invalid driver
+ *
+*/
+SR_PRIV int std_cleanup(const struct sr_dev_driver *di)
+{
+ int ret;
+
+ ret = sr_dev_clear(di);
+ g_free(di->context);
+
+ return ret;
+}
+
+/**
* Standard API helper for sending an SR_DF_HEADER packet.
*
* This function can be used to simplify most driver's
--
2.1.4
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________
sigrok-devel mailing list
sigrok-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/sigrok-devel
