#include <string.h>
#include "libinternal.h"
-static int set_calibration( comedi_t *dev, struct calibration_file_contents *parsed_file,
+static int set_calibration( comedi_t *dev, const comedi_calibration_t *parsed_file,
unsigned int cal_index );
-static int check_cal_file( comedi_t *dev, struct calibration_file_contents *parsed_file )
+static int check_cal_file( comedi_t *dev, const comedi_calibration_t *parsed_file )
{
if( strcmp( comedi_get_driver_name( dev ), parsed_file->driver_name ) )
{
return 0;
}
-static inline int valid_channel( struct calibration_file_contents *parsed_file,
+static inline int valid_channel( const comedi_calibration_t *parsed_file,
unsigned int cal_index, unsigned int channel )
{
int num_channels, i;
- num_channels = parsed_file->calibrations[ cal_index ].num_channels;
+ num_channels = parsed_file->settings[ cal_index ].num_channels;
if( num_channels == 0 ) return 1;
for( i = 0; i < num_channels; i++ )
{
- if( parsed_file->calibrations[ cal_index ].channels[ i ] == channel )
+ if( parsed_file->settings[ cal_index ].channels[ i ] == channel )
return 1;
}
return 0;
}
-static inline int valid_range( struct calibration_file_contents *parsed_file,
+static inline int valid_range( const comedi_calibration_t *parsed_file,
unsigned int cal_index, unsigned int range )
{
int num_ranges, i;
- num_ranges = parsed_file->calibrations[ cal_index ].num_ranges;
+ num_ranges = parsed_file->settings[ cal_index ].num_ranges;
if( num_ranges == 0 ) return 1;
for( i = 0; i < num_ranges; i++ )
{
- if( parsed_file->calibrations[ cal_index ].ranges[ i ] == range )
+ if( parsed_file->settings[ cal_index ].ranges[ i ] == range )
return 1;
}
return 0;
}
-static inline int valid_aref( struct calibration_file_contents *parsed_file,
+static inline int valid_aref( const comedi_calibration_t *parsed_file,
unsigned int cal_index, unsigned int aref )
{
int num_arefs, i;
- num_arefs = parsed_file->calibrations[ cal_index ].num_arefs;
+ num_arefs = parsed_file->settings[ cal_index ].num_arefs;
if( num_arefs == 0 ) return 1;
for( i = 0; i < num_arefs; i++ )
{
- if( parsed_file->calibrations[ cal_index ].arefs[ i ] == aref )
+ if( parsed_file->settings[ cal_index ].arefs[ i ] == aref )
return 1;
}
return 0;
}
-static int apply_calibration( comedi_t *dev, struct calibration_file_contents *parsed_file,
+static int apply_calibration( comedi_t *dev, const comedi_calibration_t *parsed_file,
unsigned int subdev, unsigned int channel, unsigned int range, unsigned int aref )
{
int num_cals, i, retval;
int found_cal = 0;
- num_cals = parsed_file->num_calibrations;
+ num_cals = parsed_file->num_settings;
for( i = 0; i < num_cals; i++ )
{
- if( parsed_file->calibrations[ i ].subdevice != subdev ) continue;
+ if( parsed_file->settings[ i ].subdevice != subdev ) continue;
if( valid_range( parsed_file, i, range ) == 0 ) continue;
if( valid_channel( parsed_file, i, channel ) == 0 ) continue;
if( valid_aref( parsed_file, i, aref ) == 0 ) continue;
return 0;
}
-static int set_calibration( comedi_t *dev, struct calibration_file_contents *parsed_file,
+static int set_calibration( comedi_t *dev, const comedi_calibration_t *parsed_file,
unsigned int cal_index )
{
int i, retval, num_caldacs;
- num_caldacs = parsed_file->calibrations[ cal_index ].num_caldacs;
+ num_caldacs = parsed_file->settings[ cal_index ].num_caldacs;
COMEDILIB_DEBUG( 4, "num_caldacs %i\n", num_caldacs );
for( i = 0; i < num_caldacs; i++ )
{
- struct caldac_setting caldac;
+ comedi_caldac_t caldac;
- caldac = parsed_file->calibrations[ cal_index ].caldacs[ i ];
+ caldac = parsed_file->settings[ cal_index ].caldacs[ i ];
COMEDILIB_DEBUG( 4, "subdev %i, ch %i, val %i\n", caldac.subdevice,
caldac.channel,caldac.value);
retval = comedi_data_write( dev, caldac.subdevice, caldac.channel,
return 0;
}
-EXPORT_SYMBOL(comedi_apply_calibration,0.7.20);
-int comedi_apply_calibration( comedi_t *dev, unsigned int subdev, unsigned int channel,
- unsigned int range, unsigned int aref, const char *cal_file_path )
+EXPORT_ALIAS_DEFAULT(_comedi_apply_parsed_calibration,comedi_apply_parsed_calibration,0.7.20);
+int _comedi_apply_parsed_calibration( comedi_t *dev, unsigned int subdev, unsigned int channel,
+ unsigned int range, unsigned int aref, const comedi_calibration_t *calibration )
+{
+ int retval;
+
+ retval = check_cal_file( dev, calibration );
+ if( retval < 0 ) return retval;
+
+ retval = apply_calibration( dev, calibration, subdev, channel, range, aref );
+ return retval;
+}
+
+/* munge characters in board name that will cause problems with file paths */
+static void fixup_board_name( char *name )
+{
+ while( ( name = strchr( name, '/' ) ) )
+ {
+ if( name )
+ {
+ *name = '-';
+ name++;
+ }
+ }
+}
+
+EXPORT_ALIAS_DEFAULT(_comedi_get_default_calibration_path,comedi_get_default_calibration_path,0.7.20);
+char* _comedi_get_default_calibration_path( comedi_t *dev )
{
struct stat file_stats;
+ char *file_path;
+ char *board_name, *temp;
+ char *driver_name;
+
+ if( fstat( comedi_fileno( dev ), &file_stats ) < 0 )
+ {
+ COMEDILIB_DEBUG( 3, "failed to get file stats of comedi device file\n" );
+ return NULL;
+ }
+
+ driver_name = comedi_get_driver_name( dev );
+ if( driver_name == NULL )
+ {
+ return NULL;
+ }
+ temp = comedi_get_board_name( dev );
+ if( temp == NULL )
+ {
+ return NULL;
+ }
+ board_name = strdup( temp );
+
+ fixup_board_name( board_name );
+ asprintf( &file_path, LOCALSTATEDIR "/lib/comedi/calibrations/%s_%s_comedi%li",
+ driver_name, board_name, ( unsigned long ) minor( file_stats.st_rdev ) );
+
+ free( board_name );
+ return file_path;
+}
+
+EXPORT_ALIAS_DEFAULT(_comedi_apply_calibration,comedi_apply_calibration,0.7.20);
+int _comedi_apply_calibration( comedi_t *dev, unsigned int subdev, unsigned int channel,
+ unsigned int range, unsigned int aref, const char *cal_file_path )
+{
char file_path[ 1024 ];
int retval;
- FILE *cal_file;
- struct calibration_file_contents *parsed_file;
+ comedi_calibration_t *parsed_file;
if( cal_file_path )
{
strncpy( file_path, cal_file_path, sizeof( file_path ) );
}else
{
- if( fstat( comedi_fileno( dev ), &file_stats ) < 0 )
- {
- COMEDILIB_DEBUG( 3, "failed to get file stats of comedi device file\n" );
- return -1;
- }
+ char *temp;
- snprintf( file_path, sizeof( file_path ), "/etc/comedi/calibrations/%s_0x%lx",
- comedi_get_board_name( dev ),
- ( unsigned long ) file_stats.st_ino );
+ temp = comedi_get_default_calibration_path( dev );
+ if( temp == NULL ) return -1;
+ strncpy( file_path, temp, sizeof( file_path ) );
+ free( temp );
}
- cal_file = fopen( file_path, "r" );
- if( cal_file == NULL )
- {
- COMEDILIB_DEBUG( 3, "failed to open file\n" );
- return -1;
- }
-
- parsed_file = parse_calibration_file( cal_file );
+ parsed_file = comedi_parse_calibration_file( file_path );
if( parsed_file == NULL )
{
COMEDILIB_DEBUG( 3, "failed to parse calibration file\n" );
return -1;
}
- fclose( cal_file );
-
- retval = check_cal_file( dev, parsed_file );
- if( retval < 0 )
- {
- cleanup_calibration_parse( parsed_file );
- return retval;
- }
-
- retval = apply_calibration( dev, parsed_file, subdev, channel, range, aref );
- if( retval < 0 ) return retval;
+ retval = comedi_apply_parsed_calibration( dev, subdev, channel, range, aref, parsed_file );
- cleanup_calibration_parse( parsed_file );
+ comedi_cleanup_calibration( parsed_file );
- return 0;
+ return retval;
}
projects / comedilib.git / blobdiff