__analyzer_set_compression(devh, g_compression);
}
-SR_PRIV void analyzer_add_trigger(int channel, int type)
-{
- switch (type) {
- case TRIGGER_HIGH:
- g_trigger_status[channel / 4] |= 1 << (channel % 4 * 2);
- break;
- case TRIGGER_LOW:
- g_trigger_status[channel / 4] |= 2 << (channel % 4 * 2);
- break;
-#if 0
- case TRIGGER_POSEDGE:
- g_trigger_status[8] = 0x40 | channel;
- break;
- case TRIGGER_NEGEDGE:
- g_trigger_status[8] = 0x80 | channel;
- break;
- case TRIGGER_ANYEDGE:
- g_trigger_status[8] = 0xc0 | channel;
- break;
-#endif
- default:
- break;
+SR_PRIV int analyzer_add_triggers(const struct sr_dev_inst *sdi)
+{
+ struct dev_context *devc;
+ struct sr_trigger *trigger;
+ struct sr_trigger_stage *stage;
+ struct sr_trigger_match *match;
+ GSList *l, *m;
+ int channel;
+
+ devc = sdi->priv;
+
+ if (!(trigger = sr_session_trigger_get()))
+ return SR_OK;
+
+ for (l = trigger->stages; l; l = l->next) {
+ stage = l->data;
+ for (m = stage->matches; m; m = m->next) {
+ match = m->data;
+ devc->trigger = 1;
+ if (!match->channel->enabled)
+ /* Ignore disabled channels with a trigger. */
+ continue;
+ channel = match->channel->index;
+ switch (match->match) {
+ case SR_TRIGGER_ZERO:
+ g_trigger_status[channel / 4] |= 2 << (channel % 4 * 2);
+ case SR_TRIGGER_ONE:
+ g_trigger_status[channel / 4] |= 1 << (channel % 4 * 2);
+ break;
+ default:
+ sr_err("Unsupported match %d", match->match);
+ return SR_ERR;
+ }
+ }
}
+
+ return SR_OK;
}
SR_PRIV void analyzer_add_filter(int channel, int type)
#define COMPRESSION_ENABLE 0x8001
#define COMPRESSION_DOUBLE 0x8002
-enum {
- TRIGGER_HIGH = 0,
- TRIGGER_LOW,
- TRIGGER_POSEDGE,
- TRIGGER_NEGEDGE,
- TRIGGER_ANYEDGE,
-};
-
SR_PRIV void analyzer_set_freq(int freq, int scale);
SR_PRIV void analyzer_set_ramsize_trigger_address(unsigned int address);
SR_PRIV void analyzer_set_triggerbar_address(unsigned int address);
SR_PRIV unsigned int analyzer_get_triggerbar_address(void);
SR_PRIV void analyzer_set_compression(unsigned int type);
SR_PRIV void analyzer_set_memory_size(unsigned int size);
-SR_PRIV void analyzer_add_trigger(int channel, int type);
+SR_PRIV int analyzer_add_triggers(const struct sr_dev_inst *sdi);
SR_PRIV void analyzer_set_trigger_count(int count);
SR_PRIV void analyzer_add_filter(int channel, int type);
SR_PRIV void analyzer_set_voltage_threshold(int thresh);
#define USB_INTERFACE 0
#define USB_CONFIGURATION 1
#define NUM_TRIGGER_STAGES 4
-#define TRIGGER_TYPE "01"
#define PACKET_SIZE 2048 /* ?? */
//#define ZP_EXPERIMENTAL
static const int32_t hwcaps[] = {
SR_CONF_LOGIC_ANALYZER,
SR_CONF_SAMPLERATE,
- SR_CONF_TRIGGER_TYPE,
+ SR_CONF_TRIGGER_MATCH,
SR_CONF_CAPTURE_RATIO,
SR_CONF_VOLTAGE_THRESHOLD,
SR_CONF_LIMIT_SAMPLES,
};
+static const int32_t trigger_matches[] = {
+ SR_TRIGGER_ZERO,
+ SR_TRIGGER_ONE,
+};
+
/*
* ZEROPLUS LAP-C (16032) numbers the 16 channels A0-A7 and B0-B7.
* We currently ignore other untested/unsupported devices here.
static int dev_close(struct sr_dev_inst *sdi);
-#if 0
-static int configure_channels(const struct sr_dev_inst *sdi)
-{
- struct dev_context *devc;
- const struct sr_channel *ch;
- const GSList *l;
- int channel_bit, stage, i;
- char *tc;
-
- /* Note: sdi and sdi->priv are non-NULL, the caller checked this. */
- devc = sdi->priv;
-
- devc->channel_mask = 0;
- for (i = 0; i < NUM_TRIGGER_STAGES; i++) {
- devc->trigger_mask[i] = 0;
- devc->trigger_value[i] = 0;
- }
-
- stage = -1;
- for (l = sdi->channels; l; l = l->next) {
- ch = (struct sr_channel *)l->data;
- if (ch->enabled == FALSE)
- continue;
- channel_bit = 1 << (ch->index);
- devc->channel_mask |= channel_bit;
-
- if (ch->trigger) {
- stage = 0;
- for (tc = ch->trigger; *tc; tc++) {
- devc->trigger_mask[stage] |= channel_bit;
- if (*tc == '1')
- devc->trigger_value[stage] |= channel_bit;
- stage++;
- if (stage > NUM_TRIGGER_STAGES)
- return SR_ERR;
- }
- }
- }
-
- return SR_OK;
-}
-#endif
-
-static int configure_channels(const struct sr_dev_inst *sdi)
-{
- struct dev_context *devc;
- const GSList *l;
- const struct sr_channel *ch;
- char *tc;
- int type;
-
- /* Note: sdi and sdi->priv are non-NULL, the caller checked this. */
- devc = sdi->priv;
-
- for (l = sdi->channels; l; l = l->next) {
- ch = (struct sr_channel *)l->data;
- if (ch->enabled == FALSE)
- continue;
-
- if ((tc = ch->trigger)) {
- switch (*tc) {
- case '1':
- type = TRIGGER_HIGH;
- break;
- case '0':
- type = TRIGGER_LOW;
- break;
-#if 0
- case 'r':
- type = TRIGGER_POSEDGE;
- break;
- case 'f':
- type = TRIGGER_NEGEDGE;
- break;
- case 'c':
- type = TRIGGER_ANYEDGE;
- break;
-#endif
- default:
- return SR_ERR;
- }
- analyzer_add_trigger(ch->index, type);
- devc->trigger = 1;
- }
- }
-
- return SR_OK;
-}
-
SR_PRIV int zp_set_samplerate(struct dev_context *devc, uint64_t samplerate)
{
int i;
g_variant_builder_add(&gvb, "{sv}", "samplerates", gvar);
*data = g_variant_builder_end(&gvb);
break;
- case SR_CONF_TRIGGER_TYPE:
- *data = g_variant_new_string(TRIGGER_TYPE);
+ case SR_CONF_TRIGGER_MATCH:
+ *data = g_variant_new_fixed_array(G_VARIANT_TYPE_INT32,
+ trigger_matches, ARRAY_SIZE(trigger_matches),
+ sizeof(int32_t));
break;
case SR_CONF_VOLTAGE_THRESHOLD:
g_variant_builder_init(&gvb, G_VARIANT_TYPE_ARRAY);
return SR_ERR_ARG;
}
- if (configure_channels(sdi) != SR_OK) {
- sr_err("Failed to configure channels.");
+ if (analyzer_add_triggers(sdi) != SR_OK) {
+ sr_err("Failed to configure triggers.");
return SR_ERR;
}
projects / libsigrok.git / commitdiff