X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=hardware%2Fopenbench-logic-sniffer%2Fapi.c;h=b99d8e72125545258214a1513389482ef5fa116c;hb=f41a4cae4966fb0237211d163a7afc581e29cbd7;hp=385329945e4faadb96d9ce9b5793d96352f57702;hpb=625763e2c2b69f79b950ad0b0cd8b779500f5d95;p=libsigrok.git diff --git a/hardware/openbench-logic-sniffer/api.c b/hardware/openbench-logic-sniffer/api.c index 38532994..b99d8e72 100644 --- a/hardware/openbench-logic-sniffer/api.c +++ b/hardware/openbench-logic-sniffer/api.c @@ -61,8 +61,8 @@ static const char *patterns[] = { STR_PATTERN_INTERNAL, }; -/* Probes are numbered 0-31 (on the PCB silkscreen). */ -SR_PRIV const char *ols_probe_names[NUM_PROBES + 1] = { +/* Channels are numbered 0-31 (on the PCB silkscreen). */ +SR_PRIV const char *ols_channel_names[NUM_CHANNELS + 1] = { "0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", @@ -79,11 +79,6 @@ static const uint64_t samplerates[] = { SR_PRIV struct sr_dev_driver ols_driver_info; static struct sr_dev_driver *di = &ols_driver_info; -static int dev_clear(void) -{ - return std_dev_clear(di, NULL); -} - static int init(struct sr_context *sr_ctx) { return std_init(sr_ctx, di, LOG_PREFIX); @@ -95,7 +90,7 @@ static GSList *scan(GSList *options) struct sr_dev_inst *sdi; struct drv_context *drvc; struct dev_context *devc; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_serial_dev_inst *serial; GPollFD probefd; GSList *l, *devices; @@ -182,10 +177,10 @@ static GSList *scan(GSList *options) "Sump", "Logic Analyzer", "v1.0"); sdi->driver = di; for (i = 0; i < 32; i++) { - if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, - ols_probe_names[i]))) + if (!(ch = sr_channel_new(i, SR_CHANNEL_LOGIC, TRUE, + ols_channel_names[i]))) return 0; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); } devc = ols_dev_new(); sdi->priv = devc; @@ -195,7 +190,7 @@ static GSList *scan(GSList *options) sr_dbg("Failed to set default samplerate (%"PRIu64").", DEFAULT_SAMPLERATE); /* Clear trigger masks, values and stages. */ - ols_configure_probes(sdi); + ols_configure_channels(sdi); sdi->inst_type = SR_INST_SERIAL; sdi->conn = serial; @@ -214,15 +209,15 @@ static GSList *dev_list(void) static int cleanup(void) { - return dev_clear(); + return std_dev_clear(di, NULL); } static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; - (void)probe_group; + (void)cg; if (!sdi) return SR_ERR_ARG; @@ -257,7 +252,7 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, } static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; uint16_t flag; @@ -265,7 +260,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, int ret; const char *stropt; - (void)probe_group; + (void)cg; if (sdi->status != SR_ST_ACTIVE) return SR_ERR_DEV_CLOSED; @@ -328,10 +323,10 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, case SR_CONF_SWAP: if (g_variant_get_boolean(data)) { sr_info("Enabling channel swapping."); - devc->flag_reg |= FLAG_SWAP_PROBES; + devc->flag_reg |= FLAG_SWAP_CHANNELS; } else { sr_info("Disabling channel swapping."); - devc->flag_reg &= ~FLAG_SWAP_PROBES; + devc->flag_reg &= ~FLAG_SWAP_CHANNELS; } ret = SR_OK; break; @@ -354,14 +349,14 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, } static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_probe_group *probe_group) + const struct sr_channel_group *cg) { struct dev_context *devc; GVariant *gvar, *grange[2]; GVariantBuilder gvb; int num_channels, i; - (void)probe_group; + (void)cg; switch (key) { case SR_CONF_SCAN_OPTIONS: @@ -395,15 +390,21 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, /* Device didn't specify sample memory size in metadata. */ return SR_ERR_NA; /* - * Channel groups are turned off if no probes in that group are + * Channel groups are turned off if no channels in that group are * enabled, making more room for samples for the enabled group. */ - ols_configure_probes(sdi); + ols_configure_channels(sdi); num_channels = 0; for (i = 0; i < 4; i++) { - if (devc->probe_mask & (0xff << (i * 8))) + if (devc->channel_mask & (0xff << (i * 8))) num_channels++; } + if (num_channels == 0) { + /* This can happen, but shouldn't cause too much drama. + * However we can't continue because the code below would + * divide by zero. */ + break; + } grange[0] = g_variant_new_uint64(MIN_NUM_SAMPLES); grange[1] = g_variant_new_uint64(devc->max_samples / num_channels); *data = g_variant_new_tuple(grange, 2); @@ -468,20 +469,20 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, devc = sdi->priv; serial = sdi->conn; - if (ols_configure_probes(sdi) != SR_OK) { - sr_err("Failed to configure probes."); + if (ols_configure_channels(sdi) != SR_OK) { + sr_err("Failed to configure channels."); return SR_ERR; } /* * Enable/disable channel groups in the flag register according to the - * probe mask. Calculate this here, because num_channels is needed + * channel mask. Calculate this here, because num_channels is needed * to limit readcount. */ changrp_mask = 0; num_channels = 0; for (i = 0; i < 4; i++) { - if (devc->probe_mask & (0xff << (i * 8))) { + if (devc->channel_mask & (0xff << (i * 8))) { changrp_mask |= (1 << i); num_channels++; } @@ -500,7 +501,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi, /* Basic triggers. */ if (devc->trigger_mask[0] != 0x00000000) { - /* At least one probe has a trigger on it. */ + /* At least one channel has a trigger on it. */ delaycount = readcount * (1 - devc->capture_ratio / 100.0); devc->trigger_at = (readcount - delaycount) * 4 - devc->num_stages; for (i = 0; i <= devc->num_stages; i++) { @@ -586,7 +587,7 @@ SR_PRIV struct sr_dev_driver ols_driver_info = { .cleanup = cleanup, .scan = scan, .dev_list = dev_list, - .dev_clear = dev_clear, + .dev_clear = NULL, .config_get = config_get, .config_set = config_set, .config_list = config_list,