If a driver does not implement a dev_clear() callback the core will
automatically call std_dev_clear(di, NULL). Remove all driver dev_clear()
implementations that are identical to default. This reduces the amount of
boiler-plate code.
Signed-off-by: Lars-Peter Clausen <l...@metafoo.de>
---
src/hardware/arachnid-labs-re-load-pro/api.c | 6 ------
src/hardware/baylibre-acme/api.c | 6 ------
src/hardware/beaglelogic/api.c | 6 ------
src/hardware/center-3xx/api.c | 10 ----------
src/hardware/gwinstek-gds-800/api.c | 6 ------
src/hardware/hp-3457a/api.c | 6 ------
src/hardware/kern-scale/api.c | 6 ------
src/hardware/korad-kaxxxxp/api.c | 6 ------
src/hardware/lecroy-logicstudio/api.c | 6 ------
src/hardware/manson-hcs-3xxx/api.c | 6 ------
src/hardware/maynuo-m97/api.c | 6 ------
src/hardware/mic-985xx/api.c | 10 ----------
src/hardware/serial-dmm/api.c | 6 ------
src/hardware/testo/api.c | 6 ------
src/hardware/uni-t-dmm/api.c | 6 ------
15 files changed, 98 deletions(-)
diff --git a/src/hardware/arachnid-labs-re-load-pro/api.c
b/src/hardware/arachnid-labs-re-load-pro/api.c
index ab1d557..09b7a9c 100644
--- a/src/hardware/arachnid-labs-re-load-pro/api.c
+++ b/src/hardware/arachnid-labs-re-load-pro/api.c
@@ -169,11 +169,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int config_list(uint32_t key, GVariant **data,
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg)
{
@@ -386,7 +381,6 @@ SR_PRIV struct sr_dev_driver
arachnid_labs_re_load_pro_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/baylibre-acme/api.c b/src/hardware/baylibre-acme/api.c
index 0a500b7..c4c0737 100644
--- a/src/hardware/baylibre-acme/api.c
+++ b/src/hardware/baylibre-acme/api.c
@@ -147,11 +147,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int dev_open(struct sr_dev_inst *sdi)
{
(void)sdi;
@@ -428,7 +423,6 @@ SR_PRIV struct sr_dev_driver baylibre_acme_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/beaglelogic/api.c b/src/hardware/beaglelogic/api.c
index 30b166e..ae3ebe8 100644
--- a/src/hardware/beaglelogic/api.c
+++ b/src/hardware/beaglelogic/api.c
@@ -150,11 +150,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int dev_open(struct sr_dev_inst *sdi)
{
struct dev_context *devc = sdi->priv;
@@ -391,7 +386,6 @@ SR_PRIV struct sr_dev_driver beaglelogic_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/center-3xx/api.c b/src/hardware/center-3xx/api.c
index 4d2d437..a51d9ac 100644
--- a/src/hardware/center-3xx/api.c
+++ b/src/hardware/center-3xx/api.c
@@ -56,11 +56,6 @@ SR_PRIV const struct center_dev_info center_devs[] = {
},
};
-static int dev_clear(int idx)
-{
- return std_dev_clear(center_devs[idx].di, NULL);
-}
-
static int init(struct sr_context *sr_ctx, int idx)
{
return std_init(sr_ctx, center_devs[idx].di, LOG_PREFIX);
@@ -240,9 +235,6 @@ static GSList *scan_##X(struct sr_dev_driver *d, GSList
*options) { \
#define HW_DEV_LIST(X) \
static GSList *dev_list_##X(const struct sr_dev_driver *d) { \
(void)d; return dev_list(X); }
-#define HW_DEV_CLEAR(X) \
-static int dev_clear_##X(const struct sr_dev_driver *d) { \
- (void)d; return dev_clear(X); }
#define HW_DEV_ACQUISITION_START(X) \
static int dev_acquisition_start_##X(const struct sr_dev_inst *sdi, \
void *cb_data) { return dev_acquisition_start(sdi, cb_data, X); }
@@ -252,7 +244,6 @@ void *cb_data) { return dev_acquisition_start(sdi, cb_data,
X); }
HW_INIT(ID_UPPER) \
HW_SCAN(ID_UPPER) \
HW_DEV_LIST(ID_UPPER) \
-HW_DEV_CLEAR(ID_UPPER) \
HW_DEV_ACQUISITION_START(ID_UPPER) \
SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.name = NAME, \
@@ -262,7 +253,6 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.cleanup = std_cleanup, \
.scan = scan_##ID_UPPER, \
.dev_list = dev_list_##ID_UPPER, \
- .dev_clear = dev_clear_##ID_UPPER, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
diff --git a/src/hardware/gwinstek-gds-800/api.c
b/src/hardware/gwinstek-gds-800/api.c
index 745068d..133ab2f 100644
--- a/src/hardware/gwinstek-gds-800/api.c
+++ b/src/hardware/gwinstek-gds-800/api.c
@@ -98,11 +98,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int dev_open(struct sr_dev_inst *sdi)
{
int ret;
@@ -263,7 +258,6 @@ SR_PRIV struct sr_dev_driver gwinstek_gds_800_driver_info =
{
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/hp-3457a/api.c b/src/hardware/hp-3457a/api.c
index a2e59e0..083aad5 100644
--- a/src/hardware/hp-3457a/api.c
+++ b/src/hardware/hp-3457a/api.c
@@ -181,11 +181,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
/*
* We need to set the HP 3457A to a known state, and there are quite a number
* of knobs to tweak. Here's a brief explanation of what's going on. For more
@@ -466,7 +461,6 @@ SR_PRIV struct sr_dev_driver hp_3457a_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/kern-scale/api.c b/src/hardware/kern-scale/api.c
index d461b86..49f19c4 100644
--- a/src/hardware/kern-scale/api.c
+++ b/src/hardware/kern-scale/api.c
@@ -36,11 +36,6 @@ static const uint32_t devopts[] = {
SR_CONF_LIMIT_MSEC | SR_CONF_SET,
};
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
@@ -228,7 +223,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data)
.cleanup = std_cleanup, \
.scan = scan, \
.dev_list = dev_list, \
- .dev_clear = dev_clear, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
diff --git a/src/hardware/korad-kaxxxxp/api.c b/src/hardware/korad-kaxxxxp/api.c
index 2ed113f..a22b838 100644
--- a/src/hardware/korad-kaxxxxp/api.c
+++ b/src/hardware/korad-kaxxxxp/api.c
@@ -183,11 +183,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int dev_clear(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)
{
@@ -418,7 +413,6 @@ SR_PRIV struct sr_dev_driver korad_kaxxxxp_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/lecroy-logicstudio/api.c
b/src/hardware/lecroy-logicstudio/api.c
index 2480ef4..f5dc117 100644
--- a/src/hardware/lecroy-logicstudio/api.c
+++ b/src/hardware/lecroy-logicstudio/api.c
@@ -196,11 +196,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int open_device(struct sr_dev_inst *sdi)
{
struct drv_context *drvc;
@@ -532,7 +527,6 @@ SR_PRIV struct sr_dev_driver lecroy_logicstudio_driver_info
= {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/manson-hcs-3xxx/api.c
b/src/hardware/manson-hcs-3xxx/api.c
index 92d69f5..725ec31 100644
--- a/src/hardware/manson-hcs-3xxx/api.c
+++ b/src/hardware/manson-hcs-3xxx/api.c
@@ -75,11 +75,6 @@ static const struct hcs_model models[] = {
SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info;
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
@@ -423,7 +418,6 @@ SR_PRIV struct sr_dev_driver manson_hcs_3xxx_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index c089565..a1ca131 100644
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/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 dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, g_free);
-}
-
static int dev_open(struct sr_dev_inst *sdi)
{
struct sr_modbus_dev_inst *modbus = sdi->conn;
@@ -504,7 +499,6 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/mic-985xx/api.c b/src/hardware/mic-985xx/api.c
index 25f7aeb..1d3299a 100644
--- a/src/hardware/mic-985xx/api.c
+++ b/src/hardware/mic-985xx/api.c
@@ -57,11 +57,6 @@ SR_PRIV const struct mic_dev_info mic_devs[] = {
},
};
-static int dev_clear(int idx)
-{
- return std_dev_clear(mic_devs[idx].di, NULL);
-}
-
static int init(struct sr_context *sr_ctx, int idx)
{
return std_init(sr_ctx, mic_devs[idx].di, LOG_PREFIX);
@@ -248,9 +243,6 @@ static GSList *scan_##X(struct sr_dev_driver *di, GSList
*options) { \
#define HW_DEV_LIST(X) \
static GSList *dev_list_##X(const struct sr_dev_driver *di) { \
(void)di; return dev_list(X); }
-#define HW_DEV_CLEAR(X) \
-static int dev_clear_##X(const struct sr_dev_driver *di) { \
- (void)di; return dev_clear(X); }
#define HW_CONFIG_LIST(X) \
static int config_list_##X(uint32_t key, GVariant **data, \
const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { \
@@ -264,7 +256,6 @@ void *cb_data) { return dev_acquisition_start(sdi, cb_data,
X); }
HW_INIT(ID_UPPER) \
HW_SCAN(ID_UPPER) \
HW_DEV_LIST(ID_UPPER) \
-HW_DEV_CLEAR(ID_UPPER) \
HW_CONFIG_LIST(ID_UPPER) \
HW_DEV_ACQUISITION_START(ID_UPPER) \
SR_PRIV struct sr_dev_driver ID##_driver_info = { \
@@ -275,7 +266,6 @@ SR_PRIV struct sr_dev_driver ID##_driver_info = { \
.cleanup = std_cleanup, \
.scan = scan_##ID_UPPER, \
.dev_list = dev_list_##ID_UPPER, \
- .dev_clear = dev_clear_##ID_UPPER, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list_##ID_UPPER, \
diff --git a/src/hardware/serial-dmm/api.c b/src/hardware/serial-dmm/api.c
index 0fc2753..8222d5c 100644
--- a/src/hardware/serial-dmm/api.c
+++ b/src/hardware/serial-dmm/api.c
@@ -41,11 +41,6 @@ static const uint32_t devopts[] = {
SR_CONF_LIMIT_MSEC | SR_CONF_SET,
};
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
@@ -257,7 +252,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data)
.cleanup = std_cleanup, \
.scan = scan, \
.dev_list = dev_list, \
- .dev_clear = dev_clear, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
diff --git a/src/hardware/testo/api.c b/src/hardware/testo/api.c
index e8c7d80..2ca80bf 100644
--- a/src/hardware/testo/api.c
+++ b/src/hardware/testo/api.c
@@ -151,11 +151,6 @@ static GSList *dev_list(const struct sr_dev_driver *di)
return ((struct drv_context *)(di->context))->instances;
}
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int dev_open(struct sr_dev_inst *sdi)
{
struct sr_dev_driver *di = sdi->driver;
@@ -514,7 +509,6 @@ SR_PRIV struct sr_dev_driver testo_driver_info = {
.cleanup = std_cleanup,
.scan = scan,
.dev_list = dev_list,
- .dev_clear = dev_clear,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,
diff --git a/src/hardware/uni-t-dmm/api.c b/src/hardware/uni-t-dmm/api.c
index c6a631a..4915ff3 100644
--- a/src/hardware/uni-t-dmm/api.c
+++ b/src/hardware/uni-t-dmm/api.c
@@ -46,11 +46,6 @@ static const uint32_t devopts[] = {
* default of 2400 being used (which will not work with this DMM, of course).
*/
-static int dev_clear(const struct sr_dev_driver *di)
-{
- return std_dev_clear(di, NULL);
-}
-
static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx)
{
return std_init(sr_ctx, di, LOG_PREFIX);
@@ -232,7 +227,6 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi,
void *cb_data)
.cleanup = std_cleanup, \
.scan = scan, \
.dev_list = dev_list, \
- .dev_clear = dev_clear, \
.config_get = NULL, \
.config_set = config_set, \
.config_list = config_list, \
--
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
