From e93fb98b8ab4f9aea905c027b69d08ceb64befc5 Mon Sep 17 00:00:00 2001 From: Russ Dill Date: Mon, 2 Dec 2013 21:51:53 -0800 Subject: [PATCH] zeroplus: Rename max_memory_size to max_sample_depth This private variable is measured in samples, not bytes. Avoid confusion by renaming it. --- hardware/zeroplus-logic-cube/api.c | 8 ++++---- hardware/zeroplus-logic-cube/protocol.c | 4 ++-- hardware/zeroplus-logic-cube/protocol.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/hardware/zeroplus-logic-cube/api.c b/hardware/zeroplus-logic-cube/api.c index d85a8ca0..2ff8cc93 100644 --- a/hardware/zeroplus-logic-cube/api.c +++ b/hardware/zeroplus-logic-cube/api.c @@ -307,10 +307,10 @@ static GSList *scan(GSList *options) devc->prof = prof; devc->num_channels = prof->channels; #ifdef ZP_EXPERIMENTAL - devc->max_memory_size = 128 * 1024; + devc->max_sample_depth = 128 * 1024; devc->max_samplerate = 200; #else - devc->max_memory_size = prof->sample_depth * 1024; + devc->max_sample_depth = prof->sample_depth * 1024; devc->max_samplerate = prof->max_sampling_freq; #endif 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); /* Send the incoming transfer to the session bus. */ n = get_memory_size(devc->memory_size); - if (devc->max_memory_size * 4 < n) - n = devc->max_memory_size * 4; + if (devc->max_sample_depth * 4 < n) + n = devc->max_sample_depth * 4; for (packet_num = 0; packet_num < n / PACKET_SIZE; packet_num++) { res = analyzer_read_data(usb->devhdl, buf, PACKET_SIZE); sr_info("Tried to read %d bytes, actually read %d bytes.", diff --git a/hardware/zeroplus-logic-cube/protocol.c b/hardware/zeroplus-logic-cube/protocol.c index bbccc6fd..761dd708 100644 --- a/hardware/zeroplus-logic-cube/protocol.c +++ b/hardware/zeroplus-logic-cube/protocol.c @@ -75,8 +75,8 @@ SR_PRIV void set_triggerbar(struct dev_context *devc) ramsize = get_memory_size(devc->memory_size) / 4; if (devc->trigger) { n = ramsize; - if (devc->max_memory_size < n) - n = devc->max_memory_size; + if (devc->max_sample_depth < n) + n = devc->max_sample_depth; if (devc->limit_samples < n) n = devc->limit_samples; n = n * devc->capture_ratio / 100; diff --git a/hardware/zeroplus-logic-cube/protocol.h b/hardware/zeroplus-logic-cube/protocol.h index d3f1ea17..64fca809 100644 --- a/hardware/zeroplus-logic-cube/protocol.h +++ b/hardware/zeroplus-logic-cube/protocol.h @@ -44,7 +44,7 @@ struct dev_context { uint64_t limit_samples; int num_channels; int memory_size; - unsigned int max_memory_size; + unsigned int max_sample_depth; //uint8_t probe_mask; //uint8_t trigger_mask[NUM_TRIGGER_STAGES]; //uint8_t trigger_value[NUM_TRIGGER_STAGES];