X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Frdtech-tc%2Fapi.c;h=ae86fccf5c4bb74bbeba8881afa2ea41b2a9d87b;hb=HEAD;hp=eacd17d3bb104f0af15992b86850b8322dbf192b;hpb=cae33a58743e408a602771d6924ee8c271326f47;p=libsigrok.git diff --git a/src/hardware/rdtech-tc/api.c b/src/hardware/rdtech-tc/api.c index eacd17d3..ae86fccf 100644 --- a/src/hardware/rdtech-tc/api.c +++ b/src/hardware/rdtech-tc/api.c @@ -18,12 +18,14 @@ */ #include + +#include #include +#include +#include #include #include -#include -#include -#include + #include "libsigrok-internal.h" #include "protocol.h" @@ -40,23 +42,27 @@ static const uint32_t drvopts[] = { static const uint32_t devopts[] = { SR_CONF_CONTINUOUS, - SR_CONF_LIMIT_SAMPLES | SR_CONF_SET, - SR_CONF_LIMIT_MSEC | SR_CONF_SET, + SR_CONF_LIMIT_FRAMES | SR_CONF_GET | SR_CONF_SET, + SR_CONF_LIMIT_MSEC | SR_CONF_GET | SR_CONF_SET, }; -static GSList *rdtech_tc_scan(struct sr_dev_driver *di, const char *conn, - const char *serialcomm) +static GSList *rdtech_tc_scan(struct sr_dev_driver *di, + const char *conn, const char *serialcomm) { struct sr_serial_dev_inst *serial; - GSList *devices = NULL; - struct dev_context *devc = NULL; - struct sr_dev_inst *sdi = NULL; + GSList *devices; + struct dev_context *devc; + struct sr_dev_inst *sdi; + size_t i; + const struct rdtech_tc_channel_desc *pch; + struct sr_channel *ch; + struct feed_queue_analog *feed; serial = sr_serial_dev_inst_new(conn, serialcomm); if (serial_open(serial, SERIAL_RDWR) != SR_OK) goto err_out; - devc = g_malloc0(sizeof(struct dev_context)); + devc = g_malloc0(sizeof(*devc)); sr_sw_limits_init(&devc->limits); if (rdtech_tc_probe(serial, devc) != SR_OK) { @@ -64,7 +70,8 @@ static GSList *rdtech_tc_scan(struct sr_dev_driver *di, const char *conn, goto err_out_serial; } - sdi = g_malloc0(sizeof(struct sr_dev_inst)); + sdi = g_malloc0(sizeof(*sdi)); + sdi->priv = devc; sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("RDTech"); sdi->model = g_strdup(devc->dev_info.model_name); @@ -72,12 +79,18 @@ static GSList *rdtech_tc_scan(struct sr_dev_driver *di, const char *conn, sdi->serial_num = g_strdup_printf("%08" PRIu32, devc->dev_info.serial_num); sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; - sdi->priv = devc; - for (int i = 0; devc->channels[i].name; i++) - sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, devc->channels[i].name); + devc->feeds = g_malloc0(devc->channel_count * sizeof(devc->feeds[0])); + for (i = 0; i < devc->channel_count; i++) { + pch = &devc->channels[i]; + ch = sr_channel_new(sdi, i, SR_CHANNEL_ANALOG, TRUE, pch->name); + feed = feed_queue_analog_alloc(sdi, 1, pch->digits, ch); + feed_queue_analog_mq_unit(feed, pch->mq, 0, pch->unit); + feed_queue_analog_scale_offset(feed, &pch->scale, NULL); + devc->feeds[i] = feed; + } - devices = g_slist_append(devices, sdi); + devices = g_slist_append(NULL, sdi); serial_close(serial); if (!devices) sr_serial_dev_inst_free(serial); @@ -93,31 +106,53 @@ err_out: return NULL; } -static GSList *scan(struct sr_dev_driver *di, GSList *options) +static void clear_helper(struct dev_context *devc) { - struct sr_config *src; - const char *conn = NULL; - const char *serialcomm = RDTECH_TC_SERIALCOMM; - - for (GSList *l = options; l; l = l->next) { - src = l->data; - switch (src->key) { - case SR_CONF_CONN: - conn = g_variant_get_string(src->data, NULL); - break; - case SR_CONF_SERIALCOMM: - serialcomm = g_variant_get_string(src->data, NULL); - break; - } + size_t idx; + + if (!devc) + return; + + if (devc->feeds) { + for (idx = 0; idx < devc->channel_count; idx++) + feed_queue_analog_free(devc->feeds[idx]); + g_free(devc->feeds); } +} + +static int dev_clear(const struct sr_dev_driver *driver) +{ + return std_dev_clear_with_callback(driver, (std_dev_clear_callback)clear_helper); +} + +static GSList *scan(struct sr_dev_driver *di, GSList *options) +{ + const char *conn; + const char *serialcomm; + + conn = NULL; + serialcomm = RDTECH_TC_SERIALCOMM; + (void)sr_serial_extract_options(options, &conn, &serialcomm); if (!conn) return NULL; return rdtech_tc_scan(di, conn, serialcomm); } +static int config_get(uint32_t key, GVariant **data, + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) +{ + struct dev_context *devc; + + (void)cg; + + devc = sdi->priv; + + return sr_sw_limits_config_get(&devc->limits, key, data); +} + static int config_set(uint32_t key, GVariant *data, - const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { struct dev_context *devc; @@ -129,23 +164,25 @@ static int config_set(uint32_t key, GVariant *data, } static int config_list(uint32_t key, GVariant **data, - const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) + const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); } static int dev_acquisition_start(const struct sr_dev_inst *sdi) { - struct dev_context *devc = sdi->priv; - struct sr_serial_dev_inst *serial = sdi->conn; + struct dev_context *devc; + struct sr_serial_dev_inst *serial; + devc = sdi->priv; sr_sw_limits_acquisition_start(&devc->limits); std_session_send_df_header(sdi); + serial = sdi->conn; serial_source_add(sdi->session, serial, G_IO_IN, 50, - rdtech_tc_receive_data, (void *)sdi); + rdtech_tc_receive_data, (void *)sdi); - return rdtech_tc_poll(sdi); + return rdtech_tc_poll(sdi, TRUE); } static struct sr_dev_driver rdtech_tc_driver_info = { @@ -156,8 +193,8 @@ static struct sr_dev_driver rdtech_tc_driver_info = { .cleanup = std_cleanup, .scan = scan, .dev_list = std_dev_list, - .dev_clear = std_dev_clear, - .config_get = NULL, + .dev_clear = dev_clear, + .config_get = config_get, .config_set = config_set, .config_list = config_list, .dev_open = std_serial_dev_open,