X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fmaynuo-m97%2Fapi.c;h=682254315429732f14697e59b38369e03ce0fdb4;hb=0f33aaef545e7289a02dc8115b282b24bb16fc27;hp=c2b77b800ec9667ab7ba4633e0139a26a4645308;hpb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;p=libsigrok.git diff --git a/src/hardware/maynuo-m97/api.c b/src/hardware/maynuo-m97/api.c index c2b77b80..68225431 100644 --- a/src/hardware/maynuo-m97/api.c +++ b/src/hardware/maynuo-m97/api.c @@ -109,7 +109,7 @@ static const struct maynuo_m97_model supported_models[] = { // { 102, "M9812B" , 15, 500, 300 }, }; -SR_PRIV struct sr_dev_driver maynuo_m97_driver_info; +static struct sr_dev_driver maynuo_m97_driver_info; static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus) { @@ -135,7 +135,7 @@ static struct sr_dev_inst *probe_device(struct sr_modbus_dev_inst *modbus) } sdi = g_malloc0(sizeof(struct sr_dev_inst)); - sdi->status = SR_ST_ACTIVE; + sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("Maynuo"); sdi->model = g_strdup(model->name); sdi->version = g_strdup_printf("v%d.%d", version/10, version%10); @@ -445,7 +445,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return ret; sr_sw_limits_acquisition_start(&devc->limits); - std_session_send_df_header(sdi, LOG_PREFIX); + std_session_send_df_header(sdi); return maynuo_m97_capture_start(sdi); } @@ -457,7 +457,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - std_session_send_df_end(sdi, LOG_PREFIX); + std_session_send_df_end(sdi); modbus = sdi->conn; sr_modbus_source_remove(sdi->session, modbus); @@ -465,7 +465,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) return SR_OK; } -SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = { +static struct sr_dev_driver maynuo_m97_driver_info = { .name = "maynuo-m97", .longname = "maynuo M97/M98 series", .api_version = 1, @@ -482,3 +482,4 @@ SR_PRIV struct sr_dev_driver maynuo_m97_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(maynuo_m97_driver_info);