aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean Delvare <jdelvare@suse.de>2012-12-20 19:44:58 +0000
committerJean Delvare <jdelvare@suse.de>2012-12-20 19:44:58 +0000
commit9b2bef2bd4be8ad6dfdaca1a5e4c28ba420d6aa4 (patch)
treeb1c5e92085bd6a274abfd5a33b5c968590d29188
parent68cd4669f6bb85252a6b811a08a26f85b8ce3cf6 (diff)
downloadi2c-tools-9b2bef2bd4be8ad6dfdaca1a5e4c28ba420d6aa4.tar.gz
Strip former manufacturer name in side-by-side output mode, to avoid
overly large columns. git-svn-id: http://lm-sensors.org/svn/i2c-tools/trunk@6098 7894878c-1315-0410-8ee3-d5d059ff63e0
-rw-r--r--CHANGES1
-rwxr-xr-xeeprom/decode-dimms1
2 files changed, 2 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index e7360ce..4b4b9e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,7 @@ SVN HEAD
Print DDR and DDR2 core timings for all standard speeds
Update manufacturer IDs
Make DDR3 manufacturer count parity error non-fatal
+ Strip former manufacturer name in side-by-side output mode
i2cdetect: Do a best effort detection if functionality is missing
i2c-dev.h: Minimize differences with kernel flavor
Move SMBus helper functions to include/i2c/smbus.h
diff --git a/eeprom/decode-dimms b/eeprom/decode-dimms
index b445880..8cd2bd2 100755
--- a/eeprom/decode-dimms
+++ b/eeprom/decode-dimms
@@ -342,6 +342,7 @@ sub manufacturer_ddr3($$)
return "Invalid" if parity($code) != 1;
return "Unknown" if ($code & 0x7F) - 1 > $vendors[$count & 0x7F];
$manufacturer = $vendors[$count & 0x7F][($code & 0x7F) - 1];
+ $manufacturer =~ s/ \(former .*\)$// if $opt_side_by_side;
$manufacturer .= "? (Invalid parity)" if parity($count) != 1;
return $manufacturer;
}