X-Git-Url: https://sigrok.org/gitweb/?p=libsigrok.git;a=blobdiff_plain;f=hardware%2Fdemo%2Fdemo.c;h=3c6585dd0086d81fad2a7e5957a5c2357a8ff171;hp=754e72f74216485d3891d6aa2ebb35979b53ace2;hb=ba7dd8bbb8168cba432a844259a3e239aa5f36d7;hpb=40fd0264f907cf99a92d8192a11cde4499ba4652 diff --git a/hardware/demo/demo.c b/hardware/demo/demo.c index 754e72f7..3c6585dd 100644 --- a/hardware/demo/demo.c +++ b/hardware/demo/demo.c @@ -48,26 +48,26 @@ /* Logic patterns we can generate. */ enum { /** - * Spells "sigrok" across 8 probes using '0's (with '1's as + * Spells "sigrok" across 8 channels using '0's (with '1's as * "background") when displayed using the 'bits' output format. - * The pattern is repeasted every 8 probes, shifted to the right + * The pattern is repeasted every 8 channels, shifted to the right * in time by one bit. */ PATTERN_SIGROK, - /** Pseudo-random values on all probes. */ + /** Pseudo-random values on all channels. */ PATTERN_RANDOM, /** - * Incrementing number across 8 probes. The pattern is repeasted - * every 8 probes, shifted to the right in time by one bit. + * Incrementing number across 8 channels. The pattern is repeasted + * every 8 channels, shifted to the right in time by one bit. */ PATTERN_INC, - /** All probes have a low logic state. */ + /** All channels have a low logic state. */ PATTERN_ALL_LOW, - /** All probes have a high logic state. */ + /** All channels have a high logic state. */ PATTERN_ALL_HIGH, }; @@ -116,13 +116,13 @@ struct dev_context { int64_t starttime; uint64_t step; /* Logic */ - int32_t num_logic_probes; + int32_t num_logic_channels; unsigned int logic_unitsize; /* There is only ever one logic channel group, so its pattern goes here. */ uint8_t logic_pattern; unsigned char logic_data[LOGIC_BUFSIZE]; /* Analog */ - int32_t num_analog_probes; + int32_t num_analog_channels; GSList *analog_channel_groups; }; @@ -171,7 +171,7 @@ static int init(struct sr_context *sr_ctx) return std_init(sr_ctx, di, LOG_PREFIX); } -static void generate_analog_pattern(const struct sr_channel_group *channel_group, uint64_t sample_rate) +static void generate_analog_pattern(const struct sr_channel_group *cg, uint64_t sample_rate) { struct analog_gen *ag; double t, frequency; @@ -179,12 +179,11 @@ static void generate_analog_pattern(const struct sr_channel_group *channel_group unsigned int num_samples, i; int last_end; - ag = channel_group->priv; + ag = cg->priv; num_samples = ANALOG_BUFSIZE / sizeof(float); sr_dbg("Generating %s pattern for channel group %s", - analog_pattern_str[ag->pattern], - channel_group->name); + analog_pattern_str[ag->pattern], cg->name); switch (ag->pattern) { case PATTERN_SQUARE: @@ -256,26 +255,26 @@ static GSList *scan(GSList *options) struct drv_context *drvc; struct dev_context *devc; struct sr_dev_inst *sdi; - struct sr_probe *probe; + struct sr_channel *ch; struct sr_channel_group *cg; struct sr_config *src; struct analog_gen *ag; GSList *devices, *l; - int num_logic_probes, num_analog_probes, pattern, i; - char probe_name[16]; + int num_logic_channels, num_analog_channels, pattern, i; + char channel_name[16]; drvc = di->priv; - num_logic_probes = DEFAULT_NUM_LOGIC_PROBES; - num_analog_probes = DEFAULT_NUM_ANALOG_PROBES; + num_logic_channels = DEFAULT_NUM_LOGIC_PROBES; + num_analog_channels = DEFAULT_NUM_ANALOG_PROBES; for (l = options; l; l = l->next) { src = l->data; switch (src->key) { case SR_CONF_NUM_LOGIC_PROBES: - num_logic_probes = g_variant_get_int32(src->data); + num_logic_channels = g_variant_get_int32(src->data); break; case SR_CONF_NUM_ANALOG_PROBES: - num_analog_probes = g_variant_get_int32(src->data); + num_analog_channels = g_variant_get_int32(src->data); break; } } @@ -296,47 +295,47 @@ static GSList *scan(GSList *options) devc->limit_samples = 0; devc->limit_msec = 0; devc->step = 0; - devc->num_logic_probes = num_logic_probes; - devc->logic_unitsize = (devc->num_logic_probes + 7) / 8; + devc->num_logic_channels = num_logic_channels; + devc->logic_unitsize = (devc->num_logic_channels + 7) / 8; devc->logic_pattern = PATTERN_SIGROK; - devc->num_analog_probes = num_analog_probes; + devc->num_analog_channels = num_analog_channels; devc->analog_channel_groups = NULL; - /* Logic probes, all in one channel group. */ + /* Logic channels, all in one channel group. */ if (!(cg = g_try_malloc(sizeof(struct sr_channel_group)))) return NULL; cg->name = g_strdup("Logic"); - cg->probes = NULL; + cg->channels = NULL; cg->priv = NULL; - for (i = 0; i < num_logic_probes; i++) { - sprintf(probe_name, "D%d", i); - if (!(probe = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, probe_name))) + for (i = 0; i < num_logic_channels; i++) { + sprintf(channel_name, "D%d", i); + if (!(ch = sr_probe_new(i, SR_PROBE_LOGIC, TRUE, channel_name))) return NULL; - sdi->probes = g_slist_append(sdi->probes, probe); - cg->probes = g_slist_append(cg->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); + cg->channels = g_slist_append(cg->channels, ch); } sdi->channel_groups = g_slist_append(NULL, cg); - /* Analog probes, channel groups and pattern generators. */ + /* Analog channels, channel groups and pattern generators. */ pattern = 0; - for (i = 0; i < num_analog_probes; i++) { - sprintf(probe_name, "A%d", i); - if (!(probe = sr_probe_new(i + num_logic_probes, - SR_PROBE_ANALOG, TRUE, probe_name))) + for (i = 0; i < num_analog_channels; i++) { + sprintf(channel_name, "A%d", i); + if (!(ch = sr_probe_new(i + num_logic_channels, + SR_PROBE_ANALOG, TRUE, channel_name))) return NULL; - sdi->probes = g_slist_append(sdi->probes, probe); + sdi->channels = g_slist_append(sdi->channels, ch); - /* Every analog probe gets its own channel group. */ + /* Every analog channel gets its own channel group. */ if (!(cg = g_try_malloc(sizeof(struct sr_channel_group)))) return NULL; - cg->name = g_strdup(probe_name); - cg->probes = g_slist_append(NULL, probe); + cg->name = g_strdup(channel_name); + cg->channels = g_slist_append(NULL, ch); /* Every channel group gets a generator struct. */ if (!(ag = g_try_malloc(sizeof(struct analog_gen)))) return NULL; - ag->packet.probes = cg->probes; + ag->packet.channels = cg->channels; ag->packet.mq = 0; ag->packet.mqflags = 0; ag->packet.unit = SR_UNIT_VOLT; @@ -383,10 +382,10 @@ static int cleanup(void) } static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, - const struct sr_channel_group *channel_group) + const struct sr_channel_group *cg) { struct dev_context *devc; - struct sr_probe *probe; + struct sr_channel *ch; struct analog_gen *ag; int pattern; @@ -405,24 +404,24 @@ static int config_get(int id, GVariant **data, const struct sr_dev_inst *sdi, *data = g_variant_new_uint64(devc->limit_msec); break; case SR_CONF_PATTERN_MODE: - if (!channel_group) + if (!cg) return SR_ERR_CHANNEL_GROUP; - probe = channel_group->probes->data; - if (probe->type == SR_PROBE_LOGIC) { + ch = cg->channels->data; + if (ch->type == SR_PROBE_LOGIC) { pattern = devc->logic_pattern; *data = g_variant_new_string(logic_pattern_str[pattern]); - } else if (probe->type == SR_PROBE_ANALOG) { - ag = channel_group->priv; + } else if (ch->type == SR_PROBE_ANALOG) { + ag = cg->priv; pattern = ag->pattern; *data = g_variant_new_string(analog_pattern_str[pattern]); } else return SR_ERR_BUG; break; case SR_CONF_NUM_LOGIC_PROBES: - *data = g_variant_new_int32(devc->num_logic_probes); + *data = g_variant_new_int32(devc->num_logic_channels); break; case SR_CONF_NUM_ANALOG_PROBES: - *data = g_variant_new_int32(devc->num_analog_probes); + *data = g_variant_new_int32(devc->num_analog_channels); break; default: return SR_ERR_NA; @@ -432,11 +431,11 @@ 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_channel_group *channel_group) + const struct sr_channel_group *cg) { struct dev_context *devc; struct analog_gen *ag; - struct sr_probe *probe; + struct sr_channel *ch; int pattern, ret; unsigned int i; const char *stropt; @@ -463,12 +462,12 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, sr_dbg("Setting time limit to %" PRIu64"ms", devc->limit_msec); break; case SR_CONF_PATTERN_MODE: - if (!channel_group) + if (!cg) return SR_ERR_CHANNEL_GROUP; stropt = g_variant_get_string(data, NULL); - probe = channel_group->probes->data; + ch = cg->channels->data; pattern = -1; - if (probe->type == SR_PROBE_LOGIC) { + if (ch->type == SR_PROBE_LOGIC) { for (i = 0; i < ARRAY_SIZE(logic_pattern_str); i++) { if (!strcmp(stropt, logic_pattern_str[i])) { pattern = i; @@ -486,7 +485,7 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, memset(devc->logic_data, 0xff, LOGIC_BUFSIZE); sr_dbg("Setting logic pattern to %s", logic_pattern_str[pattern]); - } else if (probe->type == SR_PROBE_ANALOG) { + } else if (ch->type == SR_PROBE_ANALOG) { for (i = 0; i < ARRAY_SIZE(analog_pattern_str); i++) { if (!strcmp(stropt, analog_pattern_str[i])) { pattern = i; @@ -496,9 +495,8 @@ static int config_set(int id, GVariant *data, const struct sr_dev_inst *sdi, if (pattern == -1) return SR_ERR_ARG; sr_dbg("Setting analog pattern for channel group %s to %s", - channel_group->name, - analog_pattern_str[pattern]); - ag = channel_group->priv; + cg->name, analog_pattern_str[pattern]); + ag = cg->priv; ag->pattern = pattern; } else return SR_ERR_BUG; @@ -511,9 +509,9 @@ 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_channel_group *channel_group) + const struct sr_channel_group *cg) { - struct sr_probe *probe; + struct sr_channel *ch; GVariant *gvar; GVariantBuilder gvb; @@ -528,7 +526,7 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, if (!sdi) return SR_ERR_ARG; - if (!channel_group) { + if (!cg) { switch (key) { case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, @@ -545,17 +543,17 @@ static int config_list(int key, GVariant **data, const struct sr_dev_inst *sdi, return SR_ERR_NA; } } else { - probe = channel_group->probes->data; + ch = cg->channels->data; switch (key) { case SR_CONF_DEVICE_OPTIONS: *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32, devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(int32_t)); break; case SR_CONF_PATTERN_MODE: - if (probe->type == SR_PROBE_LOGIC) + if (ch->type == SR_PROBE_LOGIC) *data = g_variant_new_strv(logic_pattern_str, ARRAY_SIZE(logic_pattern_str)); - else if (probe->type == SR_PROBE_ANALOG) + else if (ch->type == SR_PROBE_ANALOG) *data = g_variant_new_strv(analog_pattern_str, ARRAY_SIZE(analog_pattern_str)); else @@ -640,7 +638,7 @@ static int prepare_data(int fd, int revents, void *cb_data) while (logic_todo || analog_todo) { /* Logic */ - if (devc->num_logic_probes > 0 && logic_todo > 0) { + if (devc->num_logic_channels > 0 && logic_todo > 0) { sending_now = MIN(logic_todo, LOGIC_BUFSIZE / devc->logic_unitsize); logic_generator(sdi, sending_now * devc->logic_unitsize); @@ -654,8 +652,8 @@ static int prepare_data(int fd, int revents, void *cb_data) devc->logic_counter += sending_now; } - /* Analog, one probe at a time */ - if (devc->num_analog_probes > 0 && analog_todo > 0) { + /* Analog, one channel at a time */ + if (devc->num_analog_channels > 0 && analog_todo > 0) { sending_now = 0; for (l = devc->analog_channel_groups; l; l = l->next) { cg = l->data;