Print primary bus width for DDR3 and DDR4 Also make bus width extension

conditional for DDR3, as was already done for DDR4.

3 files changed, 19 insertions, 18 deletions

diff --git a/sysutils/decode-dimms/Makefile b/sysutils/decode-dimms/Makefile
index 6d0eebd1ec3..01aad9377a8 100644
--- a/sysutils/decode-dimms/Makefile
+++ b/sysutils/decode-dimms/Makefile
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2019/01/17 05:41:10 pgoyette Exp $
+# $NetBSD: Makefile,v 1.13 2019/04/06 10:57:28 pgoyette Exp $
 
 # no Release yet
-GIT_COMMIT=	4d476eb716c388d3c78e434b5e401e893067ab98
+_DATE=		20190405
+GIT_COMMIT=	cea0000657a2dde506df91ecce6b18ac2d7224db
 DISTNAME=	i2c-tools-${GIT_COMMIT}
-PKGNAME=	decode-dimms-0.0.20190109
+PKGNAME=	decode-dimms-0.0.${_DATE}
 CATEGORIES=	sysutils
 MASTER_SITES=	https://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git/snapshot/
 
@@ -18,7 +19,7 @@ REPLACE_PERL=	eeprom/decode-dimms
 SUBST_CLASSES+=		rev
 SUBST_STAGE.rev=	pre-patch
 SUBST_FILES.rev=        eeprom/decode-dimms
-SUBST_SED.rev=          -e 's/^$$revision = .*;/$$revision = "20190109-${GIT_COMMIT}";/'
+SUBST_SED.rev=          -e 's/^$$revision = .*;/$$revision = "${_DATE}-${GIT_COMMIT}";/'
 SUBST_SED.rev+=		-e '/^$$revision =~/d'
 
 NO_BUILD=	yes
diff --git a/sysutils/decode-dimms/distinfo b/sysutils/decode-dimms/distinfo
index b894142e15a..b387674f674 100644
--- a/sysutils/decode-dimms/distinfo
+++ b/sysutils/decode-dimms/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.11 2019/01/17 05:41:10 pgoyette Exp $
+$NetBSD: distinfo,v 1.12 2019/04/06 10:57:28 pgoyette Exp $
 
-SHA1 (i2c-tools-4d476eb716c388d3c78e434b5e401e893067ab98.tar.gz) = 7b1803b54f010eae5ff979785a92df4371be6bc3
-RMD160 (i2c-tools-4d476eb716c388d3c78e434b5e401e893067ab98.tar.gz) = 336d085a144018bcd6a19b0642f06db224538ed0
-SHA512 (i2c-tools-4d476eb716c388d3c78e434b5e401e893067ab98.tar.gz) = d1da7019678b59a2bcfdf08247c8f469ea02accd657a5b8c9ebe3e9d5cfc238ed26a8d4b4ce5c62cecb897f349e7c5910bff9ae4c919a0ebe266fc965a444f73
-Size (i2c-tools-4d476eb716c388d3c78e434b5e401e893067ab98.tar.gz) = 98190 bytes
-SHA1 (patch-decode-dimms) = 49408089c4c3b9da9625e006727c15c7e543c083
+SHA1 (i2c-tools-cea0000657a2dde506df91ecce6b18ac2d7224db.tar.gz) = bcca6f8b031bd3797eb9db1cf241063b5e885cd4
+RMD160 (i2c-tools-cea0000657a2dde506df91ecce6b18ac2d7224db.tar.gz) = b5b837bd277138ba334003c7143c9eacc41aae8f
+SHA512 (i2c-tools-cea0000657a2dde506df91ecce6b18ac2d7224db.tar.gz) = 90f7af2521ee2984b5e107f1fedd12238e6d8fef66d15c9a21d422d40d530cf4f8993570251c40ff1f5bcd262f85cb188d63a7b70ab48d54dc5fc431b6784421
+Size (i2c-tools-cea0000657a2dde506df91ecce6b18ac2d7224db.tar.gz) = 98243 bytes
+SHA1 (patch-decode-dimms) = 823df4f5d28783a4ef46894b435faac71ab313d6
 SHA1 (patch-decode-dimms.1) = c1c1444a73fa848eda0223e2c176819d4ded6641
diff --git a/sysutils/decode-dimms/patches/patch-decode-dimms b/sysutils/decode-dimms/patches/patch-decode-dimms
index bad352efce9..fa5255575d2 100644
--- a/sysutils/decode-dimms/patches/patch-decode-dimms
+++ b/sysutils/decode-dimms/patches/patch-decode-dimms
@@ -1,4 +1,4 @@
-$NetBSD: patch-decode-dimms,v 1.10 2019/01/17 05:41:10 pgoyette Exp $
+$NetBSD: patch-decode-dimms,v 1.11 2019/04/06 10:57:28 pgoyette Exp $
 
 Add NetBSD-specific ability to use spdmem(4)'s sysctl values as
 input.
@@ -25,7 +25,7 @@ input.
  
  # We consider that no data was written to this area of the SPD EEPROM if
  # all bytes read 0x00 or all bytes read 0xff
-@@ -2335,6 +2337,26 @@
+@@ -2337,6 +2339,26 @@
  	}
  }
  
@@ -52,7 +52,7 @@ input.
  # Read bytes from SPD-EEPROM
  # Note: offset must be a multiple of 16!
  sub readspd($$$)
-@@ -2344,6 +2366,9 @@
+@@ -2346,6 +2368,9 @@
  	if ($use_hexdump) {
  		@bytes = read_hexdump($dimm_i);
  		return @bytes[$offset..($offset + $size - 1)];
@@ -62,7 +62,7 @@ input.
  	} elsif ($use_sysfs) {
  		# Kernel 2.6 with sysfs
  		sysopen(HANDLE, "$dimm_i/eeprom", O_RDONLY)
-@@ -2420,7 +2445,7 @@
+@@ -2422,7 +2447,7 @@
  # Parse command-line
  foreach (@ARGV) {
  	if ($_ eq '-h' || $_ eq '--help') {
@@ -71,7 +71,7 @@ input.
  			"       $0 -h\n\n",
  			"  -f, --format            Print nice html output\n",
  			"  -b, --bodyonly          Don't print html header\n",
-@@ -2434,6 +2459,8 @@
+@@ -2436,6 +2461,8 @@
  			"  -x,                     Read data from hexdump files\n",
  			"  -X,                     Same as -x except treat multibyte hex\n",
  			"                          data as little endian\n",
@@ -80,7 +80,7 @@ input.
  			"  -h, --help              Display this usage summary\n";
  		print <<"EOF";
  
-@@ -2478,13 +2505,20 @@
+@@ -2480,13 +2507,20 @@
  		$use_hexdump = LITTLEENDIAN;
  		next;
  	}
@@ -102,7 +102,7 @@ input.
  }
  
  # Default values
-@@ -2562,7 +2596,7 @@
+@@ -2564,7 +2598,7 @@
  #  * chk_spd: The checksum or CRC value found in the EEPROM
  #  * chk_calc: The checksum or CRC computed from the EEPROM data
  # Keys are added over time.
@@ -111,7 +111,7 @@ input.
  
  for my $i (0 .. $#dimm) {
  	my @bytes = readspd(0, 128, $dimm[$i]->{file});
-@@ -2614,7 +2648,7 @@
+@@ -2616,7 +2650,7 @@
  		printl("Decoding EEPROM", $dimm[$current]->{eeprom});
  	}