mirror of
https://github.com/lm-sensors/lm-sensors.git
synced 2026-11-21 19:51:45 +00:00
Adapt probing method to address. Should prevent any kind of
EEPROM corruption. Previous method (quick writes for every
address) can be forced with -q. Read bytes can be forced with -r.
git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2465 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
1 parent
267b92db0d
commit
783c6a0ed6
2 files changed
+100
-36
No files matched your search
@@ -5,6 +5,7 @@ i2cdetect \- detect I\u2\dC chips
|
|||||||
.SH SYNOPSIS
|
.SH SYNOPSIS
|
||||||
.B i2cdetect
|
.B i2cdetect
|
||||||
.RI [ -f ]
|
.RI [ -f ]
|
||||||
|
.RI [ -q | -r ]
|
||||||
.I i2cbus
|
.I i2cbus
|
||||||
.br
|
.br
|
||||||
.B i2cdetect
|
.B i2cdetect
|
||||||
@@ -24,6 +25,18 @@ This program can confuse your I\u2\dC bus, cause data loss and worse!
|
|||||||
.B "\-f"
|
.B "\-f"
|
||||||
Force scanning of non-regular addresses. Not recommended.
|
Force scanning of non-regular addresses. Not recommended.
|
||||||
.TP
|
.TP
|
||||||
|
.B "\-q"
|
||||||
|
Use SMBus "quick write" commands for probing (by default, the command
|
||||||
|
used is the one believed to be the safest for each address).
|
||||||
|
Not recommended. This is known to corrupt the Atmel AT24RF08 EEPROM
|
||||||
|
found on many IBM Thinkpad laptops.
|
||||||
|
.TP
|
||||||
|
.B "\-r"
|
||||||
|
Use SMBus "read byte" commands for probing (by default, the command
|
||||||
|
used is the one believed to be the safest for each address).
|
||||||
|
Not recommended. This is known to lock SMBus on various write-only
|
||||||
|
chips (most notably clock chips at address 0x69).
|
||||||
|
.TP
|
||||||
.B "\-l"
|
.B "\-l"
|
||||||
Output a list of installed busses.
|
Output a list of installed busses.
|
||||||
|
|
||||||
|
|||||||
+87
-36
@@ -28,13 +28,19 @@
|
|||||||
#include "i2c-dev.h"
|
#include "i2c-dev.h"
|
||||||
#include "version.h"
|
#include "version.h"
|
||||||
|
|
||||||
|
#define MODE_AUTO 0
|
||||||
|
#define MODE_QUICK 1
|
||||||
|
#define MODE_READ 2
|
||||||
|
|
||||||
void print_i2c_busses(int);
|
void print_i2c_busses(int);
|
||||||
|
|
||||||
void help(void)
|
void help(void)
|
||||||
{
|
{
|
||||||
fprintf(stderr,"Syntax: i2cdetect [-f] I2CBUS\n");
|
fprintf(stderr,"Syntax: i2cdetect [-f] [-q|-r] I2CBUS\n");
|
||||||
fprintf(stderr," I2CBUS is an integer\n");
|
fprintf(stderr," I2CBUS is an integer\n");
|
||||||
fprintf(stderr," With -f, scans all addresses (NOT RECOMMENDED)\n");
|
fprintf(stderr," With -f, scans all addresses (NOT RECOMMENDED)\n");
|
||||||
|
fprintf(stderr," With -q, uses only quick write commands for probing (NOT RECOMMENDED)\n");
|
||||||
|
fprintf(stderr," With -r, uses only read byte commands for probing (NOT RECOMMENDED)\n");
|
||||||
fprintf(stderr," i2cdetect -l lists installed busses only\n");
|
fprintf(stderr," i2cdetect -l lists installed busses only\n");
|
||||||
print_i2c_busses(0);
|
print_i2c_busses(0);
|
||||||
}
|
}
|
||||||
@@ -42,7 +48,7 @@ void help(void)
|
|||||||
int main(int argc, char *argv[])
|
int main(int argc, char *argv[])
|
||||||
{
|
{
|
||||||
char *end;
|
char *end;
|
||||||
int i,j,res,i2cbus,file;
|
int i=1,j,res,i2cbus=-1,file;
|
||||||
int e1, e2, e3;
|
int e1, e2, e3;
|
||||||
char filename1[20];
|
char filename1[20];
|
||||||
char filename2[20];
|
char filename2[20];
|
||||||
@@ -50,45 +56,59 @@ int main(int argc, char *argv[])
|
|||||||
char *filename;
|
char *filename;
|
||||||
long funcs;
|
long funcs;
|
||||||
int force = 0;
|
int force = 0;
|
||||||
|
int mode = MODE_AUTO;
|
||||||
|
|
||||||
|
|
||||||
if (argc < 2) {
|
while(i2cbus == -1) {
|
||||||
fprintf(stderr,"Error: No i2c-bus specified!\n");
|
if (i >= argc) {
|
||||||
help();
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
if((!strcmp(argv[1], "-v")) || (!strcmp(argv[1], "-V"))) {
|
|
||||||
fprintf(stderr,"i2cdetect version %s\n", LM_VERSION);
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!strcmp(argv[1], "-l")) {
|
|
||||||
print_i2c_busses(1);
|
|
||||||
exit(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!strcmp(argv[1], "-f")) {
|
|
||||||
force = 1;
|
|
||||||
if (argc < 3) {
|
|
||||||
fprintf(stderr,"Error: No i2c-bus specified!\n");
|
fprintf(stderr,"Error: No i2c-bus specified!\n");
|
||||||
help();
|
help();
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
i2cbus = strtol(argv[force?2:1],&end,0);
|
if(!strcasecmp(argv[i], "-v")) {
|
||||||
if (*end) {
|
fprintf(stderr,"i2cdetect version %s\n", LM_VERSION);
|
||||||
fprintf(stderr,"Error: I2CBUS argument not a number!\n");
|
exit(0);
|
||||||
help();
|
}
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
if ((i2cbus < 0) || (i2cbus > 0xff)) {
|
|
||||||
fprintf(stderr,"Error: I2CBUS argument out of range!\n");
|
|
||||||
help();
|
|
||||||
exit(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
if(!strcmp(argv[i], "-l")) {
|
||||||
|
print_i2c_busses(1);
|
||||||
|
exit(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!strcmp(argv[i], "-f")) {
|
||||||
|
force = 1;
|
||||||
|
i++;
|
||||||
|
} else
|
||||||
|
if(!strcmp(argv[i], "-q")) {
|
||||||
|
if (mode != MODE_AUTO) {
|
||||||
|
fprintf(stderr,"Error: Different modes specified!\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
mode = MODE_QUICK;
|
||||||
|
i++;
|
||||||
|
} else
|
||||||
|
if(!strcmp(argv[i], "-r")) {
|
||||||
|
if (mode != MODE_AUTO) {
|
||||||
|
fprintf(stderr,"Error: Different modes specified!\n");
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
mode = MODE_READ;
|
||||||
|
i++;
|
||||||
|
} else {
|
||||||
|
i2cbus = strtol(argv[i],&end,0);
|
||||||
|
if (*end) {
|
||||||
|
fprintf(stderr,"Error: I2CBUS argument not a number!\n");
|
||||||
|
help();
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
if ((i2cbus < 0) || (i2cbus > 0xff)) {
|
||||||
|
fprintf(stderr,"Error: I2CBUS argument out of range!\n");
|
||||||
|
help();
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
/*
|
/*
|
||||||
* Try all three variants and give the correct error message
|
* Try all three variants and give the correct error message
|
||||||
* upon failure
|
* upon failure
|
||||||
@@ -140,18 +160,29 @@ int main(int argc, char *argv[])
|
|||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"Error: Could not get the adapter functionality matrix: %s\n",
|
"Error: Could not get the adapter functionality matrix: %s\n",
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
close(file);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
if (! (funcs & I2C_FUNC_SMBUS_QUICK)) {
|
if (mode != MODE_READ && !(funcs & I2C_FUNC_SMBUS_QUICK)) {
|
||||||
fprintf(stderr,
|
fprintf(stderr,
|
||||||
"Error: Can't use SMBus Quick Write command "
|
"Error: Can't use SMBus Quick Write command "
|
||||||
"on this bus (ISA bus?)\n");
|
"on this bus (ISA bus?)\n");
|
||||||
|
close(file);
|
||||||
|
exit(1);
|
||||||
|
}
|
||||||
|
if (mode != MODE_QUICK && !(funcs & I2C_FUNC_SMBUS_READ_BYTE)) {
|
||||||
|
fprintf(stderr,
|
||||||
|
"Error: Can't use SMBus Read Byte command "
|
||||||
|
"on this bus (ISA bus?)\n");
|
||||||
|
close(file);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
fprintf(stderr," WARNING! This program can confuse your I2C bus, "
|
fprintf(stderr," WARNING! This program can confuse your I2C bus, "
|
||||||
"cause data loss and worse!\n");
|
"cause data loss and worse!\n");
|
||||||
fprintf(stderr," I will probe file %s\n", filename);
|
fprintf(stderr," I will probe file %s%s\n", filename,
|
||||||
|
mode==MODE_QUICK?" using quick write commands":
|
||||||
|
mode==MODE_READ?" using read byte commands":"");
|
||||||
fprintf(stderr," You have five seconds to reconsider and press CTRL-C!\n\n");
|
fprintf(stderr," You have five seconds to reconsider and press CTRL-C!\n\n");
|
||||||
sleep(5);
|
sleep(5);
|
||||||
|
|
||||||
@@ -170,11 +201,30 @@ int main(int argc, char *argv[])
|
|||||||
} else {
|
} else {
|
||||||
fprintf(stderr,"Error: Could not set address to %02x: %s\n",i+j,
|
fprintf(stderr,"Error: Could not set address to %02x: %s\n",i+j,
|
||||||
strerror(errno));
|
strerror(errno));
|
||||||
|
close(file);
|
||||||
exit(1);
|
exit(1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
res = i2c_smbus_write_quick(file, I2C_SMBUS_WRITE);
|
switch(mode) {
|
||||||
|
case MODE_QUICK:
|
||||||
|
/* This is known to corrupt the Atmel AT24RF08 EEPROM */
|
||||||
|
res = i2c_smbus_write_quick(file, I2C_SMBUS_WRITE);
|
||||||
|
break;
|
||||||
|
case MODE_READ:
|
||||||
|
/* This is known to lock SMBus on various write-only chips
|
||||||
|
(mainly clock chips) */
|
||||||
|
res = i2c_smbus_read_byte(file);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
if((i+j>=0x30 && i+j<=0x37)
|
||||||
|
|| (i+j>=0x50 && i+j<=0x5F)) {
|
||||||
|
res = i2c_smbus_write_quick(file, I2C_SMBUS_WRITE);
|
||||||
|
} else {
|
||||||
|
res = i2c_smbus_read_byte(file);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (res < 0)
|
if (res < 0)
|
||||||
printf("XX ");
|
printf("XX ");
|
||||||
else
|
else
|
||||||
@@ -182,5 +232,6 @@ int main(int argc, char *argv[])
|
|||||||
}
|
}
|
||||||
printf("\n");
|
printf("\n");
|
||||||
}
|
}
|
||||||
|
close(file);
|
||||||
exit(0);
|
exit(0);
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user