Changeset 4431

Timestamp:

06/04/07 19:54:46 (6 years ago)

Author:

khali

Message:

Do not force the I2C slave address by default. It's only fair to let the
users know that they're doing something wrong. They can insist by using
the new -f option.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• prog/dump/i2cbusses.c (modified) (1 diff)
• prog/dump/i2cbusses.h (modified) (1 diff)
• prog/dump/i2cdump.8 (modified) (3 diffs)
• prog/dump/i2cdump.c (modified) (4 diffs)
• prog/dump/i2cget.8 (modified) (3 diffs)
• prog/dump/i2cget.c (modified) (5 diffs)
• prog/dump/i2cset.8 (modified) (3 diffs)
• prog/dump/i2cset.c (modified) (4 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -15 +15 @@
            Delete support of non-sensor drivers (ddcmon, eeprom)
   Man page sensors.conf.5: Update the chip statement section
+  Programs i2cdump, i2cget, i2cset: Do not force the slave address by default
   Program i2cdump: Use the new I2C block read function
   Program isadump: Detect when address bit 7 is a busy flag

lm-sensors/branches/lm-sensors-3.0.0/prog/dump/i2cbusses.c

@@ -244 +244 @@
         return file;
 }
+
+int set_slave_addr(int file, int address, int force)
+{
+        /* With force, let the user read from/write to the registers
+           even when a driver is also running */
+        if (ioctl(file, force ? I2C_SLAVE_FORCE : I2C_SLAVE, address) < 0) {
+                fprintf(stderr,
+                        "Error: Could not set address to 0x%02x: %s\n",
+                        address, strerror(errno));
+                return -errno;
+        }
+
+        return 0;
+}

lm-sensors/branches/lm-sensors-3.0.0/prog/dump/i2cbusses.h

@@ -25 +25 @@
 
 int open_i2c_dev(const int i2cbus, char *filename, const int quiet);
+int set_slave_addr(int file, int address, int force);
 
 #endif

lm-sensors/branches/lm-sensors-3.0.0/prog/dump/i2cdump.8

@@ -1 @@
-.TH I2CDUMP 8 "April 2006"
+.TH I2CDUMP 8 "June 2007"
 .SH NAME
 i2cdump \- examine I2C registers
@@ -5 +5 @@
 .SH SYNOPSIS
 .B i2cdump
+.RB [ -f ]
 .RB [ -y ]
 .I i2cbus
@@ -22 +23 @@
 .B -V
 Display the version and exit.
+.TP
+.B -f
+Force access to the device even if it is already busy. By default, i2cdump
+will refuse to access a device which is already under the control of a
+kernel driver. Using this flag is dangerous, it can seriously confuse the
+kernel driver in question. It can also cause i2cdump to return invalid
+results. So use at your own risk and only if you know what you're doing.
 .TP
 .B -y

lm-sensors/branches/lm-sensors-3.0.0/prog/dump/i2cdump.c

@@ -32 +32 @@
 void help(void)
 {
-        fprintf(stderr, "Syntax: i2cdump [-y] I2CBUS ADDRESS [MODE] [BANK "
-                "[BANKREG]]\n"
+        fprintf(stderr, "Syntax: i2cdump [-f] [-y] I2CBUS ADDRESS [MODE] "
+                "[BANK [BANKREG]]\n"
                 "        i2cdump -V\n"
                 "  MODE is one of:\n"
@@ -61 +61 @@
         int pec = 0, even = 0;
         int flags = 0;
-        int yes = 0, version = 0;
+        int force = 0, yes = 0, version = 0;
 
         /* handle (optional) flags first */
@@ -67 +67 @@
                 switch (argv[1+flags][1]) {
                 case 'V': version = 1; break;
+                case 'f': force = 1; break;
                 case 'y': yes = 1; break;
                 default:
@@ -235 +236 @@
         }
 
-        /* use FORCE so that we can look at registers even when
-           a driver is also running */
-        if (ioctl(file, I2C_SLAVE_FORCE, address) < 0) {
-                fprintf(stderr, "Error: Could not set address to %d: %s\n",
-                        address, strerror(errno));
-                exit(1);
-        }
+        if (set_slave_addr(file, address, force) < 0)
+                exit(1);
 
         if (pec) {

lm-sensors/branches/lm-sensors-3.0.0/prog/dump/i2cget.8

@@ -1 @@
-.TH I2CGET 8 "September 2005"
+.TH I2CGET 8 "June 2007"
 .SH "NAME"
 i2cget \- read from I2C/SMBus chip registers
@@ -5 +5 @@
 .SH SYNOPSIS
 .B i2cget
+.RB [ -f ]
 .RB [ -y ]
 .I i2cbus
@@ -21 +22 @@
 .B -V
 Display the version and exit.
+.TP
+.B -f
+Force access to the device even if it is already busy. By default, i2cget
+will refuse to access a device which is already under the control of a
+kernel driver. Using this flag is dangerous, it can seriously confuse the
+kernel driver in question. It can also cause i2cget to return an invalid
+value. So use at your own risk and only if you know what you're doing.
 .TP
 .B -y

lm-sensors/branches/lm-sensors-3.0.0/prog/dump/i2cget.c

@@ -37 +37 @@
 void help(void)
 {
-        fprintf(stderr, "Syntax: i2cget [-y] I2CBUS CHIP-ADDRESS [DATA-ADDRESS "
-                "[MODE]]\n"
+        fprintf(stderr, "Syntax: i2cget [-f] [-y] I2CBUS CHIP-ADDRESS "
+                "[DATA-ADDRESS [MODE]]\n"
                 "        i2cget -V\n"
                 "  MODE can be: 'b' (read byte data, default)\n"
@@ -98 +98 @@
                 fprintf(stderr, "Warning: Adapter for i2c bus %d does "
                         "not seem to support PEC\n", i2cbus);
-        }
-
-        return 0;
-}
-
-int set_slave(int file, int address)
-{
-        /* use FORCE so that we can read registers even when
-           a driver is also running */
-        if (ioctl(file, I2C_SLAVE_FORCE, address) < 0) {
-                fprintf(stderr, "Error: Could not set address to %d: %s\n",
-                        address, strerror(errno));
-                return -1;
         }
 
@@ -174 +161 @@
         int pec = 0;
         int flags = 0;
-        int yes = 0, version = 0;
+        int force = 0, yes = 0, version = 0;
 
         /* handle (optional) flags first */
@@ -180 +167 @@
                 switch (argv[1+flags][1]) {
                 case 'V': version = 1; break;
+                case 'f': force = 1; break;
                 case 'y': yes = 1; break;
                 default:
@@ -236 +224 @@
         if (file < 0
          || check_funcs(file, i2cbus, size, daddress, pec)
-         || set_slave(file, address))
+         || set_slave_addr(file, address, force))
                 exit(1);
 

lm-sensors/branches/lm-sensors-3.0.0/prog/dump/i2cset.8

@@ -1 @@
-.TH I2CSET 8 "September 2005"
+.TH I2CSET 8 "June 2007"
 .SH "NAME"
 i2cset \- set I2C registers
@@ -5 +5 @@
 .SH SYNOPSIS
 .B i2cset
+.RB [ -f ]
 .RB [ -y ]
 .I i2cbus
@@ -24 +25 @@
 .B -V
 Display the version and exit.
+.TP
+.B -f
+Force access to the device even if it is already busy. By default, i2cset
+will refuse to access a device which is already under the control of a
+kernel driver. Using this flag is dangerous, it can seriously confuse the
+kernel driver in question. It can also cause i2cset to silently write to
+the wrong register. So use at your own risk and only if you know what
+you're doing.
 .TP
 .B -y

lm-sensors/branches/lm-sensors-3.0.0/prog/dump/i2cset.c

@@ -34 +34 @@
 void help(void)
 {
-        fprintf(stderr, "Syntax: i2cset [-y] I2CBUS CHIP-ADDRESS DATA-ADDRESS "
+        fprintf(stderr, "Syntax: i2cset [-f] [-y] I2CBUS CHIP-ADDRESS DATA-ADDRESS "
                 "VALUE [MODE] [MASK]\n"
                 "        i2cset -V\n"
@@ -54 +54 @@
         int pec = 0;
         int flags = 0;
-        int yes = 0, version = 0;
+        int force = 0, yes = 0, version = 0;
 
         /* handle (optional) flags first */
@@ -60 +60 @@
                 switch (argv[1+flags][1]) {
                 case 'V': version = 1; break;
+                case 'f': force = 1; break;
                 case 'y': yes = 1; break;
                 default:
@@ -161 +162 @@
         }
 
-        /* use FORCE so that we can write registers even when
-           a driver is also running */
-        if (ioctl(file, I2C_SLAVE_FORCE, address) < 0) {
-                fprintf(stderr, "Error: Could not set address to %d: %s\n",
-                        address, strerror(errno));
+        if (set_slave_addr(file, address, force) < 0)
                 exit(1);
-        }
 
         if (!yes) {