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

Added comedi_get_hardware_buffer_size() wrapper function, and made

Browse source 
comedi_strerror return a const char*.
This commit is contained in:
Frank Mori Hess 2008-03-28 15:56:35 +00:00
parent b3873b7c79
commit d0956ca8b5
4 changed files with 23 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/comedilib.h
View file

@ -71,7 +71,7 @@ int comedi_close(comedi_t *it);
/* logging */ /* logging */
int comedi_loglevel(int loglevel); int comedi_loglevel(int loglevel);
void comedi_perror(const char *s); void comedi_perror(const char *s);
char *comedi_strerror(int errnum); const char *comedi_strerror(int errnum);
int comedi_errno(void); int comedi_errno(void);
int comedi_fileno(comedi_t *it); int comedi_fileno(comedi_t *it);
@ -286,6 +286,7 @@ int comedi_set_gate_source(comedi_t *device, unsigned subdevice, unsigned channe
int comedi_set_other_source(comedi_t *device, unsigned subdevice, unsigned channel, int comedi_set_other_source(comedi_t *device, unsigned subdevice, unsigned channel,
unsigned other, unsigned source); unsigned other, unsigned source);
int comedi_set_routing(comedi_t *device, unsigned subdevice, unsigned channel, unsigned routing); int comedi_set_routing(comedi_t *device, unsigned subdevice, unsigned channel, unsigned routing);
int comedi_get_hardware_buffer_size(comedi_t *device, unsigned subdevice, enum comedi_io_direction direction);
#endif #endif

2
lib/error.c
View file

@ -59,7 +59,7 @@ int _comedi_errno(void)
} }
EXPORT_ALIAS_DEFAULT(_comedi_strerror,comedi_strerror,0.7.18); EXPORT_ALIAS_DEFAULT(_comedi_strerror,comedi_strerror,0.7.18);
char* _comedi_strerror(int errnum) const char* _comedi_strerror(int errnum)
{ {
if(errnum<COMEDI_NOERROR || errnum>=COMEDI_NOERROR+n_errors) if(errnum<COMEDI_NOERROR || errnum>=COMEDI_NOERROR+n_errors)
return strerror(errnum); return strerror(errnum);

19
lib/insn_config_wrappers.c
View file

@ -276,3 +276,22 @@ int _comedi_set_routing(comedi_t *device, unsigned subdevice, unsigned channel,
if(comedi_do_insn(device, &insn) >= 0) return 0; if(comedi_do_insn(device, &insn) >= 0) return 0;
else return -1; else return -1;
} }
EXPORT_ALIAS_DEFAULT(_comedi_get_hardware_buffer_size,comedi_get_hardware_buffer_size,0.9.0);
int _comedi_get_hardware_buffer_size(comedi_t *device, unsigned subdevice, enum comedi_io_direction direction)
{
comedi_insn insn;
lsampl_t data[3];
memset(&insn, 0, sizeof(comedi_insn));
insn.insn = INSN_CONFIG;
insn.subdev = subdevice;
insn.data = data;
insn.n = sizeof(data) / sizeof(data[0]);
memset(insn.data, 0, insn.n * sizeof(insn.data[0]));
data[0] = INSN_CONFIG_GET_HARDWARE_BUFFER_SIZE;
data[1] = direction;
if(comedi_do_insn(device, &insn) >= 0) return data[2];
else return -1;
}

1
lib/version_script
View file

@ -108,4 +108,5 @@ v0.9.0 {
comedi_internal_trigger; comedi_internal_trigger;
comedi_set_other_source; comedi_set_other_source;
comedi_set_routing; comedi_set_routing;
comedi_get_hardware_buffer_size;
} v0.8.0; } v0.8.0;