diff options
| author | Jean Delvare <jdelvare@suse.de> | 2012-10-25 11:54:24 +0000 |
|---|---|---|
| committer | Jean Delvare <jdelvare@suse.de> | 2012-10-25 11:54:24 +0000 |
| commit | fc704a85ae900fddd2b53e69e9fe911cb0937b70 (patch) | |
| tree | 7fa6e1b3ed4c6d079fdddb6cacb0d418e0f54b57 | |
| parent | a596e1ecbd4d04bc20274ce9dbe87eeacce4b6bd (diff) | |
| download | i2c-tools-fc704a85ae900fddd2b53e69e9fe911cb0937b70.tar.gz | |
decode-dimms: Default to merging cells in side-by-side output mode.
Add an option to revert to no cell merging.
git-svn-id: http://lm-sensors.org/svn/i2c-tools/trunk@6077 7894878c-1315-0410-8ee3-d5d059ff63e0
| -rw-r--r-- | CHANGES | 1 | ||||
| -rwxr-xr-x | eeprom/decode-dimms | 9 |
2 files changed, 10 insertions, 0 deletions
@@ -9,6 +9,7 @@ SVN HEAD Don't make columns larger than they need to be Make side-by-side output more robust Print module organization of DDR SDRAM + Merge cells by default in 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 706a73d..a85e602 100755 --- a/eeprom/decode-dimms +++ b/eeprom/decode-dimms @@ -1696,6 +1696,8 @@ foreach (@ARGV) { " (useful for postprocessing the output)\n", " --side-by-side Display all DIMMs side-by-side if possible\n", " --merge-cells Merge neighbour cells with identical values\n", + " (side-by-side output only, default)\n", + " --no-merge-cells Don't merge neighbour cells with identical values\n", " (side-by-side output only)\n", " -c, --checksum Decode completely even if checksum fails\n", " -x, Read data from hexdump files\n", @@ -1729,6 +1731,10 @@ EOF $opt_merge = 1; next; } + if ($_ eq '--no-merge-cells') { + $opt_merge = 0; + next; + } if ($_ eq '-c' || $_ eq '--checksum') { $opt_igncheck = 1; next; @@ -1750,6 +1756,9 @@ EOF push @dimm, { eeprom => basename($_), file => $_ } if $use_hexdump; } +# Default values +$opt_merge = 1 unless defined $opt_merge; + # From a sysfs device path and an attribute name, return the attribute # value, or undef (stolen from sensors-detect) sub sysfs_device_attribute |