X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fchronovu-la8%2Fapi.c;h=3d277ef9861a07f1175d335960eba3f90af99b2c;hb=97900799618d9d529f69eeed94d28349bc671d8d;hp=66cbdb6ecdfa83393d409b55dc222f945ccdd5e3;hpb=4afdfd4628e9955af02a3ea619ecdfe469f9a9e2;p=libsigrok.git diff --git a/hardware/chronovu-la8/api.c b/hardware/chronovu-la8/api.c index 66cbdb6e..3d277ef9 100644 --- a/hardware/chronovu-la8/api.c +++ b/hardware/chronovu-la8/api.c @@ -1,5 +1,5 @@ /* - * This file is part of the sigrok project. + * This file is part of the libsigrok project. * * Copyright (C) 2011-2012 Uwe Hermann * @@ -28,6 +28,22 @@ SR_PRIV struct sr_dev_driver chronovu_la8_driver_info; static struct sr_dev_driver *di = &chronovu_la8_driver_info; +/* + * This will be initialized via config_list()/SR_CONF_SAMPLERATE. + * + * Min: 1 sample per 0.01us -> sample time is 0.084s, samplerate 100MHz + * Max: 1 sample per 2.55us -> sample time is 21.391s, samplerate 392.15kHz + */ +SR_PRIV uint64_t chronovu_la8_samplerates[255] = { 0 }; + +/* Note: Continuous sampling is not supported by the hardware. */ +SR_PRIV const int32_t chronovu_la8_hwcaps[] = { + SR_CONF_LOGIC_ANALYZER, + SR_CONF_SAMPLERATE, + SR_CONF_LIMIT_MSEC, /* TODO: Not yet implemented. */ + SR_CONF_LIMIT_SAMPLES, /* TODO: Not yet implemented. */ +}; + /* * The ChronoVu LA8 can have multiple PIDs. Older versions shipped with * a standard FTDI USB VID/PID of 0403:6001, newer ones have 0403:8867. @@ -40,37 +56,24 @@ static const uint16_t usb_pids[] = { /* Function prototypes. */ static int hw_dev_acquisition_stop(struct sr_dev_inst *sdi, void *cb_data); -static int clear_instances(void) +static void clear_helper(void *priv) { - GSList *l; - struct sr_dev_inst *sdi; - struct drv_context *drvc; struct dev_context *devc; + + devc = priv; - drvc = di->priv; - - /* Properly close all devices. */ - for (l = drvc->instances; l; l = l->next) { - if (!(sdi = l->data)) { - /* Log error, but continue cleaning up the rest. */ - sr_err("%s: sdi was NULL, continuing.", __func__); - continue; - } - if (sdi->priv) { - devc = sdi->priv; - ftdi_free(devc->ftdic); - } - sr_dev_inst_free(sdi); - } - g_slist_free(drvc->instances); - drvc->instances = NULL; + ftdi_free(devc->ftdic); + g_free(devc->final_buf); +} - return SR_OK; +static int clear_instances(void) +{ + return std_dev_clear(di, clear_helper); } static int hw_init(struct sr_context *sr_ctx) { - return std_hw_init(sr_ctx, di, DRIVER_LOG_DOMAIN); + return std_hw_init(sr_ctx, di, LOG_PREFIX); } static GSList *hw_scan(GSList *options) @@ -100,7 +103,7 @@ static GSList *hw_scan(GSList *options) devc->cur_samplerate = SR_MHZ(100); /* 100MHz == max. samplerate */ devc->limit_msec = 0; devc->limit_samples = 0; - devc->session_dev_id = NULL; + devc->cb_data = NULL; memset(devc->mangled_buf, 0, BS); devc->final_buf = NULL; devc->trigger_pattern = 0x00; /* Value irrelevant, see trigger_mask. */ @@ -150,9 +153,9 @@ static GSList *hw_scan(GSList *options) sdi->driver = di; sdi->priv = devc; - for (i = 0; probe_names[i]; i++) { + for (i = 0; chronovu_la8_probe_names[i]; i++) { if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, - probe_names[i]))) + chronovu_la8_probe_names[i]))) return NULL; sdi->probes = g_slist_append(sdi->probes, probe); } @@ -251,23 +254,15 @@ static int hw_dev_close(struct sr_dev_inst *sdi) sdi->status = SR_ST_INACTIVE; - g_free(devc->final_buf); - return SR_OK; } static int hw_cleanup(void) { - if (!di->priv) - /* Can get called on an unused driver, doesn't matter. */ - return SR_OK; - - clear_instances(); - - return SR_OK; + return clear_instances(); } -static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) +static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi) { struct dev_context *devc; @@ -275,23 +270,26 @@ static int config_get(int id, const void **data, const struct sr_dev_inst *sdi) case SR_CONF_SAMPLERATE: if (sdi) { devc = sdi->priv; - *data = &devc->cur_samplerate; + *data = g_variant_new_uint64(devc->cur_samplerate); sr_spew("%s: Returning samplerate: %" PRIu64 "Hz.", __func__, devc->cur_samplerate); } else return SR_ERR; break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; } -static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) +static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi) { struct dev_context *devc; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + if (!(devc = sdi->priv)) { sr_err("%s: sdi->priv was NULL.", __func__); return SR_ERR_BUG; @@ -299,56 +297,64 @@ static int config_set(int id, const void *value, const struct sr_dev_inst *sdi) switch (id) { case SR_CONF_SAMPLERATE: - if (set_samplerate(sdi, *(const uint64_t *)value) == SR_ERR) { + if (set_samplerate(sdi, g_variant_get_uint64(data)) == SR_ERR) { sr_err("%s: setting samplerate failed.", __func__); return SR_ERR; } sr_dbg("SAMPLERATE = %" PRIu64, devc->cur_samplerate); break; case SR_CONF_LIMIT_MSEC: - if (*(const uint64_t *)value == 0) { + if (g_variant_get_uint64(data) == 0) { sr_err("%s: LIMIT_MSEC can't be 0.", __func__); return SR_ERR; } - devc->limit_msec = *(const uint64_t *)value; + devc->limit_msec = g_variant_get_uint64(data); sr_dbg("LIMIT_MSEC = %" PRIu64, devc->limit_msec); break; case SR_CONF_LIMIT_SAMPLES: - if (*(const uint64_t *)value < MIN_NUM_SAMPLES) { + if (g_variant_get_uint64(data) < MIN_NUM_SAMPLES) { sr_err("%s: LIMIT_SAMPLES too small.", __func__); return SR_ERR; } - devc->limit_samples = *(const uint64_t *)value; + devc->limit_samples = g_variant_get_uint64(data); sr_dbg("LIMIT_SAMPLES = %" PRIu64, devc->limit_samples); break; default: - /* Unknown capability, return SR_ERR. */ - sr_err("%s: Unknown capability: %d.", __func__, id); - return SR_ERR; - break; + return SR_ERR_NA; } return SR_OK; } -static int config_list(int key, const void **data, const struct sr_dev_inst *sdi) +static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi) { + GVariant *gvar; + GVariantBuilder gvb; (void)sdi; switch (key) { case SR_CONF_DEVICE_OPTIONS: - *data = hwcaps; + *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, + chronovu_la8_hwcaps, + ARRAY_SIZE(chronovu_la8_hwcaps), + sizeof(int32_t)); break; case SR_CONF_SAMPLERATE: fill_supported_samplerates_if_needed(); - *data = &samplerates; + g_variant_builder_init(&gvb, G_VARIANT_TYPE("a{sv}")); + gvar = g_variant_new_fixed_array(G_VARIANT_TYPE("t"), + chronovu_la8_samplerates, + ARRAY_SIZE(chronovu_la8_samplerates), + sizeof(uint64_t)); + g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar); + *data = g_variant_builder_end(&gvb); break; case SR_CONF_TRIGGER_TYPE: - *data = (char *)TRIGGER_TYPE; + *data = g_variant_new_string(TRIGGER_TYPE); break; default: - return SR_ERR_ARG; + return SR_ERR_NA; } return SR_OK; @@ -409,6 +415,9 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, uint8_t buf[4]; int bytes_written; + if (sdi->status != SR_ST_ACTIVE) + return SR_ERR_DEV_CLOSED; + if (!(devc = sdi->priv)) { sr_err("%s: sdi->priv was NULL.", __func__); return SR_ERR_BUG; @@ -449,10 +458,10 @@ static int hw_dev_acquisition_start(const struct sr_dev_inst *sdi, sr_dbg("Hardware acquisition started successfully."); - devc->session_dev_id = cb_data; + devc->cb_data = cb_data; /* Send header packet to the session bus. */ - std_session_send_df_header(cb_data, DRIVER_LOG_DOMAIN); + std_session_send_df_header(cb_data, LOG_PREFIX); /* Time when we should be done (for detecting trigger timeouts). */ devc->done = (devc->divcount + 1) * 0.08388608 + time(NULL)