From bf690d8371bdf5c9df254cb01d5b353572f38b6c Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Tue, 10 Jul 2012 13:54:54 +0000 Subject: [PATCH] libi2c: Use I2C_SMBUS_BLOCK_MAX instead of hard-coding 32 git-svn-id: http://lm-sensors.org/svn/i2c-tools/trunk@6059 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 1 + lib/smbus.c | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 0626d50..524da19 100644 --- a/CHANGES +++ b/CHANGES @@ -10,6 +10,7 @@ SVN HEAD i2c-stub-from-dump: Be more tolerant on input dump format library: New libi2c library Properly propagate real error codes on read errors + Use I2C_SMBUS_BLOCK_MAX instead of hard-coding 32 3.1.0 (2011-12-04) decode-dimms: Decode module configuration type of DDR SDRAM diff --git a/lib/smbus.c b/lib/smbus.c index d8471ac..6108fe6 100644 --- a/lib/smbus.c +++ b/lib/smbus.c @@ -151,8 +151,8 @@ __s32 i2c_smbus_write_block_data(int file, __u8 command, __u8 length, { union i2c_smbus_data data; int i; - if (length > 32) - length = 32; + if (length > I2C_SMBUS_BLOCK_MAX) + length = I2C_SMBUS_BLOCK_MAX; for (i = 1; i <= length; i++) data.block[i] = values[i-1]; data.block[0] = length; @@ -170,8 +170,8 @@ __s32 i2c_smbus_read_i2c_block_data(int file, __u8 command, __u8 length, union i2c_smbus_data data; int i, err; - if (length > 32) - length = 32; + if (length > I2C_SMBUS_BLOCK_MAX) + length = I2C_SMBUS_BLOCK_MAX; data.block[0] = length; err = i2c_smbus_access(file, I2C_SMBUS_READ, command, @@ -190,8 +190,8 @@ __s32 i2c_smbus_write_i2c_block_data(int file, __u8 command, __u8 length, { union i2c_smbus_data data; int i; - if (length > 32) - length = 32; + if (length > I2C_SMBUS_BLOCK_MAX) + length = I2C_SMBUS_BLOCK_MAX; for (i = 1; i <= length; i++) data.block[i] = values[i-1]; data.block[0] = length; @@ -206,8 +206,8 @@ __s32 i2c_smbus_block_process_call(int file, __u8 command, __u8 length, union i2c_smbus_data data; int i, err; - if (length > 32) - length = 32; + if (length > I2C_SMBUS_BLOCK_MAX) + length = I2C_SMBUS_BLOCK_MAX; for (i = 1; i <= length; i++) data.block[i] = values[i-1]; data.block[0] = length;