From 1562eb58eec35a919e4b2f63a88d1f265c17cf45 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 21 Oct 2012 13:06:19 +0000 Subject: [PATCH] Don't let missing DDR module height break side-by-side output. git-svn-id: http://lm-sensors.org/svn/i2c-tools/trunk@6072 7894878c-1315-0410-8ee3-d5d059ff63e0 --- CHANGES | 3 ++- eeprom/decode-dimms | 10 ++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/CHANGES b/CHANGES index 8e30774..1910e9e 100644 --- a/CHANGES +++ b/CHANGES @@ -6,7 +6,8 @@ SVN HEAD decode-dimms: Decode module configuration type of DDR2 SDRAM Decode bus width extension of DDR3 SDRAM Don't choke when no EEPROM is found - don't make columns larger than they need to be + Don't make columns larger than they need to be + Don't let missing DDR module height break side-by-side output 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 ce17bef..3910eb4 100755 --- a/eeprom/decode-dimms +++ b/eeprom/decode-dimms @@ -942,12 +942,10 @@ sub decode_ddr_sdram($) printl_cond(defined $access_time, "Maximum Access Time", $access_time); # module attributes - if ($bytes->[47] & 0x03) { - if (($bytes->[47] & 0x03) == 0x01) { $temp = "1.125\" to 1.25\""; } - elsif (($bytes->[47] & 0x03) == 0x02) { $temp = "1.7\""; } - elsif (($bytes->[47] & 0x03) == 0x03) { $temp = "Other"; } - printl("Module Height", $temp); - } + if (($bytes->[47] & 0x03) == 0x01) { $temp = "1.125\" to 1.25\""; } + elsif (($bytes->[47] & 0x03) == 0x02) { $temp = "1.7\""; } + else { $temp = "Other"; } + printl_cond($bytes->[47] & 0x03, "Module Height", $temp); } sub ddr2_sdram_ctime($)