Module Name: src
Committed By: pgoyette
Date: Mon Feb 8 21:45:32 UTC 2010
Modified Files:
src/sys/arch/amd64/conf: GENERIC
src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0
Log Message:
Add flags to all instances of lm(4), add a reference to man page
To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.233 -r1.234 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.963 -r1.964 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/i386/conf/XEN3_DOM0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.264 src/sys/arch/amd64/conf/GENERIC:1.265
--- src/sys/arch/amd64/conf/GENERIC:1.264 Sat Feb 6 20:12:32 2010
+++ src/sys/arch/amd64/conf/GENERIC Mon Feb 8 21:45:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.264 2010/02/06 20:12:32 pgoyette Exp $
+# $NetBSD: GENERIC,v 1.265 2010/02/08 21:45:32 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.264 $"
+#ident "GENERIC-$Revision: 1.265 $"
maxusers 64 # estimated number of users
@@ -422,7 +422,8 @@
amdtemp* at pci? dev ? function ? # AMD CPU Temperature sensors
# LM7[89] and compatible hardware monitors
-#lm0 at isa? port 0x290 # other common ports: 0x280, 0x310
+# Use flags to select temp sensor type (see lm(4) man page for details)
+#lm0 at isa? port 0x290 flags 0x0 # other common ports: 0x280, 0x310
# SMSC LPC47B397 hardware monitor functions
#smsc0 at isa? port 0x02e
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.233 src/sys/arch/i386/conf/ALL:1.234
--- src/sys/arch/i386/conf/ALL:1.233 Sat Feb 6 21:27:51 2010
+++ src/sys/arch/i386/conf/ALL Mon Feb 8 21:45:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.233 2010/02/06 21:27:51 pgoyette Exp $
+# $NetBSD: ALL,v 1.234 2010/02/08 21:45:31 pgoyette Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.233 $"
+#ident "ALL-$Revision: 1.234 $"
maxusers 64 # estimated number of users
@@ -682,7 +682,8 @@
dbcool* at iic? addr 0x2E # Tyan S2882-D
# LM7[89] and compatible hardware monitors
-lm0 at iic? addr 0x2e
+# Use flags to select temp sensor type (see lm(4) man page for details)
+lm0 at iic? addr 0x2e flags 0x0
pic16lc* at iic? addr 0x10 # XBOX PIC16LC
xbseeprom* at iic? addr 0x54 # XBOX serial EEPROM
@@ -697,7 +698,7 @@
itesio0 at isa? port 0x2e
# LM7[89] and compatible hardware monitors
-lm0 at isa? port 0x290 # other common: 0x280, 0x310
+lm0 at isa? port 0x290 flags 0x0 # other common: 0x280, 0x310
# SMSC LPC47B397 hardware monitor functions
smsc0 at isa? port 0x02e
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.963 src/sys/arch/i386/conf/GENERIC:1.964
--- src/sys/arch/i386/conf/GENERIC:1.963 Sat Feb 6 20:12:32 2010
+++ src/sys/arch/i386/conf/GENERIC Mon Feb 8 21:45:31 2010
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.963 2010/02/06 20:12:32 pgoyette Exp $
+# $NetBSD: GENERIC,v 1.964 2010/02/08 21:45:31 pgoyette Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.963 $"
+#ident "GENERIC-$Revision: 1.964 $"
maxusers 64 # estimated number of users
@@ -652,7 +652,8 @@
#itesio0 at isa? port 0x2e
# LM7[89] and compatible hardware monitors
-#lm0 at isa? port 0x290 # other common: 0x280, 0x310
+# Use flags to select temp sensor type (see lm(4) man page for details)
+#lm0 at isa? port 0x290 flags 0x0 # other common: 0x280, 0x310
# SMSC LPC47B397 hardware monitor functions
#smsc0 at isa? port 0x02e
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.27 src/sys/arch/i386/conf/XEN3_DOM0:1.28
--- src/sys/arch/i386/conf/XEN3_DOM0:1.27 Thu Jan 7 18:49:30 2010
+++ src/sys/arch/i386/conf/XEN3_DOM0 Mon Feb 8 21:45:32 2010
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.27 2010/01/07 18:49:30 tnn Exp $
+# $NetBSD: XEN3_DOM0,v 1.28 2010/02/08 21:45:32 pgoyette Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -282,7 +282,8 @@
#dbcool* at iic? addr 0x2E # Tyan S2882-D
# LM7[89] and compatible hardware monitors
-#lm0 at isa? port 0x290 # other common: 0x280, 0x310, 0xc00
+# Use flags to select temp sensor type (see lm(4) man page for details)
+#lm0 at isa? port 0x290 flags 0x0 # other common: 0x280, 0x310, 0xc00
# VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer
#viaenv* at pci? dev ? function ?
