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

hantek-4032l: Rename number_samples to num_samples.

This commit is contained in:
Uwe Hermann 2018-06-05 23:56:30 +02:00
parent 264a4cb2b8
commit 7b9387b8f0
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/hardware/hantek-4032l/api.c
View File

@ -387,7 +387,7 @@ static int config_set(uint32_t key, GVariant *data,
int idx; int idx;
struct dev_context *devc = sdi->priv; struct dev_context *devc = sdi->priv;
struct h4032l_cmd_pkt *cmd_pkt = &devc->cmd_pkt; struct h4032l_cmd_pkt *cmd_pkt = &devc->cmd_pkt;
uint64_t sample_rate, number_samples; uint64_t sample_rate, num_samples;
double low, high; double low, high;
switch (key) { switch (key) {
@ -406,16 +406,16 @@ static int config_set(uint32_t key, GVariant *data,
devc->capture_ratio = g_variant_get_uint64(data); devc->capture_ratio = g_variant_get_uint64(data);
break; break;
case SR_CONF_LIMIT_SAMPLES: case SR_CONF_LIMIT_SAMPLES:
number_samples = g_variant_get_uint64(data); num_samples = g_variant_get_uint64(data);
number_samples += 511; num_samples += 511;
number_samples &= 0xfffffe00; num_samples &= 0xfffffe00;
if (number_samples < H4043L_NUM_SAMPLES_MIN || if (num_samples < H4043L_NUM_SAMPLES_MIN ||
number_samples > H4032L_NUM_SAMPLES_MAX) { num_samples > H4032L_NUM_SAMPLES_MAX) {
sr_err("Invalid sample range 2k...64M: %" sr_err("Invalid sample range 2k...64M: %"
PRIu64 ".", number_samples); PRIu64 ".", num_samples);
return SR_ERR; return SR_ERR;
} }
cmd_pkt->sample_size = number_samples; cmd_pkt->sample_size = num_samples;
break; break;
case SR_CONF_VOLTAGE_THRESHOLD: case SR_CONF_VOLTAGE_THRESHOLD:
if (!cg) if (!cg)

18
src/hardware/hantek-4032l/protocol.c
View File

@ -165,7 +165,7 @@ void LIBUSB_CALL h4032l_data_transfer_callback(struct libusb_transfer *transfer)
struct dev_context *const devc = sdi->priv; struct dev_context *const devc = sdi->priv;
uint32_t max_samples = transfer->actual_length / sizeof(uint32_t); uint32_t max_samples = transfer->actual_length / sizeof(uint32_t);
uint32_t *buffer; uint32_t *buffer;
uint32_t number_samples; uint32_t num_samples;
/* /*
* If acquisition has already ended, just free any queued up * If acquisition has already ended, just free any queued up
@ -187,15 +187,15 @@ void LIBUSB_CALL h4032l_data_transfer_callback(struct libusb_transfer *transfer)
buffer = (uint32_t *)transfer->buffer; buffer = (uint32_t *)transfer->buffer;
number_samples = MIN(devc->remaining_samples, max_samples); num_samples = MIN(devc->remaining_samples, max_samples);
devc->remaining_samples -= number_samples; devc->remaining_samples -= num_samples;
send_data(sdi, buffer, number_samples); send_data(sdi, buffer, num_samples);
sr_dbg("Remaining: %d %08X %08X.", devc->remaining_samples, sr_dbg("Remaining: %d %08X %08X.", devc->remaining_samples,
buffer[0], buffer[1]); buffer[0], buffer[1]);
/* Close data receiving. */ /* Close data receiving. */
if (devc->remaining_samples == 0) { if (devc->remaining_samples == 0) {
if (buffer[number_samples] != H4032L_END_PACKET_MAGIC) if (buffer[num_samples] != H4032L_END_PACKET_MAGIC)
sr_err("Mismatch magic number of end poll."); sr_err("Mismatch magic number of end poll.");
abort_acquisition(devc); abort_acquisition(devc);
@ -218,7 +218,7 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer)
uint32_t max_samples = transfer->actual_length / sizeof(uint32_t); uint32_t max_samples = transfer->actual_length / sizeof(uint32_t);
uint32_t *buffer; uint32_t *buffer;
struct h4032l_status_packet *status; struct h4032l_status_packet *status;
uint32_t number_samples; uint32_t num_samples;
int ret; int ret;
/* /*
@ -288,9 +288,9 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer)
buffer++; buffer++;
/* Fallthrough. */ /* Fallthrough. */
case H4032L_STATUS_TRANSFER: case H4032L_STATUS_TRANSFER:
number_samples = MIN(devc->remaining_samples, max_samples); num_samples = MIN(devc->remaining_samples, max_samples);
devc->remaining_samples -= number_samples; devc->remaining_samples -= num_samples;
send_data(sdi, buffer, number_samples); send_data(sdi, buffer, num_samples);
sr_dbg("Remaining: %d %08X %08X.", devc->remaining_samples, sr_dbg("Remaining: %d %08X %08X.", devc->remaining_samples,
buffer[0], buffer[1]); buffer[0], buffer[1]);
break; break;