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

fx2lafw: Implemented SR_HWCAP_PROBECONFIG and SR_HWCAP_LIMIT_SAMPLES

This commit is contained in:
Joel Holdsworth 2012-02-29 22:47:05 +00:00
parent c8f2c9dda4
commit e318664793
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hardware/fx2lafw/fx2lafw.c
View File

@ -442,6 +442,8 @@ static void *hw_dev_info_get(int dev_index, int dev_info_id)
return &fx2lafw_samplerates; return &fx2lafw_samplerates;
case SR_DI_TRIGGER_TYPES: case SR_DI_TRIGGER_TYPES:
return TRIGGER_TYPES; return TRIGGER_TYPES;
case SR_DI_CUR_SAMPLERATE:
return &ctx->cur_samplerate;
} }
return NULL; return NULL;
@ -473,7 +475,12 @@ static int hw_dev_config_set(int dev_index, int hwcap, void *value)
return SR_ERR; return SR_ERR;
ctx = sdi->priv; ctx = sdi->priv;
if (hwcap == SR_HWCAP_LIMIT_SAMPLES) { if (hwcap == SR_HWCAP_SAMPLERATE) {
ctx->cur_samplerate = *(uint64_t *)value;
ret = SR_OK;
} else if (hwcap == SR_HWCAP_PROBECONFIG) {
ret = SR_OK;
} else if (hwcap == SR_HWCAP_LIMIT_SAMPLES) {
ctx->limit_samples = *(uint64_t *)value; ctx->limit_samples = *(uint64_t *)value;
ret = SR_OK; ret = SR_OK;
} else { } else {
@ -631,7 +638,7 @@ static int hw_dev_acquisition_start(int dev_index, void *cb_data)
packet->payload = header; packet->payload = header;
header->feed_version = 1; header->feed_version = 1;
gettimeofday(&header->starttime, NULL); gettimeofday(&header->starttime, NULL);
header->samplerate = 24000000UL; header->samplerate = ctx->cur_samplerate;
header->num_logic_probes = ctx->profile->num_probes; header->num_logic_probes = ctx->profile->num_probes;
sr_session_send(cb_data, packet); sr_session_send(cb_data, packet);
g_free(header); g_free(header);

1
hardware/fx2lafw/fx2lafw.h
View File

@ -55,6 +55,7 @@ struct context {
GTimeVal fw_updated; GTimeVal fw_updated;
/* Device/Capture Settings */ /* Device/Capture Settings */
uint64_t cur_samplerate;
uint64_t limit_samples; uint64_t limit_samples;
void *session_dev_id; void *session_dev_id;