mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-03 15:55:15 +00:00
Code Issues Releases Wiki Activity

Stop printing the algorithm name unless /proc compatibility format

Browse Source 
is requested. Print the correct bus type if bus functionality can be
queried (will work if i2c-dev is loaded and user has write access to
 /dev/i2c*).


git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3078 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2005-09-10 12:03:14 +00:00
parent 32fbdf8ba4
commit 2cc8929c9e
1 changed files with 62 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
prog/dump/i2cbusses.c
View File

@@ -24,11 +24,59 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h>
#include <limits.h> #include <limits.h>
#include <dirent.h> #include <dirent.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
#include "i2cbusses.h" #include "i2cbusses.h"
#include "i2c-dev.h"
enum adt { adt_dummy, adt_isa, adt_i2c, adt_smbus, adt_unknown };
struct adap_type {
const char *funcs;
const char* algo;
};
static struct adap_type adap_types[5] = {
{ .funcs = "dummy",
.algo = "Dummy bus algorithm", },
{ .funcs = "isa",
.algo = "ISA bus algorithm", },
{ .funcs = "i2c",
.algo = "Algorithm unavailable", },
{ .funcs = "smbus",
.algo = "Non-I2C SMBus adapter", },
{ .funcs = "unknown",
.algo = "Algorithm unavailable", },
};
static enum adt i2c_get_funcs(int i2cbus)
{
long funcs;
int file;
char filename[20];
enum adt ret;
file = open_i2c_dev(i2cbus, filename, 1);
if (file < 0)
return adt_unknown;
if (ioctl(file, I2C_FUNCS, &funcs) < 0)
ret = adt_unknown;
else if (funcs & I2C_FUNC_I2C)
ret = adt_i2c;
else if (funcs & (I2C_FUNC_SMBUS_BYTE |
I2C_FUNC_SMBUS_BYTE_DATA |
I2C_FUNC_SMBUS_WORD_DATA))
ret = adt_smbus;
else
ret = adt_dummy;
close(file);
return ret;
}
/* /*
this just prints out the installed i2c busses in a consistent format, whether this just prints out the installed i2c busses in a consistent format, whether
@@ -47,7 +95,6 @@ void print_i2c_busses(int procfmt)
char *border; char *border;
char dev[NAME_MAX], fstype[NAME_MAX], sysfs[NAME_MAX], n[NAME_MAX]; char dev[NAME_MAX], fstype[NAME_MAX], sysfs[NAME_MAX], n[NAME_MAX];
int foundsysfs = 0; int foundsysfs = 0;
int tmp;
int count=0; int count=0;
@@ -127,6 +174,8 @@ void print_i2c_busses(int procfmt)
found: found:
if (f != NULL) { if (f != NULL) {
int i2cbus;
enum adt type;
char x[120]; char x[120];
fgets(x, 120, f); fgets(x, 120, f);
@@ -137,27 +186,20 @@ found:
fprintf(stderr," Installed I2C busses:\n"); fprintf(stderr," Installed I2C busses:\n");
/* match 2.4 /proc/bus/i2c format as closely as possible */ /* match 2.4 /proc/bus/i2c format as closely as possible */
if(!strncmp(x, "ISA ", 4)) { if(!strncmp(x, "ISA ", 4)) {
if(procfmt) type = adt_isa;
printf("%s\t%-10s\t%-32s\t%s\n", de->d_name, } else if(!sscanf(de->d_name, "i2c-%d", &i2cbus)) {
"dummy", x, "ISA bus algorithm"); type = adt_dummy;
else
fprintf(stderr, " %s\t%-10s\t%-32s\t%s\n", de->d_name,
"dummy", x, "ISA bus algorithm");
} else if(!sscanf(de->d_name, "i2c-%d", &tmp)) {
if(procfmt)
printf("%s\t%-10s\t%-32s\t%s\n", de->d_name,
"dummy", x, "Dummy bus algorithm");
else
fprintf(stderr, " %s\t%-10s\t%-32s\t%s\n", de->d_name,
"dummy", x, "Dummy bus algorithm");
} else { } else {
if(procfmt) /* Attempt to probe for adapter capabilities */
printf("%s\t%-10s\t%-32s\t%s\n", de->d_name, type = i2c_get_funcs(i2cbus);
"unknown", x, "Algorithm unavailable");
else
fprintf(stderr, " %s\t%-10s\t%-32s\t%s\n", de->d_name,
"unknown", x, "Algorithm unavailable");
} }
if (procfmt)
printf("%s\t%-10s\t%-32s\t%s\n", de->d_name,
adap_types[type].funcs, x, adap_types[type].algo);
else
fprintf(stderr, " %s\t%-10s\t%s\n", de->d_name,
adap_types[type].funcs, x);
} }
} }
closedir(dir); closedir(dir);