stv0g/comedilib
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Avoid mixing declarations and code.

Browse source
This commit is contained in:
Ian Abbott 2007-12-10 13:20:19 +00:00
parent f87490e0f6
commit 0b21f80783
6 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
demo/choose_clock.c
View file

@ -36,6 +36,8 @@ int main(int argc, char *argv[])
int retval;
lsampl_t clock_selection;
struct parsed_options options;
comedi_insn insn;
lsampl_t data[3];
init_parsed_options(&options);
options.freq = 0.;
@ -59,8 +61,6 @@ int main(int argc, char *argv[])
{
printf("Clock period unspecified.\n");
}
comedi_insn insn;
lsampl_t data[3];
memset(&insn, 0, sizeof(comedi_insn));
insn.insn = INSN_CONFIG;
insn.subdev = options.subdevice;

4
demo/choose_filter.c
View file

@ -36,6 +36,8 @@ int main(int argc, char *argv[])
int retval;
lsampl_t filter_selection;
struct parsed_options options;
comedi_insn insn;
lsampl_t data[2];
init_parsed_options(&options);
parse_options(&options, argc, argv);
@ -47,8 +49,6 @@ int main(int argc, char *argv[])
}
filter_selection = options.value;
printf("Selecting filter %d on subdevice %d channel %d.\n", filter_selection, options.subdevice, options.channel);
comedi_insn insn;
lsampl_t data[2];
memset(&insn, 0, sizeof(comedi_insn));
insn.insn = INSN_CONFIG;
insn.subdev = options.subdevice;

4
demo/choose_routing.c
View file

@ -36,6 +36,8 @@ int main(int argc, char *argv[])
int retval;
lsampl_t routing;
struct parsed_options options;
comedi_insn insn;
lsampl_t data[2];
init_parsed_options(&options);
options.freq = 0.;
@ -52,8 +54,6 @@ int main(int argc, char *argv[])
period_ns = 0;
routing = options.value;
printf("Selecting routing %d for channel %d on subdevice %d.\n", routing, options.channel, options.subdevice);
comedi_insn insn;
lsampl_t data[2];
memset(&insn, 0, sizeof(comedi_insn));
insn.insn = INSN_CONFIG;
insn.subdev = options.subdevice;

3
demo/gpct_buffered_counting.c
View file

@ -37,6 +37,7 @@
int check_subdevice(comedi_t *device, int *subdevice, const char *device_filepath)
{
int subdevice_type;
int read_subdevice = comedi_get_read_subdevice(device);
if(read_subdevice < 0)
{
@ -50,7 +51,7 @@ int check_subdevice(comedi_t *device, int *subdevice, const char *device_filepat
*subdevice, device_filepath, read_subdevice);
return -1;
}
int subdevice_type = comedi_get_subdevice_type(device, *subdevice);
subdevice_type = comedi_get_subdevice_type(device, *subdevice);
if(subdevice_type < 0)
{
comedi_perror("comedi_get_subdevice_type()");

4
lib/calib.c
View file

@ -253,11 +253,13 @@ int _comedi_get_hardcal_converter(
comedi_polynomial_t* polynomial)
{
comedi_range *range_ptr = comedi_get_range(dev, subdevice, channel, range);
lsampl_t maxdata;
if(range_ptr == NULL)
{
return -1;
}
lsampl_t maxdata = comedi_get_maxdata(dev, subdevice, channel);
maxdata = comedi_get_maxdata(dev, subdevice, channel);
if(maxdata == 0)
{
return -1;

3
lib/calib_yacc.y
View file

@ -279,8 +279,9 @@ extern void _comedi_cleanup_calibration( comedi_calibration_t *file_contents )
static comedi_polynomial_t* alloc_inverse_linear_polynomial(const comedi_polynomial_t *polynomial)
{
comedi_polynomial_t *inverse;
if(polynomial->order != 1) return NULL;
comedi_polynomial_t *inverse = malloc(sizeof(comedi_polynomial_t));
inverse = malloc(sizeof(comedi_polynomial_t));
memset(inverse, 0, sizeof(comedi_polynomial_t));
inverse->order = 1;
inverse->expansion_origin = polynomial->coefficients[0];