SR_CONF_LIMIT_MSEC,
};
-static const int devopts_pg[] = {
+static const int devopts_cg[] = {
SR_CONF_PATTERN_MODE,
};
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;
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:
struct drv_context *drvc;
struct dev_context *devc;
struct sr_dev_inst *sdi;
- struct sr_probe *probe;
- struct sr_channel_group *pg;
+ struct sr_channel *probe;
+ struct sr_channel_group *cg;
struct sr_config *src;
struct analog_gen *ag;
GSList *devices, *l;
devc->analog_channel_groups = NULL;
/* Logic probes, all in one channel group. */
- if (!(pg = g_try_malloc(sizeof(struct sr_channel_group))))
+ if (!(cg = g_try_malloc(sizeof(struct sr_channel_group))))
return NULL;
- pg->name = g_strdup("Logic");
- pg->probes = NULL;
- pg->priv = NULL;
+ cg->name = g_strdup("Logic");
+ 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)))
return NULL;
sdi->probes = g_slist_append(sdi->probes, probe);
- pg->probes = g_slist_append(pg->probes, probe);
+ cg->channels = g_slist_append(cg->channels, probe);
}
- sdi->channel_groups = g_slist_append(NULL, pg);
+ sdi->channel_groups = g_slist_append(NULL, cg);
/* Analog probes, channel groups and pattern generators. */
sdi->probes = g_slist_append(sdi->probes, probe);
/* Every analog probe gets its own channel group. */
- if (!(pg = g_try_malloc(sizeof(struct sr_channel_group))))
+ if (!(cg = g_try_malloc(sizeof(struct sr_channel_group))))
return NULL;
- pg->name = g_strdup(probe_name);
- pg->probes = g_slist_append(NULL, probe);
+ cg->name = g_strdup(probe_name);
+ cg->channels = g_slist_append(NULL, probe);
/* Every channel group gets a generator struct. */
if (!(ag = g_try_malloc(sizeof(struct analog_gen))))
return NULL;
- ag->packet.probes = pg->probes;
+ ag->packet.probes = cg->channels;
ag->packet.mq = 0;
ag->packet.mqflags = 0;
ag->packet.unit = SR_UNIT_VOLT;
ag->packet.data = ag->pattern_data;
ag->pattern = pattern;
- pg->priv = ag;
+ cg->priv = ag;
- sdi->channel_groups = g_slist_append(sdi->channel_groups, pg);
- devc->analog_channel_groups = g_slist_append(devc->analog_channel_groups, pg);
+ sdi->channel_groups = g_slist_append(sdi->channel_groups, cg);
+ devc->analog_channel_groups = g_slist_append(devc->analog_channel_groups, cg);
if (++pattern == ARRAY_SIZE(analog_pattern_str))
pattern = 0;
}
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 *probe;
struct analog_gen *ag;
int pattern;
*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;
+ probe = cg->channels->data;
if (probe->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;
+ ag = cg->priv;
pattern = ag->pattern;
*data = g_variant_new_string(analog_pattern_str[pattern]);
} else
}
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 *probe;
int pattern, ret;
unsigned int i;
const char *stropt;
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;
+ probe = cg->channels->data;
pattern = -1;
if (probe->type == SR_PROBE_LOGIC) {
for (i = 0; i < ARRAY_SIZE(logic_pattern_str); i++) {
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;
}
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 *probe;
GVariant *gvar;
GVariantBuilder gvb;
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,
return SR_ERR_NA;
}
} else {
- probe = channel_group->probes->data;
+ probe = cg->channels->data;
switch (key) {
case SR_CONF_DEVICE_OPTIONS:
*data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
- devopts_pg, ARRAY_SIZE(devopts_pg), sizeof(int32_t));
+ devopts_cg, ARRAY_SIZE(devopts_cg), sizeof(int32_t));
break;
case SR_CONF_PATTERN_MODE:
if (probe->type == SR_PROBE_LOGIC)
struct dev_context *devc;
struct sr_datafeed_packet packet;
struct sr_datafeed_logic logic;
- struct sr_channel_group *pg;
+ struct sr_channel_group *cg;
struct analog_gen *ag;
GSList *l;
uint64_t logic_todo, analog_todo, expected_samplenum, analog_samples, sending_now;
if (devc->num_analog_probes > 0 && analog_todo > 0) {
sending_now = 0;
for (l = devc->analog_channel_groups; l; l = l->next) {
- pg = l->data;
- ag = pg->priv;
+ cg = l->data;
+ ag = cg->priv;
packet.type = SR_DF_ANALOG;
packet.payload = &ag->packet;