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

hantek-4032l: Minor cosmetics.

This commit is contained in:
Uwe Hermann 2018-02-15 22:45:35 +01:00
parent d18bf7bdfc
commit 4868f15a86
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -333,7 +333,7 @@ static int config_set(uint32_t key, GVariant *data,
i++; i++;
if (i == ARRAY_SIZE(samplerates_hw) || sample_rate == 0) { if (i == ARRAY_SIZE(samplerates_hw) || sample_rate == 0) {
sr_err("invalid sample rate"); sr_err("Invalid sample rate.");
return SR_ERR_SAMPLERATE; return SR_ERR_SAMPLERATE;
} }
cmd_pkt->sample_rate = i; cmd_pkt->sample_rate = i;
@ -349,8 +349,8 @@ static int config_set(uint32_t key, GVariant *data,
number_samples &= 0xfffffe00; number_samples &= 0xfffffe00;
if (number_samples < 2048 if (number_samples < 2048
|| number_samples > 64 * 1024 * 1024) { || number_samples > 64 * 1024 * 1024) {
sr_err("invalid sample range 2k...64M: %" sr_err("Invalid sample range 2k...64M: %"
PRIu64, number_samples); PRIu64 ".", number_samples);
return SR_ERR; return SR_ERR;
} }
cmd_pkt->sample_size = number_samples; cmd_pkt->sample_size = number_samples;
@ -410,7 +410,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
GSList *stages = trigger->stages; GSList *stages = trigger->stages;
struct sr_trigger_stage *stage1 = stages->data; struct sr_trigger_stage *stage1 = stages->data;
if (stages->next) { if (stages->next) {
sr_err("only one trigger stage supported for now"); sr_err("Only one trigger stage supported for now.");
return SR_ERR; return SR_ERR;
} }
cmd_pkt->trig_flags.enable_trigger1 = 1; cmd_pkt->trig_flags.enable_trigger1 = 1;
@ -440,7 +440,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
break; break;
case SR_TRIGGER_RISING: case SR_TRIGGER_RISING:
if (cmd_pkt->trigger[0].flags.edge_type != H4032L_TRIGGER_EDGE_TYPE_DISABLED) { if (cmd_pkt->trigger[0].flags.edge_type != H4032L_TRIGGER_EDGE_TYPE_DISABLED) {
sr_err("only one trigger signal with fall/rising/edge allowed"); sr_err("Only one trigger signal with fall/rising/edge allowed.");
return SR_ERR; return SR_ERR;
} }
cmd_pkt->trigger[0].flags.edge_type = H4032L_TRIGGER_EDGE_TYPE_RISE; cmd_pkt->trigger[0].flags.edge_type = H4032L_TRIGGER_EDGE_TYPE_RISE;
@ -448,7 +448,7 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
break; break;
case SR_TRIGGER_FALLING: case SR_TRIGGER_FALLING:
if (cmd_pkt->trigger[0].flags.edge_type != H4032L_TRIGGER_EDGE_TYPE_DISABLED) { if (cmd_pkt->trigger[0].flags.edge_type != H4032L_TRIGGER_EDGE_TYPE_DISABLED) {
sr_err("only one trigger signal with fall/rising/edge allowed"); sr_err("Only one trigger signal with fall/rising/edge allowed.");
return SR_ERR; return SR_ERR;
} }
cmd_pkt->trigger[0].flags.edge_type = H4032L_TRIGGER_EDGE_TYPE_FALL; cmd_pkt->trigger[0].flags.edge_type = H4032L_TRIGGER_EDGE_TYPE_FALL;
@ -456,14 +456,14 @@ static int dev_acquisition_start(const struct sr_dev_inst *sdi)
break; break;
case SR_TRIGGER_EDGE: case SR_TRIGGER_EDGE:
if (cmd_pkt->trigger[0].flags.edge_type != H4032L_TRIGGER_EDGE_TYPE_DISABLED) { if (cmd_pkt->trigger[0].flags.edge_type != H4032L_TRIGGER_EDGE_TYPE_DISABLED) {
sr_err("only one trigger signal with fall/rising/edge allowed"); sr_err("Only one trigger signal with fall/rising/edge allowed.");
return SR_ERR; return SR_ERR;
} }
cmd_pkt->trigger[0].flags.edge_type = H4032L_TRIGGER_EDGE_TYPE_TOGGLE; cmd_pkt->trigger[0].flags.edge_type = H4032L_TRIGGER_EDGE_TYPE_TOGGLE;
cmd_pkt->trigger[0].flags.edge_signal = match->channel->index; cmd_pkt->trigger[0].flags.edge_signal = match->channel->index;
break; break;
default: default:
sr_err("unknown trigger value"); sr_err("Unknown trigger value.");
return SR_ERR; return SR_ERR;
} }

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

@ -167,7 +167,7 @@ void LIBUSB_CALL h4032l_usb_callback(struct libusb_transfer *transfer)
h4032l_usb_callback, h4032l_usb_callback,
(void *)sdi, H4032L_USB_TIMEOUT); (void *)sdi, H4032L_USB_TIMEOUT);
} }
/* Send prepared usb packet. */ /* Send prepared USB packet. */
if ((ret = libusb_submit_transfer(transfer)) != 0) { if ((ret = libusb_submit_transfer(transfer)) != 0) {
sr_err("Failed to submit transfer: %s.", sr_err("Failed to submit transfer: %s.",
libusb_error_name(ret)); libusb_error_name(ret));