X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fapi.c;h=5716d3bd484f7c8ec6d84426689017a2c0123181;hb=88a0265ebcb265ba839c02cc5bcd39e359c9f60f;hp=494153fa3c6a1fbcc3d9cef2f9626742efade7ea;hpb=c442ffda0fc6fa9bc3c5397a21ef1d04f01a64a1;p=libsigrok.git
diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c
index 494153fa..5716d3bd 100644
--- a/src/hardware/maynuo-m97/api.c
+++ b/src/hardware/maynuo-m97/api.c
@@ -17,6 +17,7 @@
* along with this program. If not, see .
*/
+#include
#include "protocol.h"
static const uint32_t scanopts[] = {
@@ -134,7 +135,7 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus)
break;
}
if (model == NULL) {
- sr_err("Unkown model: %d.", id);
+ sr_err("Unknown model: %d.", id);
return NULL;
}
@@ -203,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;
@@ -252,11 +248,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)
{
@@ -350,7 +341,6 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
struct sr_modbus_dev_inst *modbus;
int ret;
- (void)data;
(void)cg;
if (sdi->status != SR_ST_ACTIVE)
@@ -452,15 +442,12 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *
return ret;
}
-static int dev_acquisition_start(const struct sr_dev_inst *sdi,
- void *cb_data)
+static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
struct sr_modbus_dev_inst *modbus;
int ret;
- (void)cb_data;
-
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
@@ -471,7 +458,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
maynuo_m97_receive_data, (void *)sdi)) != SR_OK)
return ret;
- /* Send header packet to the session bus. */
std_session_send_df_header(sdi, LOG_PREFIX);
devc->num_samples = 0;
@@ -480,19 +466,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
return maynuo_m97_capture_start(sdi);
}
-static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data)
+static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
struct sr_modbus_dev_inst *modbus;
- struct sr_datafeed_packet packet;
-
- (void)cb_data;
if (sdi->status != SR_ST_ACTIVE)
return SR_ERR_DEV_CLOSED;
- /* End of last frame. */
- packet.type = SR_DF_END;
- sr_session_send(sdi, &packet);
+ std_session_send_df_end(sdi, LOG_PREFIX);
modbus = sdi->conn;
sr_modbus_source_remove(sdi->session, modbus);
@@ -505,10 +486,9 @@ 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,
.config_get = config_get,
.config_set = config_set,
.config_list = config_list,