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

Sigma: Update set_configuration to reflect API.

This commit is contained in:
Håvard Espeland 2011-01-18 23:12:57 +01:00
parent 7c70c53843
commit 94ba4bd689
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
hardware/asix-sigma/asix-sigma.c
View File

@ -760,11 +760,17 @@ static int hw_set_configuration(int device_index, int capability, void *value)
} else if (capability == HWCAP_PROBECONFIG) {
ret = configure_probes(sdi, value);
} else if (capability == HWCAP_LIMIT_MSEC) {
sigma->limit_msec = strtoull(value, NULL, 10);
ret = SIGROK_OK;
sigma->limit_msec = *(uint64_t*) value;
if (sigma->limit_msec > 0)
ret = SIGROK_OK;
else
ret = SIGROK_ERR;
} else if (capability == HWCAP_CAPTURE_RATIO) {
sigma->capture_ratio = strtoull(value, NULL, 10);
ret = SIGROK_OK;
sigma->capture_ratio = *(uint64_t*) value;
if (sigma->capture_ratio < 0 || sigma->capture_ratio > 100)
ret = SIGROK_ERR;
else
ret = SIGROK_OK;
} else {
ret = SIGROK_ERR;
}
@ -951,7 +957,7 @@ static int receive_data(int fd, int revents, void *user_data)
const int chunks_per_read = 32;
unsigned char buf[chunks_per_read * CHUNK_SIZE];
int bufsz, numchunks, i, newchunks;
uint32_t running_msec;
uint64_t running_msec;
struct timeval tv;
fd = fd;

2
hardware/asix-sigma/asix-sigma.h
View File

@ -176,7 +176,7 @@ struct sigma_state {
struct sigma {
struct ftdi_context ftdic;
uint64_t cur_samplerate;
uint32_t limit_msec;
uint64_t limit_msec;
struct timeval start_tv;
int cur_firmware;
int num_probes;