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

zeroplus: Rename max_memory_size to max_sample_depth 

This private variable is measured in samples, not bytes. Avoid confusion
by renaming it.
This commit is contained in:
Russ Dill 2013-12-02 21:51:53 -08:00 committed by Bert Vermeulen
parent d20844e28b
commit e93fb98b8a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hardware/zeroplus-logic-cube/api.c
View File

@ -307,10 +307,10 @@ static GSList *scan(GSList *options)
devc->prof = prof; devc->prof = prof;
devc->num_channels = prof->channels; devc->num_channels = prof->channels;
#ifdef ZP_EXPERIMENTAL #ifdef ZP_EXPERIMENTAL
devc->max_memory_size = 128 * 1024; devc->max_sample_depth = 128 * 1024;
devc->max_samplerate = 200; devc->max_samplerate = 200;
#else #else
devc->max_memory_size = prof->sample_depth * 1024; devc->max_sample_depth = prof->sample_depth * 1024;
devc->max_samplerate = prof->max_sampling_freq; devc->max_samplerate = prof->max_sampling_freq;
#endif #endif
devc->max_samplerate *= SR_MHZ(1); devc->max_samplerate *= SR_MHZ(1);
@ -617,8 +617,8 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi,
analyzer_read_start(usb->devhdl); analyzer_read_start(usb->devhdl);
/* Send the incoming transfer to the session bus. */ /* Send the incoming transfer to the session bus. */
n = get_memory_size(devc->memory_size); n = get_memory_size(devc->memory_size);
if (devc->max_memory_size * 4 < n) if (devc->max_sample_depth * 4 < n)
n = devc->max_memory_size * 4; n = devc->max_sample_depth * 4;
for (packet_num = 0; packet_num < n / PACKET_SIZE; packet_num++) { for (packet_num = 0; packet_num < n / PACKET_SIZE; packet_num++) {
res = analyzer_read_data(usb->devhdl, buf, PACKET_SIZE); res = analyzer_read_data(usb->devhdl, buf, PACKET_SIZE);
sr_info("Tried to read %d bytes, actually read %d bytes.", sr_info("Tried to read %d bytes, actually read %d bytes.",

4
hardware/zeroplus-logic-cube/protocol.c
View File

@ -75,8 +75,8 @@ SR_PRIV void set_triggerbar(struct dev_context *devc)
ramsize = get_memory_size(devc->memory_size) / 4; ramsize = get_memory_size(devc->memory_size) / 4;
if (devc->trigger) { if (devc->trigger) {
n = ramsize; n = ramsize;
if (devc->max_memory_size < n) if (devc->max_sample_depth < n)
n = devc->max_memory_size; n = devc->max_sample_depth;
if (devc->limit_samples < n) if (devc->limit_samples < n)
n = devc->limit_samples; n = devc->limit_samples;
n = n * devc->capture_ratio / 100; n = n * devc->capture_ratio / 100;

2
hardware/zeroplus-logic-cube/protocol.h
View File

@ -44,7 +44,7 @@ struct dev_context {
uint64_t limit_samples; uint64_t limit_samples;
int num_channels; int num_channels;
int memory_size; int memory_size;
unsigned int max_memory_size; unsigned int max_sample_depth;
//uint8_t probe_mask; //uint8_t probe_mask;
//uint8_t trigger_mask[NUM_TRIGGER_STAGES]; //uint8_t trigger_mask[NUM_TRIGGER_STAGES];
//uint8_t trigger_value[NUM_TRIGGER_STAGES]; //uint8_t trigger_value[NUM_TRIGGER_STAGES];