BLAHAJ
/
libsigrok
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dslogic: Implement acquisition with external clock. 

DSLogic hardware provides an external clock input.
This commit adds support for this capability.

Signed-off-by: Diego Asanza <f.asanza@gmail.com>
This commit is contained in:
Diego Asanza 2016-05-04 19:50:42 +02:00 committed by Uwe Hermann
parent 3fc3fbe46e
commit ea3a77c756
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/hardware/fx2lafw/api.c
View File

@ -142,6 +142,7 @@ static const uint32_t dslogic_devopts[] = {
SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST, SR_CONF_SAMPLERATE | SR_CONF_GET | SR_CONF_SET | SR_CONF_LIST,
SR_CONF_TRIGGER_MATCH | SR_CONF_LIST, SR_CONF_TRIGGER_MATCH | SR_CONF_LIST,
SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET, SR_CONF_CAPTURE_RATIO | SR_CONF_GET | SR_CONF_SET,
SR_CONF_EXTERNAL_CLOCK | SR_CONF_GET | SR_CONF_SET,
}; };
static const int32_t soft_trigger_matches[] = { static const int32_t soft_trigger_matches[] = {
@ -567,6 +568,9 @@ static int config_get(uint32_t key, GVariant **data, const struct sr_dev_inst *s
case SR_CONF_CAPTURE_RATIO: case SR_CONF_CAPTURE_RATIO:
*data = g_variant_new_uint64(devc->capture_ratio); *data = g_variant_new_uint64(devc->capture_ratio);
break; break;
case SR_CONF_EXTERNAL_CLOCK:
*data = g_variant_new_boolean(devc->dslogic_external_clock);
break;
default: default:
return SR_ERR_NA; return SR_ERR_NA;
} }
@ -632,6 +636,9 @@ static int config_set(uint32_t key, GVariant *data, const struct sr_dev_inst *sd
ret = dslogic_fpga_firmware_upload(sdi, DSLOGIC_PRO_FPGA_FIRMWARE); ret = dslogic_fpga_firmware_upload(sdi, DSLOGIC_PRO_FPGA_FIRMWARE);
} }
break; break;
case SR_CONF_EXTERNAL_CLOCK:
devc->dslogic_external_clock = g_variant_get_boolean(data);
break;
default: default:
ret = SR_ERR_NA; ret = SR_ERR_NA;
} }

2
src/hardware/fx2lafw/protocol.h
View File

@ -135,7 +135,7 @@ struct dev_context {
gboolean dslogic; gboolean dslogic;
uint16_t dslogic_mode; uint16_t dslogic_mode;
uint32_t trigger_pos; uint32_t trigger_pos;
int dslogic_external_clock; gboolean dslogic_external_clock;
int dslogic_voltage_threshold; int dslogic_voltage_threshold;
}; };