X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=src%2Fhardware%2Fnorma-dmm%2Fapi.c;h=96d69b12f1e07dfbd1c99917ef66b20a8b79ae47;hp=67735d49da30418dd229b91322e90e24f7dd91e3;hb=05199c0ac9f15f229d43e50e86c4c1eadc55deac;hpb=700d6b64d578ce10e57f6a2289e37a5564eccf1c diff --git a/src/hardware/norma-dmm/api.c b/src/hardware/norma-dmm/api.c index 67735d49..96d69b12 100644 --- a/src/hardware/norma-dmm/api.c +++ b/src/hardware/norma-dmm/api.c @@ -30,8 +30,11 @@ static const uint32_t scanopts[] = { SR_CONF_SERIALCOMM, }; -static const uint32_t devopts[] = { +static const uint32_t drvopts[] = { SR_CONF_MULTIMETER, +}; + +static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, SR_CONF_LIMIT_MSEC | SR_CONF_SET, @@ -41,8 +44,8 @@ static const uint32_t devopts[] = { #define SERIALCOMM "4800/8n1/dtr=1/rts=0/flow=1" -SR_PRIV struct sr_dev_driver norma_dmm_driver_info; -SR_PRIV struct sr_dev_driver siemens_b102x_driver_info; +static struct sr_dev_driver norma_dmm_driver_info; +static struct sr_dev_driver siemens_b102x_driver_info; static const char *get_brandstr(struct sr_dev_driver *drv) { @@ -65,15 +68,9 @@ static const char *get_typestr(int type, struct sr_dev_driver *drv) return nameref[type - 1][(drv == &siemens_b102x_driver_info)]; } -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(sr_ctx, di, LOG_PREFIX); -} - static GSList *scan(struct sr_dev_driver *drv, GSList *options) { struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; struct sr_config *src; struct sr_serial_dev_inst *serial; @@ -84,8 +81,6 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options) char req[10]; devices = NULL; - drvc = drv->context; - drvc->instances = NULL; conn = serialcomm = NULL; for (l = options; l; l = l->next) { @@ -139,14 +134,11 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options) sdi->model = g_strdup(get_typestr(auxtype, drv)); sdi->version = g_strdup(buf + 9); devc = g_malloc0(sizeof(struct dev_context)); + sr_sw_limits_init(&devc->limits); devc->type = auxtype; - devc->version = g_strdup(&buf[9]); - devc->elapsed_msec = g_timer_new(); sdi->conn = serial; sdi->priv = devc; - sdi->driver = drv; sr_channel_new(sdi, 0, SR_CHANNEL_ANALOG, TRUE, "P1"); - drvc->instances = g_slist_append(drvc->instances, sdi); devices = g_slist_append(devices, sdi); break; } @@ -169,28 +161,7 @@ static GSList *scan(struct sr_dev_driver *drv, GSList *options) if (!devices) sr_serial_dev_inst_free(serial); - return devices; -} - -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - -static int dev_close(struct sr_dev_inst *sdi) -{ - struct dev_context *devc; - - std_serial_dev_close(sdi); - - /* Free dynamically allocated resources. */ - if ((devc = sdi->priv) && devc->version) { - g_free(devc->version); - devc->version = NULL; - g_timer_destroy(devc->elapsed_msec); - } - - return SR_OK; + return std_scan_complete(drv, devices); } static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, @@ -200,48 +171,15 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - if (!(devc = sdi->priv)) { - sr_err("sdi->priv was NULL."); - return SR_ERR_BUG; - } - - switch (key) { - case SR_CONF_LIMIT_MSEC: - devc->limit_msec = g_variant_get_uint64(data); - break; - case SR_CONF_LIMIT_SAMPLES: - devc->limit_samples = g_variant_get_uint64(data); - break; - default: - return SR_ERR_NA; - } + devc = sdi->priv; - return SR_OK; + return sr_sw_limits_config_set(&devc->limits, key, data); } static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - (void)sdi; - (void)cg; - - switch (key) { - case SR_CONF_SCAN_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - scanopts, ARRAY_SIZE(scanopts), sizeof(uint32_t)); - break; - case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; - default: - return SR_ERR_NA; - } - - return SR_OK; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); } static int dev_acquisition_start(const struct sr_dev_inst *sdi) @@ -249,16 +187,10 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct dev_context *devc; struct sr_serial_dev_inst *serial; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - devc = sdi->priv; - std_session_send_df_header(sdi, LOG_PREFIX); - - /* Start timer, if required. */ - if (devc->limit_msec) - g_timer_start(devc->elapsed_msec); + sr_sw_limits_acquisition_start(&devc->limits); + std_session_send_df_header(sdi); /* Poll every 100ms, or whenever some data comes in. */ serial = sdi->conn; @@ -268,52 +200,42 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) return SR_OK; } -static int dev_acquisition_stop(struct sr_dev_inst *sdi) -{ - struct dev_context *devc; - - /* Stop timer, if required. */ - if (sdi && (devc = sdi->priv) && devc->limit_msec) - g_timer_stop(devc->elapsed_msec); - - return std_serial_dev_acquisition_stop(sdi, dev_close, - sdi->conn, LOG_PREFIX); -} - -SR_PRIV struct sr_dev_driver norma_dmm_driver_info = { +static struct sr_dev_driver norma_dmm_driver_info = { .name = "norma-dmm", .longname = "Norma DM9x0 DMMs", .api_version = 1, - .init = init, + .init = std_init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, - .dev_clear = NULL, + .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = NULL, .config_set = config_set, .config_list = config_list, .dev_open = std_serial_dev_open, - .dev_close = dev_close, + .dev_close = std_serial_dev_close, .dev_acquisition_start = dev_acquisition_start, - .dev_acquisition_stop = dev_acquisition_stop, + .dev_acquisition_stop = std_serial_dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(norma_dmm_driver_info); -SR_PRIV struct sr_dev_driver siemens_b102x_driver_info = { +static struct sr_dev_driver siemens_b102x_driver_info = { .name = "siemens-b102x", .longname = "Siemens B102x DMMs", .api_version = 1, - .init = init, + .init = std_init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, - .dev_clear = NULL, + .dev_list = std_dev_list, + .dev_clear = std_dev_clear, .config_get = NULL, .config_set = config_set, .config_list = config_list, .dev_open = std_serial_dev_open, - .dev_close = dev_close, + .dev_close = std_serial_dev_close, .dev_acquisition_start = dev_acquisition_start, - .dev_acquisition_stop = dev_acquisition_stop, + .dev_acquisition_stop = std_serial_dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(siemens_b102x_driver_info);