CVS commit: src/sys/dev/ic

[SAITOH Masanobu]

Module Name:    src
Committed By:   msaitoh
Date:           Fri May 15 08:44:24 UTC 2015

Modified Files:
        src/sys/dev/ic: spdmem.c spdmemvar.h

Log Message:
 Print operable voltage with aprint_verbose(). OK'ed by pgoyette@.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/spdmem.c
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/spdmemvar.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/ic/spdmem.c
diff -u src/sys/dev/ic/spdmem.c:1.13 src/sys/dev/ic/spdmem.c:1.14
--- src/sys/dev/ic/spdmem.c:1.13	Mon Apr 20 02:55:14 2015
+++ src/sys/dev/ic/spdmem.c	Fri May 15 08:44:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmem.c,v 1.13 2015/04/20 02:55:14 pgoyette Exp $ */
+/* $NetBSD: spdmem.c,v 1.14 2015/05/15 08:44:24 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2007 Nicolas Joly
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.13 2015/04/20 02:55:14 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: spdmem.c,v 1.14 2015/05/15 08:44:24 msaitoh Exp $");
 
 #include <sys/param.h>
 #include <sys/device.h>
@@ -763,6 +763,19 @@ decode_ddr3(const struct sysctlnode *nod
 		    s->sm_ddr3.ddr3_tCKmin);
 
 #undef	__DDR3_CYCLES
+
+	/* For DDR3, Voltage is written in another area */
+	if (!s->sm_ddr3.ddr3_NOT15V || s->sm_ddr3.ddr3_135V
+	    || s->sm_ddr3.ddr3_125V) {
+		aprint_verbose("%s:", device_xname(self));
+		if (!s->sm_ddr3.ddr3_NOT15V)
+			aprint_verbose(" 1.5V");
+		if (s->sm_ddr3.ddr3_135V)
+			aprint_verbose(" 1.35V");
+		if (s->sm_ddr3.ddr3_125V)
+			aprint_verbose(" 1.25V");
+		aprint_verbose(" operable\n");
+	}
 }
 
 static void

Index: src/sys/dev/ic/spdmemvar.h
diff -u src/sys/dev/ic/spdmemvar.h:1.6 src/sys/dev/ic/spdmemvar.h:1.7
--- src/sys/dev/ic/spdmemvar.h:1.6	Mon Apr 20 07:51:36 2015
+++ src/sys/dev/ic/spdmemvar.h	Fri May 15 08:44:24 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: spdmemvar.h,v 1.6 2015/04/20 07:51:36 ozaki-r Exp $ */
+/* $NetBSD: spdmemvar.h,v 1.7 2015/05/15 08:44:24 msaitoh Exp $ */
 
 /*
  * Copyright (c) 2007 Paul Goyette
@@ -437,7 +437,7 @@ struct spdmem_ddr3 {				/* Dual Data Rat
 	SPD_BITFIELD(				\
 		uint8_t ddr3_NOT15V:1,		\
 		uint8_t ddr3_135V:1,		\
-		uint8_t ddr3_12XV:1,		\
+		uint8_t ddr3_125V:1,		\
 		uint8_t	ddr3_unused2:5		\
 	);
 	/* chipwidth in bits offset by 2: 0 = X4, 1 = X8, 2 = X16 */