X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fyokogawa-dlm%2Fapi.c;h=e1702956b5e044096824758d9abcbbfc019a783f;hb=4b25cbffa17c9b8c9c30f98ffe6918a15b664b2a;hp=0a02f5d129ad6289bbc19ccc49cfbd9754d36a3e;hpb=c2fdcc25a47c4c8f25e3ea96ea36a674a151e839;p=libsigrok.git diff --git a/src/hardware/yokogawa-dlm/api.c b/src/hardware/yokogawa-dlm/api.c index 0a02f5d1..e1702956 100644 --- a/src/hardware/yokogawa-dlm/api.c +++ b/src/hardware/yokogawa-dlm/api.c @@ -23,37 +23,37 @@ #include "scpi.h" #include "protocol.h" -SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info; +static struct sr_dev_driver yokogawa_dlm_driver_info; static const char *MANUFACTURER_ID = "YOKOGAWA"; static const char *MANUFACTURER_NAME = "Yokogawa"; -static const uint32_t dlm_scanopts[] = { +static const uint32_t scanopts[] = { SR_CONF_CONN, }; -static const uint32_t dlm_drvopts[] = { +static const uint32_t drvopts[] = { SR_CONF_LOGIC_ANALYZER, SR_CONF_OSCILLOSCOPE, }; -static const uint32_t dlm_devopts[] = { +static const uint32_t devopts[] = { SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET, SR_CONF_SAMPLERATE | SR_CONF_GET, SR_CONF_TIMEBASE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_NUM_HDIV | SR_CONF_GET, SR_CONF_HORIZ_TRIGGERPOS | SR_CONF_GET | SR_CONF_SET, - SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_TRIGGER_SOURCE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_TRIGGER_SLOPE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; -static const uint32_t dlm_analog_devopts[] = { - SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, - SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, +static const uint32_t analog_devopts[] = { SR_CONF_NUM_VDIV | SR_CONF_GET, + SR_CONF_VDIV | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, + SR_CONF_COUPLING | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, }; -static const uint32_t dlm_digital_devopts[] = { +static const uint32_t digital_devopts[] = { }; enum { @@ -109,10 +109,8 @@ static struct sr_dev_inst *probe_usbtmc_device(struct sr_scpi_dev_inst *scpi) return sdi; fail: - if (hw_info) - sr_scpi_hw_info_free(hw_info); - if (sdi) - sr_dev_inst_free(sdi); + sr_scpi_hw_info_free(hw_info); + sr_dev_inst_free(sdi); g_free(devc); return NULL; @@ -123,47 +121,32 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return sr_scpi_scan(di->context, options, probe_usbtmc_device); } -static void clear_helper(void *priv) +static void clear_helper(struct dev_context *devc) { - struct dev_context *devc; - - devc = priv; - dlm_scope_state_destroy(devc->model_state); - g_free(devc->analog_groups); g_free(devc->digital_groups); - g_free(devc); } static int dev_clear(const struct sr_dev_driver *di) { - return std_dev_clear(di, clear_helper); + return std_dev_clear_with_callback(di, (std_dev_clear_callback)clear_helper); } static int dev_open(struct sr_dev_inst *sdi) { - if (sdi->status != SR_ST_ACTIVE && sr_scpi_open(sdi->conn) != SR_OK) + if (sr_scpi_open(sdi->conn) != SR_OK) return SR_ERR; if (dlm_scope_state_query(sdi) != SR_OK) return SR_ERR; - sdi->status = SR_ST_ACTIVE; - return SR_OK; } static int dev_close(struct sr_dev_inst *sdi) { - if (sdi->status == SR_ST_INACTIVE) - return SR_OK; - - sr_scpi_close(sdi->conn); - - sdi->status = SR_ST_INACTIVE; - - return SR_OK; + return sr_scpi_close(sdi->conn); } /** @@ -209,9 +192,11 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s const struct scope_config *model; struct scope_state *state; - if (!sdi || !(devc = sdi->priv)) + if (!sdi) return SR_ERR_ARG; + devc = sdi->priv; + if ((cg_type = check_channel_group(devc, cg)) == CG_INVALID) return SR_ERR; @@ -485,39 +470,17 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * const struct sr_channel_group *cg) { int cg_type = CG_NONE; - struct dev_context *devc = NULL; - const struct scope_config *model = NULL; - - /* SR_CONF_SCAN_OPTIONS is always valid, regardless of sdi or probe group. */ - if (key == SR_CONF_SCAN_OPTIONS) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - dlm_scanopts, ARRAY_SIZE(dlm_scanopts), sizeof(uint32_t)); - return SR_OK; - } - - /* If sdi is NULL, nothing except SR_CONF_DEVICE_OPTIONS can be provided. */ - if (key == SR_CONF_DEVICE_OPTIONS && !sdi) { - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - dlm_drvopts, ARRAY_SIZE(dlm_drvopts), sizeof(uint32_t)); - return SR_OK; - } - - if (!sdi) - return SR_ERR_ARG; + struct dev_context *devc; + const struct scope_config *model; - devc = sdi->priv; - model = devc->model_config; + devc = (sdi) ? sdi->priv : NULL; + model = (devc) ? devc->model_config : NULL; - /* - * If cg is NULL, only the SR_CONF_DEVICE_OPTIONS that are not - * specific to a probe group must be returned. - */ if (!cg) { switch (key) { + case SR_CONF_SCAN_OPTIONS: case SR_CONF_DEVICE_OPTIONS: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - dlm_devopts, ARRAY_SIZE(dlm_devopts), sizeof(uint32_t)); - return SR_OK; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_TIMEBASE: *data = build_tuples(&dlm_timebases, ARRAY_SIZE(dlm_timebases)); return SR_OK; @@ -546,10 +509,10 @@ static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst * case SR_CONF_DEVICE_OPTIONS: if (cg_type == CG_ANALOG) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - dlm_analog_devopts, ARRAY_SIZE(dlm_analog_devopts), sizeof(uint32_t)); + analog_devopts, ARRAY_SIZE(analog_devopts), sizeof(uint32_t)); } else if (cg_type == CG_DIGITAL) { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - dlm_digital_devopts, ARRAY_SIZE(dlm_digital_devopts), sizeof(uint32_t)); + digital_devopts, ARRAY_SIZE(digital_devopts), sizeof(uint32_t)); } else { *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, NULL, 0, sizeof(uint32_t)); @@ -612,9 +575,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) struct dev_context *devc; struct sr_scpi_dev_inst *scpi; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - scpi = sdi->conn; devc = sdi->priv; digital_added = FALSE; @@ -647,7 +607,6 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi) devc->current_channel = devc->enabled_channels; dlm_channel_data_request(sdi); - /* Call our callback when data comes in or after 5ms. */ sr_scpi_source_add(sdi->session, scpi, G_IO_IN, 5, dlm_data_receive, (void *)sdi); @@ -658,10 +617,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) { struct dev_context *devc; - std_session_send_df_end(sdi, LOG_PREFIX); - - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; + std_session_send_df_end(sdi); devc = sdi->priv; @@ -674,7 +630,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) return SR_OK; } -SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = { +static struct sr_dev_driver yokogawa_dlm_driver_info = { .name = "yokogawa-dlm", .longname = "Yokogawa DL/DLM", .api_version = 1, @@ -693,3 +649,4 @@ SR_PRIV struct sr_dev_driver yokogawa_dlm_driver_info = { .dev_acquisition_stop = dev_acquisition_stop, .context = NULL, }; +SR_REGISTER_DEV_DRIVER(yokogawa_dlm_driver_info);