SW/DSView
2
0
Fork 0
forked from Ivasoft/DSView
Code Pull Requests Activity

Fix some compile warnings

Browse Source
This commit is contained in:
DreamSourceLab
2020-01-18 14:28:05 +08:00
parent 57b3f0cec7
commit 9af32655db
8 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libsigrok4DSL/hardware/DSL/dscope.c
View File

@@ -1733,13 +1733,13 @@ static int dso_tune(const struct sr_dev_inst *sdi)
else
margin -= (devc->mstatus.ch1_acc_mean * 1.0 / devc->limit_samples);
if ((devc->tune_probe->coupling == SR_AC_COUPLING) && (abs(margin) < 0.5)) {
if ((devc->tune_probe->coupling == SR_AC_COUPLING) && (fabs(margin) < 0.5)) {
devc->tune_probe->coupling = SR_DC_COUPLING;
ret = dsl_wr_dso(sdi, dso_cmd_gen(sdi, devc->tune_probe, SR_CONF_PROBE_COUPLING));
} else if (devc->tune_probe->coupling == SR_AC_COUPLING){
(devc->tune_probe->vga_ptr+devc->tune_stage)->preoff += margin;
ret = dsl_wr_dso(sdi, dso_cmd_gen(sdi, devc->tune_probe, SR_CONF_PROBE_OFFSET));
} else if ((devc->tune_probe->coupling == SR_DC_COUPLING) && (abs(margin) < 0.5)) {
} else if ((devc->tune_probe->coupling == SR_DC_COUPLING) && (fabs(margin) < 0.5)) {
devc->tune_stage++;
if (devc->profile->dev_caps.vdivs[devc->tune_stage] != 0) {
ret = dsl_wr_ext(sdi, 0x01, mux[devc->tune_stage]);

3
libsigrok4DSL/libsigrok.h
View File

@@ -1223,8 +1223,7 @@ struct sr_session {
GSList *devs;
/** List of struct datafeed_callback pointers. */
GSList *datafeed_callbacks;
GTimeVal starttime;
gboolean running;
gboolean running;
unsigned int num_sources;

2
libsigrok4DSL/output/srzip.c
View File

@@ -299,7 +299,7 @@ static int cleanup(struct sr_output *o)
static struct sr_option options[] = {
{ "filename", "Filename", "File to write", NULL, NULL },
{0}
{0, 0, 0, 0, 0}
};
static const struct sr_option *get_options(void)