Rename I2C_FUNC_SMBUS_HWPEC_CALC to I2C_FUNC_SMBUS_PEC, as was done

in the Linux 2.6 kernel.


git-svn-id: http://lm-sensors.org/svn/i2c-tools/trunk@4948 7894878c-1315-0410-8ee3-d5d059ff63e0

include/linux/i2c-dev.h

@@ -52,7 +52,7 @@ struct i2c_msg {
 #define I2C_FUNC_I2C			0x00000001
 #define I2C_FUNC_10BIT_ADDR		0x00000002
 #define I2C_FUNC_PROTOCOL_MANGLING	0x00000004 /* I2C_M_{REV_DIR_ADDR,NOSTART,..} */
-#define I2C_FUNC_SMBUS_HWPEC_CALC	0x00000008 /* SMBus 2.0 */
+#define I2C_FUNC_SMBUS_PEC		0x00000008
 #define I2C_FUNC_SMBUS_BLOCK_PROC_CALL	0x00008000 /* SMBus 2.0 */
 #define I2C_FUNC_SMBUS_QUICK		0x00010000 
 #define I2C_FUNC_SMBUS_READ_BYTE	0x00020000 
@@ -82,6 +82,9 @@ struct i2c_msg {
 #define I2C_FUNC_SMBUS_I2C_BLOCK_2 (I2C_FUNC_SMBUS_READ_I2C_BLOCK_2 | \
                                     I2C_FUNC_SMBUS_WRITE_I2C_BLOCK_2)
 
+/* Old name, for compatibility */
+#define I2C_FUNC_SMBUS_HWPEC_CALC	I2C_FUNC_SMBUS_PEC
+
 /* 
  * Data for SMBus Messages 
  */

tools/i2cdetect.c

@@ -146,7 +146,7 @@ static const struct func all_func[] = {
 	  .name = "SMBus Block Read" },
 	{ .value = I2C_FUNC_SMBUS_BLOCK_PROC_CALL,
 	  .name = "SMBus Block Process Call" },
-	{ .value = I2C_FUNC_SMBUS_HWPEC_CALC,
+	{ .value = I2C_FUNC_SMBUS_PEC,
 	  .name = "SMBus PEC" },
 	{ .value = I2C_FUNC_SMBUS_WRITE_I2C_BLOCK,
 	  .name = "I2C Block Write" },

tools/i2cdump.c

@@ -244,7 +244,7 @@ int main(int argc, char *argv[])
 			        strerror(errno));
 			exit(1);
 		}
-		if (!(funcs & (I2C_FUNC_SMBUS_HWPEC_CALC | I2C_FUNC_I2C))) {
+		if (!(funcs & (I2C_FUNC_SMBUS_PEC | I2C_FUNC_I2C))) {
 			fprintf(stderr, "Warning: Adapter for i2c bus %d does "
 			        "not seem to actually support PEC\n", i2cbus);
 		}

tools/i2cget.c

@@ -94,7 +94,7 @@ static int check_funcs(int file, int i2cbus, int size, int daddress, int pec)
 	}
 
 	if (pec
-	 && !(funcs & (I2C_FUNC_SMBUS_HWPEC_CALC | I2C_FUNC_I2C))) {
+	 && !(funcs & (I2C_FUNC_SMBUS_PEC | I2C_FUNC_I2C))) {
 		fprintf(stderr, "Warning: Adapter for i2c bus %d does "
 		        "not seem to support PEC\n", i2cbus);
 	}

tools/i2cset.c

@@ -234,7 +234,7 @@ int main(int argc, char *argv[])
 			        strerror(errno));
 			exit(1);
 		}
-		if (!(funcs & (I2C_FUNC_SMBUS_HWPEC_CALC | I2C_FUNC_I2C))) {
+		if (!(funcs & (I2C_FUNC_SMBUS_PEC | I2C_FUNC_I2C))) {
 			fprintf(stderr, "Warning: Adapter for i2c bus %d does "
 			        "not seem to actually support PEC\n", i2cbus);
 		}