X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fhardware%2Fipdbg-la%2Fapi.c;h=59f3f56e955d1313f8538605ee3b8955859c8d24;hb=8bc8e9094c384b914d6dfbb1bb4acd40229e0054;hp=984778eda7a411da47ae09f91143826b3886b985;hpb=1f15efc1f7aaf7a947bab7142894131b96aa12e5;p=libsigrok.git diff --git a/src/hardware/ipdbg-la/api.c b/src/hardware/ipdbg-la/api.c index 984778ed..59f3f56e 100644 --- a/src/hardware/ipdbg-la/api.c +++ b/src/hardware/ipdbg-la/api.c @@ -29,9 +29,9 @@ static const uint32_t scanopts[] = { }; static const uint32_t devopts[] = { - SR_CONF_TRIGGER_MATCH | SR_CONF_LIST | SR_CONF_SET, + SR_CONF_TRIGGER_MATCH | SR_CONF_LIST, SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET, - SR_CONF_LIMIT_SAMPLES | SR_CONF_GET, + SR_CONF_LIMIT_SAMPLES | SR_CONF_GET | SR_CONF_SET, }; static const int32_t trigger_matches[] = { @@ -97,11 +97,6 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) return NULL; struct sr_dev_inst *sdi = g_malloc0(sizeof(struct sr_dev_inst)); - if (!sdi) { - sr_err("no possible to allocate sr_dev_inst"); - return NULL; - } - sdi->status = SR_ST_INACTIVE; sdi->vendor = g_strdup("ipdbg.org"); sdi->model = g_strdup("IPDBG LA"); @@ -113,15 +108,14 @@ static GSList *scan(struct sr_dev_driver *di, GSList *options) ipdbg_la_get_addrwidth_and_datawidth(tcp, devc); - sr_dbg("addr_width = %d, data_width = %d\n", devc->ADDR_WIDTH, - devc->DATA_WIDTH); + sr_dbg("addr_width = %d, data_width = %d\n", devc->addr_width, + devc->data_width); sr_dbg("limit samples = %" PRIu64 "\n", devc->limit_samples_max); - for (uint32_t i = 0; i < devc->DATA_WIDTH; i++) { - const uint8_t buf_size = 16; - char buf[buf_size]; - snprintf(buf, buf_size, "ch%d", i); - sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, buf); + for (uint32_t i = 0; i < devc->data_width; i++) { + char *name = g_strdup_printf("CH%d", i); + sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, name); + g_free(name); } sdi->inst_type = SR_INST_USER; @@ -158,8 +152,6 @@ static int dev_clear(const struct sr_dev_driver *di) static int dev_open(struct sr_dev_inst *sdi) { - sdi->status = SR_ST_INACTIVE; - struct ipdbg_la_tcp *tcp = sdi->conn; if (!tcp) @@ -168,21 +160,18 @@ static int dev_open(struct sr_dev_inst *sdi) if (ipdbg_la_tcp_open(tcp) != SR_OK) return SR_ERR; - sdi->status = SR_ST_ACTIVE; - return SR_OK; } static int dev_close(struct sr_dev_inst *sdi) { - // Should be called before a new call to scan() + /* Should be called before a new call to scan(). */ struct ipdbg_la_tcp *tcp = sdi->conn; if (tcp) ipdbg_la_tcp_close(tcp); sdi->conn = NULL; - sdi->status = SR_ST_INACTIVE; return SR_OK; } @@ -190,12 +179,10 @@ static int dev_close(struct sr_dev_inst *sdi) static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - int ret = SR_OK; + struct dev_context *devc = sdi->priv; (void)cg; - struct dev_context *devc = sdi->priv; - switch (key) { case SR_CONF_CAPTURE_RATIO: *data = g_variant_new_uint64(devc->capture_ratio); @@ -204,68 +191,42 @@ static int config_get(uint32_t key, GVariant **data, *data = g_variant_new_uint64(devc->limit_samples); break; default: - ret = SR_ERR_NA; + return SR_ERR_NA; } - return ret; + return SR_OK; } static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - int ret = SR_OK; - uint64_t value; + struct dev_context *devc = sdi->priv; (void)cg; - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - - struct dev_context *devc = sdi->priv; - switch (key) { case SR_CONF_CAPTURE_RATIO: - value = g_variant_get_uint64(data); - if (value <= 100) - devc->capture_ratio = value; - else - ret = SR_ERR; + devc->capture_ratio = g_variant_get_uint64(data); break; case SR_CONF_LIMIT_SAMPLES: - value = g_variant_get_uint64(data); - if (value <= devc->limit_samples_max) - devc->limit_samples = value; - else - ret = SR_ERR; + devc->limit_samples = g_variant_get_uint64(data); break; default: - ret = SR_ERR_NA; + return SR_ERR_NA; } - return ret; + return SR_OK; } static int config_list(uint32_t key, GVariant **data, const struct sr_dev_inst *sdi, const struct sr_channel_group *cg) { - (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: - if (!sdi) - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - drvopts, ARRAY_SIZE(drvopts), sizeof(uint32_t)); - else - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_UINT32, - devopts, ARRAY_SIZE(devopts), sizeof(uint32_t)); - break; + return STD_CONFIG_LIST(key, data, sdi, cg, scanopts, drvopts, devopts); case SR_CONF_TRIGGER_MATCH: - *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, - trigger_matches, ARRAY_SIZE(trigger_matches), sizeof(int32_t)); + *data = std_gvar_array_i32(ARRAY_AND_SIZE(trigger_matches)); break; default: return SR_ERR_NA; @@ -274,21 +235,8 @@ static int config_list(uint32_t key, GVariant **data, return SR_OK; } -static int init(struct sr_dev_driver *di, struct sr_context *sr_ctx) -{ - return std_init(di, sr_ctx); -} - -static GSList *dev_list(const struct sr_dev_driver *di) -{ - return ((struct drv_context *)(di->context))->instances; -} - static int dev_acquisition_start(const struct sr_dev_inst *sdi) { - if (sdi->status != SR_ST_ACTIVE) - return SR_ERR_DEV_CLOSED; - struct ipdbg_la_tcp *tcp = sdi->conn; struct dev_context *devc = sdi->priv; @@ -316,7 +264,7 @@ static int dev_acquisition_stop(struct sr_dev_inst *sdi) if (devc->num_transfers > 0) { while (devc->num_transfers < - (devc->limit_samples_max * devc->DATA_WIDTH_BYTES)) { + (devc->limit_samples_max * devc->data_width_bytes)) { ipdbg_la_tcp_receive(tcp, &byte); devc->num_transfers++; } @@ -332,10 +280,10 @@ SR_PRIV struct sr_dev_driver ipdbg_la_driver_info = { .name = "ipdbg-la", .longname = "IPDBG LA", .api_version = 1, - .init = init, + .init = std_init, .cleanup = std_cleanup, .scan = scan, - .dev_list = dev_list, + .dev_list = std_dev_list, .dev_clear = dev_clear, .config_get = config_get, .config_set = config_set,