#include "protocol.h"
#define DEFAULT_NUM_LOGIC_CHANNELS 8
-#define DEFAULT_ENABLED_LOGIC_CHANNELS 8
#define DEFAULT_LOGIC_PATTERN PATTERN_SIGROK
#define DEFAULT_NUM_ANALOG_CHANNELS 4
-#define DEFAULT_ENABLED_ANALOG_CHANNELS 4
#define DEFAULT_ANALOG_AMPLITUDE 10
+/* Note: No spaces allowed because of sigrok-cli. */
static const char *logic_pattern_str[] = {
"sigrok",
"random",
"incremental",
+ "walking-one",
+ "walking-zero",
"all-low",
"all-high",
"squid",
GSList *l;
int num_logic_channels, num_analog_channels, pattern, i;
char channel_name[16];
- gboolean enabled;
num_logic_channels = DEFAULT_NUM_LOGIC_CHANNELS;
num_analog_channels = DEFAULT_NUM_ANALOG_CHANNELS;
cg->name = g_strdup("Logic");
for (i = 0; i < num_logic_channels; i++) {
sprintf(channel_name, "D%d", i);
- enabled = (i < DEFAULT_ENABLED_LOGIC_CHANNELS) ? TRUE : FALSE;
- ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, enabled, channel_name);
+ ch = sr_channel_new(sdi, i, SR_CHANNEL_LOGIC, TRUE, channel_name);
cg->channels = g_slist_append(cg->channels, ch);
}
sdi->channel_groups = g_slist_append(NULL, cg);
}
/* Analog channels, channel groups and pattern generators. */
+ devc->ch_ag = g_hash_table_new(g_direct_hash, g_direct_equal);
if (num_analog_channels > 0) {
pattern = 0;
/* An "Analog" channel group with all analog channels in it. */
acg->name = g_strdup("Analog");
sdi->channel_groups = g_slist_append(sdi->channel_groups, acg);
- devc->ch_ag = g_hash_table_new(g_direct_hash, g_direct_equal);
for (i = 0; i < num_analog_channels; i++) {
snprintf(channel_name, 16, "A%d", i);
- enabled = (i < DEFAULT_ENABLED_ANALOG_CHANNELS) ? TRUE : FALSE;
ch = sr_channel_new(sdi, i + num_logic_channels, SR_CHANNEL_ANALOG,
- enabled, channel_name);
+ TRUE, channel_name);
acg->channels = g_slist_append(acg->channels, ch);
/* Every analog channel gets its own channel group as well. */
/* Every channel gets a generator struct. */
ag = g_malloc(sizeof(struct analog_gen));
+ ag->ch = ch;
ag->amplitude = DEFAULT_ANALOG_AMPLITUDE;
sr_analog_init(&ag->packet, &ag->encoding, &ag->meaning, &ag->spec, 2);
ag->packet.meaning->channels = cg->channels;
static int dev_open(struct sr_dev_inst *sdi)
{
- sdi->status = SR_ST_ACTIVE;
+ (void)sdi;
return SR_OK;
}
static int dev_close(struct sr_dev_inst *sdi)
{
- sdi->status = SR_ST_INACTIVE;
+ (void)sdi;
return SR_OK;
}
devc = sdi->priv;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
ret = SR_OK;
switch (key) {
case SR_CONF_SAMPLERATE:
static int dev_acquisition_start(const struct sr_dev_inst *sdi)
{
struct dev_context *devc;
+ GSList *l;
+ struct sr_channel *ch;
+ int bitpos;
+ uint8_t mask;
GHashTableIter iter;
void *value;
- if (sdi->status != SR_ST_ACTIVE)
- return SR_ERR_DEV_CLOSED;
-
devc = sdi->priv;
devc->sent_samples = 0;
+ /*
+ * Determine the numbers of logic and analog channels that are
+ * involved in the acquisition. Determine an offset and a mask to
+ * remove excess logic data content before datafeed submission.
+ */
+ devc->enabled_logic_channels = 0;
+ devc->enabled_analog_channels = 0;
+ for (l = sdi->channels; l; l = l->next) {
+ ch = l->data;
+ if (!ch->enabled)
+ continue;
+ if (ch->type == SR_CHANNEL_ANALOG) {
+ devc->enabled_analog_channels++;
+ continue;
+ }
+ if (ch->type != SR_CHANNEL_LOGIC)
+ continue;
+ /*
+ * TODO: Need we create a channel map here, such that the
+ * session datafeed packets will have a dense representation
+ * of the enabled channels' data? For example store channels
+ * D3 and D5 in bit positions 0 and 1 respectively, when all
+ * other channels are disabled? The current implementation
+ * generates a sparse layout, might provide data for logic
+ * channels that are disabled while it might suppress data
+ * from enabled channels at the same time.
+ */
+ devc->enabled_logic_channels++;
+ }
+ devc->first_partial_logic_index = devc->enabled_logic_channels / 8;
+ bitpos = devc->enabled_logic_channels % 8;
+ mask = (1 << bitpos) - 1;
+ devc->first_partial_logic_mask = mask;
+ sr_dbg("num logic %zu, partial off %zu, mask 0x%02x.",
+ devc->enabled_logic_channels,
+ devc->first_partial_logic_index,
+ devc->first_partial_logic_mask);
+
+ /*
+ * Have the waveform for analog patterns pre-generated. It's
+ * supposed to be periodic, so the generator just needs to
+ * access the prepared sample data (DDS style).
+ */
g_hash_table_iter_init(&iter, devc->ch_ag);
while (g_hash_table_iter_next(&iter, NULL, &value))
demo_generate_analog_pattern(value, devc->cur_samplerate);
static int dev_acquisition_stop(struct sr_dev_inst *sdi)
{
- sr_dbg("Stopping acquisition.");
sr_session_source_remove(sdi->session, -1);
std_session_send_df_end(sdi);
projects / libsigrok.git / blobdiff