 @@ -1,133 +1,133 @@
-$NetBSD: patch-decode-dimms,v 1.5 2018/07/25 02:36:08 pgoyette Exp $
+$NetBSD: patch-decode-dimms,v 1.6 2018/07/25 02:37:11 pgoyette Exp $
 Add NetBSD-specific ability to use spdmem(4)'s sysctl values as
 input.
---- decode-dimms.after-patch	2018-07-25 10:33:01.055537617 +0800
+--- eeprom/decode-dimms.orig	2018-07-25 10:33:01.055537617 +0800
-+++ decode-dimms.master	2018-05-31 13:53:29.771907986 +0800
++++ eeprom/decode-dimms	2018-05-31 13:53:29.771907986 +0800
 @@ -1,4 +1,4 @@
 -#!/usr/pkg/bin/perl -w
 +#!/usr/bin/perl -w
+ #
  # EEPROM data decoder for SDRAM DIMM modules
+ #
 @@ -42,9 +42,8 @@
  use Fcntl qw(:DEFAULT :seek);
  use File::Basename;
  use vars qw($opt_html $opt_bodyonly $opt_side_by_side $opt_merge
 -	    $opt_igncheck $use_sysfs $use_hexdump $use_sysctl $sbs_col_width
 -	    @vendors %decode_callback $revision @dimm $current %hexdump_cache
 -	    %sysctl_cache);
 +	    $opt_igncheck $use_sysfs $use_hexdump $sbs_col_width
 +	    @vendors %decode_callback $revision @dimm $current %hexdump_cache);
  use constant LITTLEENDIAN	=> "little-endian";
  use constant BIGENDIAN		=> "big-endian";
 @@ -342,7 +341,6 @@
  );
  $use_sysfs = -d '/sys/bus';
 -$use_sysctl = 0;
  # We consider that no data was written to this area of the SPD EEPROM if
  # all bytes read 0x00 or all bytes read 0xff
 @@ -2254,26 +2252,6 @@
+ 	}
+ }
 -# read data from a NetBSD (or equivalent) sysctl variable
+-
 -sub read_sysctl($)
 -{
+-
 -	# Look in the cache first
 -	return @{$sysctl_cache{$_[0]}} if exists $sysctl_cache{$_[0]};
+-
 -	my $sysctl_var = sprintf("hw.%s.spd_data", $_[0]);
 -	open(PIPE, "-|", "sysctl -r $sysctl_var")
 -		or die "Cannot read sysctl variable $sysctl_var";
 -	sysread(PIPE, my $eeprom, 512); # XXX Assumed maximum size! XXX
 -	close PIPE or die "sysctl returned $?";
 -	my @bytes = unpack("C*", $eeprom);
+-
 -	# Cache the data for later use
 -	$hexdump_cache{$_[0]} = \@bytes;
 -	return @bytes;
 -}
+-
  # Read bytes from SPD-EEPROM
  # Note: offset must be a multiple of 16!
  sub readspd($$$)
 @@ -2283,9 +2261,6 @@
  	if ($use_hexdump) {
  		@bytes = read_hexdump($dimm_i);
  		return @bytes[$offset..($offset + $size - 1)];
 -	} elsif ($use_sysctl) {
 -		@bytes = read_sysctl($dimm_i);
 -		return @bytes[$offset..($offset + $size - 1)];
  	} elsif ($use_sysfs) {
  		# Kernel 2.6 with sysfs
  		sysopen(HANDLE, "$dimm_i/eeprom", O_RDONLY)
 @@ -2362,7 +2337,7 @@
  # Parse command-line
  foreach (@ARGV) {
  	if ($_ eq '-h' || $_ eq '--help') {
 -		print "Usage: $0 [-c] [-f [-b]] [-x|-X|-s file [files..]]\n",
 +		print "Usage: $0 [-c] [-f [-b]] [-x|-X file [files..]]\n",
  			"       $0 -h\n\n",
  			"  -f, --format            Print nice html output\n",
  			"  -b, --bodyonly          Don't print html header\n",
 @@ -2376,8 +2351,6 @@
  			"  -x,                     Read data from hexdump files\n",
  			"  -X,                     Same as -x except treat multibyte hex\n",
  			"                          data as little endian\n",
 -			"  -s,                     Use NetBSD-compatible sysctl(8) to obtain\n",
 -			"                          EEPROM data\n",
  			"  -h, --help              Display this usage summary\n";
  		print <<"EOF";
 @@ -2422,20 +2395,13 @@
  		$use_hexdump = LITTLEENDIAN;
  		next;
+ 	}
 -	if ($_ eq '-s') {
 -		if (-x "/sbin/sysctl") {
 -			$use_sysctl = 1;
 -		} else { die "No /sbin/sysctl available for -s"; }
 -		next;
 -	}
  	if (m/^-/) {
  		print STDERR "Unrecognized option $_\n";
  		exit;
+ 	}
 -	push @dimm, { eeprom => basename($_), file => $_ }
 -		if ($use_sysctl || $use_hexdump);
 +	push @dimm, { eeprom => basename($_), file => $_ } if $use_hexdump;
+ }
  # Default values
 @@ -2513,7 +2479,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.
 -@dimm = get_dimm_list() unless ($use_sysctl || $use_hexdump);
 +@dimm = get_dimm_list() unless $use_hexdump;
  for my $i (0 .. $#dimm) {
  	my @bytes = readspd(0, 128, $dimm[$i]->{file});
 @@ -2565,7 +2531,7 @@
  		printl("Decoding EEPROM", $dimm[$current]->{eeprom});
+ 	}
 -	if (!$use_hexdump && !$use_sysctl) {
 +	if (!$use_hexdump) {
  		if ($dimm[$current]->{file} =~ /-([\da-f]+)$/i) {
  			my $dimm_num = hex($1) - 0x50 + 1;
  			if ($dimm_num >= 1 && $dimm_num <= 8) {
 @@ -2771,4 +2737,3 @@
  printl2("\n\nNumber of SDRAM DIMMs detected and decoded", scalar @dimm);
  print "</body></html>\n" if ($opt_html && !$opt_bodyonly);
+-