X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fgmc-mh-1x-2x%2Fapi.c;h=28927fc53d58247850e0e4308f63d9677af29412;hb=c50805d59ce85e00ef263c0a1edad2487bb8a9fe;hp=bf0b3691fc5f5831be233ad0f9dffdc783e0ccdc;hpb=1a8639164e4e44a43fe1558e30823606f7b607b3;p=libsigrok.git diff --git a/src/hardware/gmc-mh-1x-2x/api.c b/src/hardware/gmc-mh-1x-2x/api.c index bf0b3691..28927fc5 100644 --- a/src/hardware/gmc-mh-1x-2x/api.c +++ b/src/hardware/gmc-mh-1x-2x/api.c @@ -22,6 +22,7 @@ * @internal */ +#include #include #include "protocol.h" @@ -58,7 +59,6 @@ static const uint32_t devopts_bd[] = { SR_CONF_POWER_OFF | SR_CONF_GET | SR_CONF_SET, }; - /* TODO: * - For the 29S SR_CONF_ENERGYMETER, too. * - SR_CONF_PATTERN_MODE for some 2x devices @@ -109,7 +109,7 @@ static enum model scan_model_sm(struct sr_serial_dev_inst *serial) gint64 timeout_us; model = METRAHIT_NONE; - timeout_us = g_get_monotonic_time() + 1 * 1000 * 1000; + timeout_us = g_get_monotonic_time() + (1 * 1000 * 1000); /* * Try to find message consisting of device code and several @@ -162,10 +162,9 @@ static GSList *scan_1x_2x_rs232(struct sr_dev_driver *di, GSList *options) gboolean serialcomm_given; devices = NULL; - drvc = di->priv; + drvc = di->context; drvc->instances = NULL; conn = serialcomm = NULL; - model = METRAHIT_NONE; serialcomm_given = FALSE; sr_spew("scan_1x_2x_rs232() called!"); @@ -257,7 +256,7 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options) conn = serialcomm = NULL; devices = NULL; - drvc = di->priv; + drvc = di->context; drvc->instances = NULL; sr_spew("scan_2x_bd232() called!"); @@ -292,23 +291,22 @@ static GSList *scan_2x_bd232(struct sr_dev_driver *di, GSList *options) /* Send message 03 "Query multimeter version and status" */ sdi->conn = serial; - sdi->priv = devc; if (req_stat14(sdi, TRUE) != SR_OK) goto exit_err; /* Wait for reply from device(s) for up to 2s. */ - timeout_us = g_get_monotonic_time() + 2*1000*1000; + timeout_us = g_get_monotonic_time() + (2 * 1000 * 1000); while (timeout_us > g_get_monotonic_time()) { /* Receive reply (14 bytes) */ devc->buflen = 0; - for (cnt = 0; cnt < 14; cnt++) { + for (cnt = 0; cnt < GMC_REPLY_SIZE; cnt++) { byte = read_byte(serial, timeout_us); if (byte != -1) devc->buf[devc->buflen++] = (byte & MASK_6BITS); } - if (devc->buflen != 14) + if (devc->buflen != GMC_REPLY_SIZE) continue; devc->addr = devc->buf[0]; @@ -346,8 +344,7 @@ exit_err: if (serial) sr_serial_dev_inst_free(serial); - if (devc) - g_free(devc); + g_free(devc); if (sdi) sr_dev_inst_free(sdi); @@ -356,7 +353,7 @@ exit_err: static GSList *dev_list(const struct sr_dev_driver *di) { - return ((struct drv_context *)(di->priv))->instances; + return ((struct drv_context *)(di->context))->instances; } static int dev_close(struct sr_dev_inst *sdi) @@ -390,8 +387,6 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s (void)cg; - ret = SR_OK; - if (!sdi || !(devc = sdi->priv)) return SR_ERR_ARG; @@ -464,24 +459,19 @@ static int config_list_bd(uint32_t key, GVariant **data, const struct sr_dev_ins return SR_OK; } -static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_serial_dev_inst *serial; - if (!sdi || !cb_data || !(devc = sdi->priv)) - return SR_ERR_BUG; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - devc->cb_data = cb_data; + devc = sdi->priv; devc->settings_ok = FALSE; devc->buflen = 0; - /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi, LOG_PREFIX); /* Start timer, if required. */ if (devc->limit_msec) @@ -495,24 +485,19 @@ static int dev_acquisition_start_1x_2x_rs232(const struct sr_dev_inst *sdi, return SR_OK; } -static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi, - void *cb_data) +static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi) { struct dev_context *devc; struct sr_serial_dev_inst *serial; - if (!sdi || !cb_data || !(devc = sdi->priv)) - return SR_ERR_BUG; - if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; - devc->cb_data = cb_data; + devc = sdi->priv; devc->settings_ok = FALSE; devc->buflen = 0; - /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, LOG_PREFIX); + std_session_send_df_header(sdi, LOG_PREFIX); /* Start timer, if required. */ if (devc->limit_msec) @@ -527,7 +512,7 @@ static int dev_acquisition_start_2x_bd232(const struct sr_dev_inst *sdi, return req_meas14(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 dev_context *devc; @@ -535,7 +520,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data) if (sdi && (devc = sdi->priv) && devc->limit_msec) g_timer_stop(devc->elapsed_msec); - return std_serial_dev_acquisition_stop(sdi, cb_data, dev_close, + return std_serial_dev_acquisition_stop(sdi, dev_close, sdi->conn, LOG_PREFIX); } @@ -555,7 +540,7 @@ SR_PRIV struct sr_dev_driver gmc_mh_1x_2x_rs232_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start_1x_2x_rs232, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, }; SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = { @@ -574,5 +559,5 @@ SR_PRIV struct sr_dev_driver gmc_mh_2x_bd232_driver_info = { .dev_close = dev_close, .dev_acquisition_start = dev_acquisition_start_2x_bd232, .dev_acquisition_stop = dev_acquisition_stop, - .priv = NULL, + .context = NULL, };