head	1.1262;
access;
symbols
	netbsd-11-0-RC4:1.1260.2.2
	netbsd-11-0-RC3:1.1260.2.2
	netbsd-11-0-RC2:1.1260.2.2
	netbsd-11-0-RC1:1.1260.2.2
	perseant-exfatfs-base-20250801:1.1260
	netbsd-11:1.1260.0.2
	netbsd-11-base:1.1260
	netbsd-10-1-RELEASE:1.1243.2.5
	perseant-exfatfs-base-20240630:1.1256
	perseant-exfatfs:1.1256.0.2
	perseant-exfatfs-base:1.1256
	netbsd-8-3-RELEASE:1.1156.2.15
	netbsd-9-4-RELEASE:1.1208.2.6
	netbsd-10-0-RELEASE:1.1243.2.3
	netbsd-10-0-RC6:1.1243.2.3
	netbsd-10-0-RC5:1.1243.2.3
	netbsd-10-0-RC4:1.1243.2.3
	netbsd-10-0-RC3:1.1243.2.3
	netbsd-10-0-RC2:1.1243.2.3
	thorpej-ifq:1.1252.0.4
	thorpej-ifq-base:1.1252
	thorpej-altq-separation:1.1252.0.2
	thorpej-altq-separation-base:1.1252
	netbsd-10-0-RC1:1.1243.2.3
	netbsd-10:1.1243.0.2
	netbsd-10-base:1.1243
	bouyer-sunxi-drm:1.1242.0.2
	bouyer-sunxi-drm-base:1.1242
	netbsd-9-3-RELEASE:1.1208.2.5
	thorpej-i2c-spi-conf2:1.1237.0.8
	thorpej-i2c-spi-conf2-base:1.1237
	thorpej-futex2:1.1237.0.6
	thorpej-futex2-base:1.1237
	thorpej-cfargs2:1.1237.0.4
	thorpej-cfargs2-base:1.1237
	cjep_sun2x-base1:1.1237
	cjep_sun2x:1.1237.0.2
	cjep_sun2x-base:1.1237
	cjep_staticlib_x-base1:1.1237
	netbsd-9-2-RELEASE:1.1208.2.5
	cjep_staticlib_x:1.1236.0.6
	cjep_staticlib_x-base:1.1236
	thorpej-i2c-spi-conf:1.1236.0.4
	thorpej-i2c-spi-conf-base:1.1237
	thorpej-cfargs:1.1236.0.2
	thorpej-cfargs-base:1.1236
	thorpej-futex:1.1233.0.2
	thorpej-futex-base:1.1236
	netbsd-9-1-RELEASE:1.1208.2.5
	bouyer-xenpvh-base2:1.1227
	phil-wifi-20200421:1.1227
	bouyer-xenpvh-base1:1.1227
	phil-wifi-20200411:1.1227
	bouyer-xenpvh:1.1227.0.2
	bouyer-xenpvh-base:1.1227
	is-mlppp:1.1225.0.2
	is-mlppp-base:1.1225
	phil-wifi-20200406:1.1227
	netbsd-8-2-RELEASE:1.1156.2.15
	ad-namecache-base3:1.1225
	netbsd-9-0-RELEASE:1.1208.2.4
	netbsd-9-0-RC2:1.1208.2.4
	ad-namecache-base2:1.1223
	ad-namecache-base1:1.1218
	ad-namecache:1.1218.0.2
	ad-namecache-base:1.1218
	netbsd-9-0-RC1:1.1208.2.4
	phil-wifi-20191119:1.1215
	netbsd-9:1.1208.0.2
	netbsd-9-base:1.1208
	phil-wifi-20190609:1.1207
	netbsd-8-1-RELEASE:1.1156.2.14
	netbsd-8-1-RC1:1.1156.2.14
	isaki-audio2:1.1204.0.2
	isaki-audio2-base:1.1204
	pgoyette-compat-merge-20190127:1.1174.2.8
	pgoyette-compat-20190127:1.1199
	pgoyette-compat-20190118:1.1199
	pgoyette-compat-1226:1.1199
	pgoyette-compat-1126:1.1194
	pgoyette-compat-1020:1.1192
	pgoyette-compat-0930:1.1192
	pgoyette-compat-0906:1.1191
	netbsd-7-2-RELEASE:1.1107.2.13
	pgoyette-compat-0728:1.1183
	netbsd-8-0-RELEASE:1.1156.2.10
	phil-wifi:1.1180.0.2
	phil-wifi-base:1.1180
	pgoyette-compat-0625:1.1180
	netbsd-8-0-RC2:1.1156.2.10
	pgoyette-compat-0521:1.1178
	pgoyette-compat-0502:1.1177
	pgoyette-compat-0422:1.1177
	netbsd-8-0-RC1:1.1156.2.9
	pgoyette-compat-0415:1.1177
	pgoyette-compat-0407:1.1174
	pgoyette-compat-0330:1.1174
	pgoyette-compat-0322:1.1174
	pgoyette-compat-0315:1.1174
	netbsd-7-1-2-RELEASE:1.1107.2.9.2.2
	pgoyette-compat:1.1174.0.2
	pgoyette-compat-base:1.1174
	netbsd-7-1-1-RELEASE:1.1107.2.9.2.1
	tls-maxphys-base-20171202:1.1172
	matt-nb8-mediatek:1.1156.2.6.0.2
	matt-nb8-mediatek-base:1.1156.2.6
	nick-nhusb-base-20170825:1.1166
	perseant-stdc-iso10646:1.1157.0.2
	perseant-stdc-iso10646-base:1.1157
	netbsd-8:1.1156.0.2
	netbsd-8-base:1.1156
	prg-localcount2-base3:1.1154
	prg-localcount2-base2:1.1154
	prg-localcount2-base1:1.1154
	prg-localcount2:1.1154.0.2
	prg-localcount2-base:1.1154
	pgoyette-localcount-20170426:1.1154
	bouyer-socketcan-base1:1.1154
	jdolecek-ncq:1.1152.0.2
	jdolecek-ncq-base:1.1152
	pgoyette-localcount-20170320:1.1152
	netbsd-7-1:1.1107.2.9.0.2
	netbsd-7-1-RELEASE:1.1107.2.9
	netbsd-7-1-RC2:1.1107.2.9
	nick-nhusb-base-20170204:1.1146
	netbsd-7-nhusb-base-20170116:1.1107.2.9
	bouyer-socketcan:1.1146.0.2
	bouyer-socketcan-base:1.1146
	pgoyette-localcount-20170107:1.1145
	netbsd-7-1-RC1:1.1107.2.9
	nick-nhusb-base-20161204:1.1141
	pgoyette-localcount-20161104:1.1140
	netbsd-7-0-2-RELEASE:1.1107.2.8
	nick-nhusb-base-20161004:1.1140
	localcount-20160914:1.1139
	netbsd-7-nhusb:1.1107.2.8.0.4
	netbsd-7-nhusb-base:1.1107.2.8
	pgoyette-localcount-20160806:1.1138
	pgoyette-localcount-20160726:1.1137
	pgoyette-localcount:1.1137.0.2
	pgoyette-localcount-base:1.1137
	nick-nhusb-base-20160907:1.1137
	nick-nhusb-base-20160529:1.1136
	netbsd-7-0-1-RELEASE:1.1107.2.8
	nick-nhusb-base-20160422:1.1134
	nick-nhusb-base-20160319:1.1132
	nick-nhusb-base-20151226:1.1128
	netbsd-7-0:1.1107.2.8.0.2
	netbsd-7-0-RELEASE:1.1107.2.8
	nick-nhusb-base-20150921:1.1127
	netbsd-7-0-RC3:1.1107.2.8
	netbsd-7-0-RC2:1.1107.2.8
	netbsd-7-0-RC1:1.1107.2.8
	nick-nhusb-base-20150606:1.1125
	nick-nhusb-base-20150406:1.1121
	nick-nhusb:1.1118.0.2
	nick-nhusb-base:1.1118
	netbsd-5-2-3-RELEASE:1.915.2.13
	netbsd-5-1-5-RELEASE:1.915.2.10
	netbsd-6-0-6-RELEASE:1.1066.2.7
	netbsd-6-1-5-RELEASE:1.1066.2.7
	netbsd-7:1.1107.0.2
	netbsd-7-base:1.1107
	yamt-pagecache-base9:1.1103
	yamt-pagecache-tag8:1.1055.2.5
	netbsd-6-1-4-RELEASE:1.1066.2.7
	netbsd-6-0-5-RELEASE:1.1066.2.7
	tls-earlyentropy:1.1101.0.2
	tls-earlyentropy-base:1.1107
	riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1101
	riastradh-drm2-base3:1.1099
	netbsd-6-1-3-RELEASE:1.1066.2.7
	netbsd-6-0-4-RELEASE:1.1066.2.7
	netbsd-5-2-2-RELEASE:1.915.2.13
	netbsd-5-1-4-RELEASE:1.915.2.10
	netbsd-6-1-2-RELEASE:1.1066.2.7
	netbsd-6-0-3-RELEASE:1.1066.2.7
	netbsd-5-2-1-RELEASE:1.915.2.13
	netbsd-5-1-3-RELEASE:1.915.2.10
	rmind-smpnet-nbase:1.1103
	netbsd-6-1-1-RELEASE:1.1066.2.7
	riastradh-drm2-base2:1.1096
	riastradh-drm2-base1:1.1096
	riastradh-drm2:1.1096.0.2
	riastradh-drm2-base:1.1096
	rmind-smpnet:1.1095.0.2
	rmind-smpnet-base:1.1103
	netbsd-6-1:1.1066.2.7.0.6
	netbsd-6-0-2-RELEASE:1.1066.2.7
	netbsd-6-1-RELEASE:1.1066.2.7
	khorben-n900:1.1092.0.2
	netbsd-6-1-RC4:1.1066.2.7
	netbsd-6-1-RC3:1.1066.2.7
	agc-symver:1.1088.0.2
	agc-symver-base:1.1088
	netbsd-6-1-RC2:1.1066.2.7
	netbsd-6-1-RC1:1.1066.2.7
	yamt-pagecache-base8:1.1086
	netbsd-5-2:1.915.2.13.0.2
	netbsd-6-0-1-RELEASE:1.1066.2.7
	yamt-pagecache-base7:1.1084
	netbsd-5-2-RELEASE:1.915.2.13
	netbsd-5-2-RC1:1.915.2.13
	matt-nb6-plus-nbase:1.1066.2.7
	yamt-pagecache-base6:1.1082
	netbsd-6-0:1.1066.2.7.0.4
	netbsd-6-0-RELEASE:1.1066.2.7
	netbsd-6-0-RC2:1.1066.2.7
	tls-maxphys:1.1079.0.2
	tls-maxphys-base:1.1107
	matt-nb6-plus:1.1066.2.7.0.2
	matt-nb6-plus-base:1.1066.2.7
	netbsd-6-0-RC1:1.1066.2.7
	jmcneill-usbmp-base10:1.1073
	yamt-pagecache-base5:1.1072
	jmcneill-usbmp-base9:1.1072
	yamt-pagecache-base4:1.1071
	jmcneill-usbmp-base8:1.1068
	jmcneill-usbmp-base7:1.1067
	jmcneill-usbmp-base6:1.1066
	jmcneill-usbmp-base5:1.1066
	jmcneill-usbmp-base4:1.1066
	jmcneill-usbmp-base3:1.1066
	jmcneill-usbmp-pre-base2:1.1058
	jmcneill-usbmp-base2:1.1066
	netbsd-6:1.1066.0.2
	netbsd-6-base:1.1066
	netbsd-5-1-2-RELEASE:1.915.2.10
	netbsd-5-1-1-RELEASE:1.915.2.10
	jmcneill-usbmp:1.1058.0.2
	jmcneill-usbmp-base:1.1058
	jmcneill-audiomp3:1.1057.0.2
	jmcneill-audiomp3-base:1.1057
	yamt-pagecache-base3:1.1055
	yamt-pagecache-base2:1.1055
	yamt-pagecache:1.1055.0.2
	yamt-pagecache-base:1.1055
	rmind-uvmplock-nbase:1.1032
	cherry-xenmp:1.1032.0.2
	cherry-xenmp-base:1.1032
	jym-xensuspend-nbase:1.1049
	uebayasi-xip-base7:1.1016
	bouyer-quota2-nbase:1.1025
	bouyer-quota2:1.1007.0.2
	bouyer-quota2-base:1.1016
	jruoho-x86intr:1.1006.0.2
	jruoho-x86intr-base:1.1006
	matt-mips64-premerge-20101231:1.1003
	matt-nb5-mips64-premerge-20101231:1.915.2.3.4.1
	matt-nb5-pq3:1.915.2.11.0.2
	matt-nb5-pq3-base:1.915.2.11
	netbsd-5-1:1.915.2.10.0.2
	uebayasi-xip-base6:1.999
	uebayasi-xip-base5:1.998
	netbsd-5-1-RELEASE:1.915.2.10
	uebayasi-xip-base4:1.997
	uebayasi-xip-base3:1.994
	yamt-nfs-mp-base11:1.993
	netbsd-5-1-RC4:1.915.2.10
	matt-nb5-mips64-k15:1.915.2.3.4.1
	uebayasi-xip-base2:1.990
	yamt-nfs-mp-base10:1.990
	netbsd-5-1-RC3:1.915.2.10
	netbsd-5-1-RC2:1.915.2.10
	uebayasi-xip-base1:1.980
	netbsd-5-1-RC1:1.915.2.10
	rmind-uvmplock:1.974.0.2
	rmind-uvmplock-base:1.1032
	yamt-nfs-mp-base9:1.974
	uebayasi-xip:1.963.0.2
	uebayasi-xip-base:1.963
	netbsd-5-0-2-RELEASE:1.915.2.3
	matt-nb5-mips64-premerge-20091211:1.915.2.3
	matt-premerge-20091211:1.954
	yamt-nfs-mp-base8:1.944
	matt-nb5-mips64-u2-k2-k4-k7-k8-k9:1.915.2.3
	matt-nb4-mips64-k7-u2a-k9b:1.915.2.3
	matt-nb5-mips64-u1-k1-k5:1.915.2.3
	yamt-nfs-mp-base7:1.941
	matt-nb5-mips64:1.915.2.3.0.4
	netbsd-5-0-1-RELEASE:1.915.2.3
	jymxensuspend-base:1.937
	yamt-nfs-mp-base6:1.934
	yamt-nfs-mp-base5:1.934
	yamt-nfs-mp-base4:1.934
	yamt-nfs-mp-base3:1.934
	nick-hppapmap-base4:1.934
	nick-hppapmap-base3:1.934
	netbsd-5-0:1.915.2.3.0.2
	netbsd-5-0-RELEASE:1.915.2.3
	netbsd-5-0-RC4:1.915.2.3
	netbsd-5-0-RC3:1.915.2.3
	nick-hppapmap-base2:1.927
	netbsd-5-0-RC2:1.915.2.2
	jym-xensuspend:1.925.0.2
	jym-xensuspend-base:1.1049
	netbsd-5-0-RC1:1.915.2.1
	haad-dm-base2:1.920
	haad-nbase2:1.920
	ad-audiomp2:1.920.0.2
	ad-audiomp2-base:1.920
	netbsd-5:1.915.0.2
	netbsd-5-base:1.915
	nick-hppapmap:1.914.0.2
	nick-hppapmap-base:1.934
	matt-mips64-base2:1.914
	haad-dm-base1:1.914
	wrstuden-revivesa-base-4:1.912
	netbsd-4-0-1-RELEASE:1.799.2.15
	wrstuden-revivesa-base-3:1.909
	wrstuden-revivesa-base-2:1.907
	wrstuden-fixsa-newbase:1.799.2.17
	nick-csl-alignment-base5:1.848
	haad-dm:1.901.0.2
	haad-dm-base:1.920
	wrstuden-revivesa-base-1:1.901
	simonb-wapbl-nbase:1.901
	yamt-pf42-base4:1.901
	simonb-wapbl:1.900.0.2
	simonb-wapbl-base:1.901
	yamt-pf42-base3:1.900
	hpcarm-cleanup-nbase:1.896
	yamt-pf42-baseX:1.889
	yamt-pf42-base2:1.895
	yamt-nfs-mp-base2:1.895
	wrstuden-revivesa:1.894.0.2
	wrstuden-revivesa-base:1.901
	yamt-nfs-mp:1.890.0.2
	yamt-nfs-mp-base:1.890
	yamt-pf42:1.889.0.2
	yamt-pf42-base:1.889
	ad-socklock-base1:1.884
	yamt-lazymbuf-base15:1.884
	yamt-lazymbuf-base14:1.884
	keiichi-mipv6-nbase:1.884
	mjf-devfs2:1.881.0.6
	mjf-devfs2-base:1.922
	nick-net80211-sync:1.881.0.4
	nick-net80211-sync-base:1.881
	keiichi-mipv6:1.881.0.2
	keiichi-mipv6-base:1.884
	bouyer-xeni386-merge1:1.867.2.3
	matt-armv6-prevmlocking:1.844.2.1
	wrstuden-fixsa-base-1:1.799.2.15
	vmlocking2-base3:1.871
	netbsd-4-0:1.799.2.15.0.2
	netbsd-4-0-RELEASE:1.799.2.15
	bouyer-xeni386-nbase:1.880
	yamt-kmem-base3:1.867
	cube-autoconf:1.867.0.4
	cube-autoconf-base:1.867
	yamt-kmem-base2:1.867
	bouyer-xeni386:1.867.0.2
	bouyer-xeni386-base:1.879
	yamt-kmem:1.866.0.2
	yamt-kmem-base:1.866
	vmlocking2-base2:1.866
	reinoud-bufcleanup-nbase:1.866
	vmlocking2:1.864.0.2
	vmlocking2-base1:1.864
	netbsd-4-0-RC5:1.799.2.15
	matt-nb4-arm:1.799.2.14.0.2
	matt-nb4-arm-base:1.799.2.14
	matt-armv6-nbase:1.884
	jmcneill-base:1.859
	netbsd-4-0-RC4:1.799.2.14
	mjf-devfs:1.859.0.2
	mjf-devfs-base:1.881
	bouyer-xenamd64-base2:1.862
	vmlocking-nbase:1.864
	yamt-x86pmap-base4:1.853
	bouyer-xenamd64:1.852.0.2
	bouyer-xenamd64-base:1.863
	netbsd-4-0-RC3:1.799.2.14
	yamt-x86pmap-base3:1.852
	yamt-x86pmap-base2:1.852
	netbsd-4-0-RC2:1.799.2.14
	yamt-x86pmap:1.851.0.2
	yamt-x86pmap-base:1.851
	netbsd-4-0-RC1:1.799.2.13
	matt-armv6:1.844.0.2
	matt-armv6-base:1.877
	jmcneill-pm:1.839.0.4
	jmcneill-pm-base:1.866
	hpcarm-cleanup:1.839.0.2
	hpcarm-cleanup-base:1.881
	nick-csl-alignment:1.838.0.4
	nick-csl-alignment-base:1.838
	matt-mips64:1.838.0.2
	matt-mips64-base:1.840
	netbsd-3-1-1-RELEASE:1.661.2.14
	netbsd-3-0-3-RELEASE:1.661.2.8
	yamt-idlelwp-base8:1.827
	wrstuden-fixsa:1.799.2.7.0.2
	wrstuden-fixsa-base:1.799.2.17
	ppcoea-renovation:1.824.0.2
	ppcoea-renovation-base:1.852
	thorpej-atomic:1.822.0.2
	thorpej-atomic-base:1.822
	reinoud-bufcleanup:1.819.0.2
	reinoud-bufcleanup-base:1.866
	mjf-ufs-trans:1.816.0.4
	mjf-ufs-trans-base:1.837
	vmlocking:1.816.0.2
	vmlocking-base:1.852
	ad-audiomp:1.809.0.2
	ad-audiomp-base:1.809
	yamt-idlelwp:1.808.0.2
	post-newlock2-merge:1.807
	newlock2-nbase:1.806
	yamt-splraiseipl-base5:1.803
	yamt-splraiseipl-base4:1.803
	yamt-splraiseipl-base3:1.800
	abandoned-netbsd-4-base:1.772
	abandoned-netbsd-4:1.772.0.2
	netbsd-3-1:1.661.2.14.0.2
	netbsd-3-1-RELEASE:1.661.2.14
	netbsd-3-0-2-RELEASE:1.661.2.8
	yamt-splraiseipl-base2:1.788
	netbsd-3-1-RC4:1.661.2.14
	yamt-splraiseipl:1.781.0.2
	yamt-splraiseipl-base:1.781
	netbsd-3-1-RC3:1.661.2.14
	yamt-pdpolicy-base9:1.781
	newlock2:1.779.0.2
	newlock2-base:1.806
	yamt-pdpolicy-base8:1.778
	netbsd-3-1-RC2:1.661.2.14
	netbsd-3-1-RC1:1.661.2.14
	yamt-pdpolicy-base7:1.772
	netbsd-4:1.799.0.2
	netbsd-4-base:1.799
	yamt-pdpolicy-base6:1.758
	chap-midi-nbase:1.758
	netbsd-3-0-1-RELEASE:1.661.2.8
	gdamore-uart:1.755.0.2
	gdamore-uart-base:1.755
	simonb-timcounters-final:1.723.2.3
	yamt-pdpolicy-base5:1.752
	chap-midi:1.752.0.2
	chap-midi-base:1.758
	yamt-pdpolicy-base4:1.740
	yamt-pdpolicy-base3:1.738
	peter-altq-base:1.733
	peter-altq:1.733.0.2
	yamt-pdpolicy-base2:1.733
	elad-kernelauth-base:1.750
	elad-kernelauth:1.732.0.2
	yamt-pdpolicy:1.731.0.2
	yamt-pdpolicy-base:1.731
	yamt-uio_vmspace-base5:1.731
	simonb-timecounters:1.723.0.2
	simonb-timecounters-base:1.753
	rpaulo-netinet-merge-pcb:1.721.0.2
	rpaulo-netinet-merge-pcb-base:1.779
	yamt-uio_vmspace:1.714.0.2
	netbsd-3-0:1.661.2.8.0.2
	netbsd-3-0-RELEASE:1.661.2.8
	netbsd-3-0-RC6:1.661.2.8
	yamt-readahead-base3:1.709
	netbsd-3-0-RC5:1.661.2.8
	netbsd-3-0-RC4:1.661.2.8
	netbsd-3-0-RC3:1.661.2.8
	yamt-readahead-base2:1.706
	netbsd-3-0-RC2:1.661.2.8
	yamt-readahead-pervnode:1.706
	yamt-readahead-perfile:1.706
	yamt-readahead:1.706.0.6
	yamt-readahead-base:1.706
	netbsd-3-0-RC1:1.661.2.8
	yamt-vop-base3:1.706
	netbsd-2-0-3-RELEASE:1.595.2.11
	netbsd-2-1:1.595.2.11.2.2.0.2
	yamt-vop-base2:1.706
	thorpej-vnode-attr:1.706.0.4
	thorpej-vnode-attr-base:1.706
	netbsd-2-1-RELEASE:1.595.2.11.2.2
	yamt-vop:1.706.0.2
	yamt-vop-base:1.706
	netbsd-2-1-RC6:1.595.2.11.2.2
	netbsd-2-1-RC5:1.595.2.11.2.2
	netbsd-2-1-RC4:1.595.2.11.2.2
	netbsd-2-1-RC3:1.595.2.11.2.2
	netbsd-2-1-RC2:1.595.2.11.2.2
	netbsd-2-1-RC1:1.595.2.11.2.2
	yamt-lazymbuf:1.683.0.2
	yamt-km-base4:1.663
	netbsd-2-0-2-RELEASE:1.595.2.11
	yamt-km-base3:1.661
	netbsd-3:1.661.0.2
	netbsd-3-base:1.661
	yamt-km-base2:1.656
	yamt-km:1.652.0.2
	yamt-km-base:1.652
	kent-audio2:1.649.0.2
	kent-audio2-base:1.668
	netbsd-2-0-1-RELEASE:1.595.2.11
	kent-audio1-beforemerge:1.647
	netbsd-2:1.595.2.11.0.2
	netbsd-2-base:1.595.2.11
	kent-audio1:1.646.0.2
	kent-audio1-base:1.646
	netbsd-2-0-RELEASE:1.595.2.11
	netbsd-2-0-RC5:1.595.2.11
	netbsd-2-0-RC4:1.595.2.11
	netbsd-2-0-RC3:1.595.2.11
	netbsd-2-0-RC2:1.595.2.11
	netbsd-2-0-RC1:1.595.2.11
	netbsd-2-0:1.595.0.2
	netbsd-2-0-base:1.595
	netbsd-1-6-PATCH002-RELEASE:1.491.4.6
	netbsd-1-6-PATCH002:1.491.4.6
	netbsd-1-6-PATCH002-RC4:1.491.4.6
	netbsd-1-6-PATCH002-RC3:1.491.4.6
	netbsd-1-6-PATCH002-RC2:1.491.4.6
	netbsd-1-6-PATCH002-RC1:1.491.4.6
	ktrace-lwp:1.564.0.2
	ktrace-lwp-base:1.713
	netbsd-1-6-PATCH001:1.491.4.4
	netbsd-1-6-PATCH001-RELEASE:1.491.4.4
	netbsd-1-6-PATCH001-RC3:1.491.4.4
	netbsd-1-6-PATCH001-RC2:1.491.4.4
	netbsd-1-6-PATCH001-RC1:1.491.4.4
	nathanw_sa_end:1.400.2.24
	nathanw_sa_before_merge:1.540
	fvdl_fs64_base:1.534
	gmcgarry_ctxsw:1.532.0.4
	gmcgarry_ctxsw_base:1.532
	gmcgarry_ucred:1.532.0.2
	gmcgarry_ucred_base:1.532
	nathanw_sa_base:1.540
	kqueue-aftermerge:1.519
	kqueue-beforemerge:1.519
	netbsd-1-6-RELEASE:1.491.4.2
	netbsd-1-6-RC3:1.491.4.2
	netbsd-1-6-RC2:1.491.4.2
	netbsd-1-6-RC1:1.491.4.2
	i386mp_plus16_stable:1.300.2.29
	netbsd-1-6:1.491.0.4
	netbsd-1-6-base:1.491
	gehenna-devsw:1.491.0.2
	gehenna-devsw-base:1.507
	netbsd-1-5-PATCH003:1.354.2.19
	eeh-devprop:1.475.0.2
	eeh-devprop-base:1.475
	newlock:1.474.0.2
	newlock-base:1.474
	ifpoll-base:1.473
	thorpej-mips-cache:1.432.0.2
	thorpej-mips-cache-base:1.435
	thorpej-devvp-base3:1.430
	thorpej-devvp-base2:1.429
	post-chs-ubcperf:1.426
	pre-chs-ubcperf:1.426
	thorpej-devvp:1.422.0.2
	thorpej-devvp-base:1.422
	netbsd-1-5-PATCH002:1.354.2.15
	kqueue:1.410.0.2
	kqueue-base:1.513
	netbsd-1-5-PATCH001:1.354.2.15
	thorpej_scsipi_beforemerge:1.403
	nathanw_sa:1.400.0.2
	thorpej_scsipi_nbase:1.403
	sommerfeld_i386mpnext:1.507
	netbsd-1-5-RELEASE:1.354.2.8
	netbsd-1-5-BETA2:1.354.2.8
	netbsd-1-5-BETA:1.354.2.8
	netbsd-1-4-PATCH003:1.231.2.12
	netbsd-1-5-ALPHA2:1.354.2.6
	sommerfeld_i386mp_houseclean:1.355
	netbsd-1-5:1.354.0.2
	netbsd-1-5-base:1.354
	minoura-xpg4dl:1.342.0.2
	minoura-xpg4dl-base:1.342
	sommerfeld_i386mpbase_20000422:1.328
	netbsd-1-4-PATCH002:1.231.2.8
	sommerfeld_i386mp_1:1.300.0.2
	sommerfeld_i386mpbase_1:1.507
	chs-ubc2-newbase:1.299
	wrstuden-devbsize-19991221:1.283
	wrstuden-devbsize:1.260.0.2
	wrstuden-devbsize-base:1.283
	kame_141_19991130:1.231.2.1.4.1
	comdex-fall-1999:1.271.0.2
	comdex-fall-1999-base:1.271
	fvdl-softdep:1.264.0.4
	fvdl-softdep-base:1.275
	thorpej_scsipi:1.264.0.2
	thorpej_scsipi_base:1.403
	netbsd-1-4-PATCH001:1.231.2.2
	kame_14_19990705:1.231.2.1
	kame_14_19990628:1.231.2.1
	kame:1.231.2.1.0.4
	chs-ubc2:1.231.2.1.0.2
	chs-ubc2-base:1.249
	netbsd-1-4-RELEASE:1.231.2.1
	netbsd-1-4:1.231.0.2
	netbsd-1-4-base:1.231
	netbsd-1-3-PATCH003:1.114.2.11
	netbsd-1-3-PATCH003-CANDIDATE2:1.114.2.11
	kenh-if-detach:1.207.0.2
	kenh-if-detach-base:1.207
	netbsd-1-3-PATCH003-CANDIDATE1:1.114.2.11
	netbsd-1-3-PATCH003-CANDIDATE0:1.114.2.11
	chs-ubc:1.201.0.2
	chs-ubc-base:1.201
	bouyer-ide-merge:1.152.2.14
	eeh-paddr_t:1.169.0.2
	eeh-paddr_t-base:1.169
	bouyer-ide-last-dist:1.219
	bouyer-ide:1.152.0.2
	bouyer-ide-base:1.188
	netbsd-1-3-PATCH002:1.114.2.10
	netbsd-1-3-PATCH001:1.114.2.9
	netbsd-1-3-RELEASE:1.114.2.8
	netbsd-1-3-BETA:1.114.2.8
	netbsd-1-3:1.114.0.2
	netbsd-1-3-base:1.114
	thorpej-signal:1.98.0.2
	thorpej-signal-base:1.98
	marc-pcmcia:1.86.0.2
	marc-pcmcia-bp:1.86
	marc-pcmcia-base:1.104
	bouyer-scsipi:1.82.0.2
	is-newarp-before-merge:1.72
	is-newarp:1.71.0.4
	is-newarp-base:1.71
	netbsd-1-2-PATCH001:1.48.2.1
	mrg-vm-swap:1.71.0.2
	thorpej-setroot:1.66.0.2
	netbsd-1-2-RELEASE:1.48.2.1
	netbsd-1-2-BETA:1.48
	netbsd-1-2:1.48.0.2
	netbsd-1-2-base:1.48
	netbsd-1-1-PATCH001:1.23.2.1
	netbsd-1-1-RELEASE:1.23.2.1
	netbsd-1-1:1.23.0.2
	netbsd-1-1-base:1.23;
locks; strict;
comment	@# @;


1.1262
date	2026.02.20.07.54.26;	author yamt;	state Exp;
branches;
next	1.1261;
commitid	FTyHYcb9eFcox5vG;

1.1261
date	2025.10.06.12.27.52;	author riastradh;	state Exp;
branches;
next	1.1260;
commitid	BQe12RFGPi3atvdG;

1.1260
date	2025.03.27.12.22.59;	author riastradh;	state Exp;
branches
	1.1260.2.1;
next	1.1259;
commitid	0oWNJQWyki57EHOF;

1.1259
date	2025.03.27.12.22.44;	author riastradh;	state Exp;
branches;
next	1.1258;
commitid	E7rF9ahYVUe0EHOF;

1.1258
date	2024.08.27.00.56.16;	author riastradh;	state Exp;
branches;
next	1.1257;
commitid	Gl1nzFEJYuv1FonF;

1.1257
date	2024.07.16.12.01.19;	author riastradh;	state Exp;
branches;
next	1.1256;
commitid	X0tqcGme39NRG3iF;

1.1256
date	2024.04.30.19.35.28;	author andvar;	state Exp;
branches
	1.1256.2.1;
next	1.1255;
commitid	JxkXqyrc9P1uFc8F;

1.1255
date	2024.04.21.14.11.12;	author riastradh;	state Exp;
branches;
next	1.1254;
commitid	ed9sIrI6rGrOa17F;

1.1254
date	2024.04.02.22.56.50;	author charlotte;	state Exp;
branches;
next	1.1253;
commitid	ZqbCk849gv0MGC4F;

1.1253
date	2024.01.29.18.27.13;	author christos;	state Exp;
branches;
next	1.1252;
commitid	KXsF1U1D4DhafnWE;

1.1252
date	2023.10.23.01.43.55;	author msaitoh;	state Exp;
branches;
next	1.1251;
commitid	2qzQTbPx36r1RGJE;

1.1251
date	2023.10.20.10.09.44;	author msaitoh;	state Exp;
branches;
next	1.1250;
commitid	AkxQOBHIKVD9KlJE;

1.1250
date	2023.07.16.10.20.07;	author riastradh;	state Exp;
branches;
next	1.1249;
commitid	IPK8K6zv4UPwT0xE;

1.1249
date	2023.07.16.05.24.08;	author mrg;	state Exp;
branches;
next	1.1248;
commitid	7oxnmGl6tDkTeZwE;

1.1248
date	2023.07.15.22.14.39;	author riastradh;	state Exp;
branches;
next	1.1247;
commitid	cuEqPju0VWoGSWwE;

1.1247
date	2023.05.22.16.28.34;	author riastradh;	state Exp;
branches;
next	1.1246;
commitid	nnjm9MkZQARzHYpE;

1.1246
date	2023.02.09.14.09.48;	author abs;	state Exp;
branches;
next	1.1245;
commitid	TaTOPEdyZJGxcRcE;

1.1245
date	2023.02.09.13.16.04;	author abs;	state Exp;
branches;
next	1.1244;
commitid	qP89sauSPTE1UQcE;

1.1244
date	2022.12.22.19.07.16;	author jakllsch;	state Exp;
branches;
next	1.1243;
commitid	FItDqij4fr8OqA6E;

1.1243
date	2022.12.11.04.20.52;	author tsutsui;	state Exp;
branches
	1.1243.2.1;
next	1.1242;
commitid	VlgckKGI72JsS55E;

1.1242
date	2022.09.29.10.10.07;	author riastradh;	state Exp;
branches;
next	1.1241;
commitid	I1zvTyF77D5Z9KVD;

1.1241
date	2022.09.24.11.05.17;	author riastradh;	state Exp;
branches;
next	1.1240;
commitid	S7eum8FwSaMWC6VD;

1.1240
date	2022.08.07.02.52.26;	author simonb;	state Exp;
branches;
next	1.1239;
commitid	HXKRRXLciPDtrTOD;

1.1239
date	2022.07.28.21.52.36;	author riastradh;	state Exp;
branches;
next	1.1238;
commitid	16sxox4MmweD4IND;

1.1238
date	2022.04.16.11.57.46;	author nia;	state Exp;
branches;
next	1.1237;
commitid	ovXcFBuzKoqs5qAD;

1.1237
date	2021.05.17.04.07.43;	author yamaguchi;	state Exp;
branches;
next	1.1236;
commitid	LUAdAXaqAviCdsTC;

1.1236
date	2021.03.10.06.38.44;	author msaitoh;	state Exp;
branches
	1.1236.4.1
	1.1236.6.1;
next	1.1235;
commitid	9La1YTZOOiMvfJKC;

1.1235
date	2021.03.01.18.12.58;	author jakllsch;	state Exp;
branches;
next	1.1234;
commitid	MqI36ftos3qDnDJC;

1.1234
date	2021.01.20.13.22.08;	author nia;	state Exp;
branches;
next	1.1233;
commitid	LKsGTwQrjG393tEC;

1.1233
date	2020.09.27.13.48.51;	author roy;	state Exp;
branches
	1.1233.2.1;
next	1.1232;
commitid	DA9l8f9bbF8ATGpC;

1.1232
date	2020.09.08.10.05.47;	author yamaguchi;	state Exp;
branches;
next	1.1231;
commitid	Z6mxZGOOAajjgenC;

1.1231
date	2020.08.16.10.27.47;	author jdolecek;	state Exp;
branches;
next	1.1230;
commitid	hiElzZTPZjJX4hkC;

1.1230
date	2020.08.01.08.20.49;	author maxv;	state Exp;
branches;
next	1.1229;
commitid	JD2lavAMv7TQUkiC;

1.1229
date	2020.04.25.16.10.06;	author bouyer;	state Exp;
branches;
next	1.1228;
commitid	OzKWdRYlG704FM5C;

1.1228
date	2020.04.25.15.26.16;	author bouyer;	state Exp;
branches;
next	1.1227;
commitid	OlHyMKBWmojOpM5C;

1.1227
date	2020.03.28.08.35.36;	author isaki;	state Exp;
branches
	1.1227.2.1;
next	1.1226;
commitid	fULttaXt8dDZ292C;

1.1226
date	2020.03.16.19.09.34;	author nia;	state Exp;
branches;
next	1.1225;
commitid	Gcx1wniPUDe9WE0C;

1.1225
date	2020.02.17.06.32.46;	author nisimura;	state Exp;
branches;
next	1.1224;
commitid	g17LoYezSsAJEZWB;

1.1224
date	2020.02.09.16.06.18;	author jmcneill;	state Exp;
branches;
next	1.1223;
commitid	kmkV38IGpz8a51WB;

1.1223
date	2020.01.25.18.38.36;	author thorpej;	state Exp;
branches;
next	1.1222;
commitid	tj4Na2mKUyyoo6UB;

1.1222
date	2020.01.20.18.38.20;	author thorpej;	state Exp;
branches;
next	1.1221;
commitid	5IWAFx2BxNcmzsTB;

1.1221
date	2020.01.19.20.00.37;	author thorpej;	state Exp;
branches;
next	1.1220;
commitid	rF5k3OKpMKbg3lTB;

1.1220
date	2020.01.19.06.55.23;	author thorpej;	state Exp;
branches;
next	1.1219;
commitid	ApJpO8xRmIkOHgTB;

1.1219
date	2020.01.19.01.25.05;	author thorpej;	state Exp;
branches;
next	1.1218;
commitid	JHEWDzmAWJGESeTB;

1.1218
date	2020.01.01.10.36.43;	author ryo;	state Exp;
branches
	1.1218.2.1;
next	1.1217;
commitid	5ZXVYnvDLoV5wYQB;

1.1217
date	2019.12.10.12.08.52;	author yamaguchi;	state Exp;
branches;
next	1.1216;
commitid	IiAB0Y0oyPxNI9OB;

1.1216
date	2019.12.05.22.05.05;	author sevan;	state Exp;
branches;
next	1.1215;
commitid	g5QnjO4qwnLubzNB;

1.1215
date	2019.11.01.02.53.23;	author msaitoh;	state Exp;
branches;
next	1.1214;
commitid	z3DgThViVNDsU5JB;

1.1214
date	2019.10.30.12.06.25;	author msaitoh;	state Exp;
branches;
next	1.1213;
commitid	w4CAPAJmMYNg2TIB;

1.1213
date	2019.10.25.17.39.57;	author martin;	state Exp;
branches;
next	1.1212;
commitid	oELmMEIfGThL1hIB;

1.1212
date	2019.10.08.18.50.44;	author maxv;	state Exp;
branches;
next	1.1211;
commitid	rJ7YsaaWWLTNY5GB;

1.1211
date	2019.10.07.11.53.40;	author msaitoh;	state Exp;
branches;
next	1.1210;
commitid	fjwxNVsNeLNiHVFB;

1.1210
date	2019.08.09.08.01.06;	author rin;	state Exp;
branches;
next	1.1209;
commitid	4ZPzzMNowze6jkyB;

1.1209
date	2019.08.08.04.25.21;	author msaitoh;	state Exp;
branches;
next	1.1208;
commitid	zeer2vyb19RA9byB;

1.1208
date	2019.06.17.19.01.17;	author kamil;	state Exp;
branches
	1.1208.2.1;
next	1.1207;
commitid	incwttBTLTyAFzrB;

1.1207
date	2019.05.24.14.28.48;	author nonaka;	state Exp;
branches;
next	1.1206;
commitid	7S0bLVts2AFvVsoB;

1.1206
date	2019.05.06.02.24.37;	author sevan;	state Exp;
branches;
next	1.1205;
commitid	VuKyVRXHiS57v5mB;

1.1205
date	2019.04.26.21.40.30;	author sevan;	state Exp;
branches;
next	1.1204;
commitid	6ehTybiQEayJbUkB;

1.1204
date	2019.03.01.12.23.10;	author nonaka;	state Exp;
branches;
next	1.1203;
commitid	ePbxjX4U5l3eWEdB;

1.1203
date	2019.03.01.08.17.51;	author nonaka;	state Exp;
branches;
next	1.1202;
commitid	lyScuGwOErp4ADdB;

1.1202
date	2019.02.23.12.28.22;	author kamil;	state Exp;
branches;
next	1.1201;
commitid	ayNavJxLc0uR9TcB;

1.1201
date	2019.02.15.08.54.01;	author nonaka;	state Exp;
branches;
next	1.1200;
commitid	4qts6hJjAtkkeQbB;

1.1200
date	2019.01.27.08.53.30;	author maxv;	state Exp;
branches;
next	1.1199;
commitid	dcnHy31pQBhTPo9B;

1.1199
date	2018.12.25.11.56.14;	author mlelstv;	state Exp;
branches;
next	1.1198;
commitid	B7hyyTWT0huqUa5B;

1.1198
date	2018.12.14.22.00.26;	author jakllsch;	state Exp;
branches;
next	1.1197;
commitid	AcqdooLftaLUBO3B;

1.1197
date	2018.12.12.06.29.37;	author maxv;	state Exp;
branches;
next	1.1196;
commitid	PxGW3xqP3gjowt3B;

1.1196
date	2018.12.11.16.52.49;	author maya;	state Exp;
branches;
next	1.1195;
commitid	b7UFUfarVmOk0p3B;

1.1195
date	2018.12.11.11.00.18;	author maya;	state Exp;
branches;
next	1.1194;
commitid	ddjEQPfssQSn3n3B;

1.1194
date	2018.11.24.18.23.29;	author bouyer;	state Exp;
branches;
next	1.1193;
commitid	Bq8nIKtxJIxC0e1B;

1.1193
date	2018.11.01.13.11.11;	author martin;	state Exp;
branches;
next	1.1192;
commitid	UmRQkIWIMII34fYA;

1.1192
date	2018.09.06.05.36.50;	author maxv;	state Exp;
branches;
next	1.1191;
commitid	rBzGO4OZzHoBl0RA;

1.1191
date	2018.08.25.07.48.56;	author maxv;	state Exp;
branches;
next	1.1190;
commitid	E7ZteV4nC1yOrtPA;

1.1190
date	2018.08.14.06.37.59;	author maxv;	state Exp;
branches;
next	1.1189;
commitid	EUm5VY1BX91qq3OA;

1.1189
date	2018.08.14.06.04.24;	author maxv;	state Exp;
branches;
next	1.1188;
commitid	d4SVkxyAtnO3f3OA;

1.1188
date	2018.08.13.18.48.53;	author mrg;	state Exp;
branches;
next	1.1187;
commitid	L7iNUMWsIVH3vZNA;

1.1187
date	2018.08.12.17.59.21;	author sevan;	state Exp;
branches;
next	1.1186;
commitid	1iJBJY9YloEPfRNA;

1.1186
date	2018.08.10.17.54.46;	author sevan;	state Exp;
branches;
next	1.1185;
commitid	caJ9mZR3sRBmhBNA;

1.1185
date	2018.08.01.16.59.09;	author maxv;	state Exp;
branches;
next	1.1184;
commitid	wcq6HF0PkS1xhrMA;

1.1184
date	2018.07.31.16.44.29;	author khorben;	state Exp;
branches;
next	1.1183;
commitid	j8hxvmmx4SXWbjMA;

1.1183
date	2018.07.13.09.37.32;	author maxv;	state Exp;
branches;
next	1.1182;
commitid	vq6y5MnhhrfLrXJA;

1.1182
date	2018.07.10.19.58.13;	author maya;	state Exp;
branches;
next	1.1181;
commitid	puCMyY9BPzFQYCJA;

1.1181
date	2018.07.10.17.01.43;	author maya;	state Exp;
branches;
next	1.1180;
commitid	VSDg9oaJ3y0LZBJA;

1.1180
date	2018.06.07.13.36.29;	author thorpej;	state Exp;
branches
	1.1180.2.1;
next	1.1179;
commitid	e9pnxag05qUvVlFA;

1.1179
date	2018.05.22.08.15.26;	author maxv;	state Exp;
branches;
next	1.1178;
commitid	MSl4tYZjyjriFgDA;

1.1178
date	2018.05.15.01.53.27;	author thorpej;	state Exp;
branches;
next	1.1177;
commitid	5jFdBNmXATRkKkCA;

1.1177
date	2018.04.08.00.52.38;	author mrg;	state Exp;
branches;
next	1.1176;
commitid	91M9fdMlaP55DzxA;

1.1176
date	2018.04.07.19.39.19;	author mrg;	state Exp;
branches;
next	1.1175;
commitid	R0WBcNhnSxHATxxA;

1.1175
date	2018.04.07.19.38.06;	author mrg;	state Exp;
branches;
next	1.1174;
commitid	fo5PW4JGs6a0TxxA;

1.1174
date	2017.12.10.17.19.48;	author bouyer;	state Exp;
branches
	1.1174.2.1;
next	1.1173;
commitid	vAefLBR6OXIVUmiA;

1.1173
date	2017.12.09.00.29.33;	author riastradh;	state Exp;
branches;
next	1.1172;
commitid	3oxUknzWKMBfm9iA;

1.1172
date	2017.11.30.11.56.45;	author jmcneill;	state Exp;
branches;
next	1.1171;
commitid	OZjNQxZXO709s3hA;

1.1171
date	2017.11.29.16.10.01;	author martin;	state Exp;
branches;
next	1.1170;
commitid	NROsclxGyqrWSWgA;

1.1170
date	2017.11.06.02.57.18;	author rin;	state Exp;
branches;
next	1.1169;
commitid	XoQ4fDJbap0ueVdA;

1.1169
date	2017.10.23.08.08.53;	author skrll;	state Exp;
branches;
next	1.1168;
commitid	It6WuzgS4Udwp9cA;

1.1168
date	2017.09.14.07.58.41;	author mrg;	state Exp;
branches;
next	1.1167;
commitid	ngZ6fHXwTqlZA87A;

1.1167
date	2017.09.13.22.24.44;	author sevan;	state Exp;
branches;
next	1.1166;
commitid	U9QcH0HsUyAtp57A;

1.1166
date	2017.08.13.08.48.30;	author christos;	state Exp;
branches;
next	1.1165;

1.1165
date	2017.08.12.06.46.13;	author maxv;	state Exp;
branches;
next	1.1164;

1.1164
date	2017.08.09.18.45.30;	author maxv;	state Exp;
branches;
next	1.1163;

1.1163
date	2017.08.04.09.30.19;	author maxv;	state Exp;
branches;
next	1.1162;

1.1162
date	2017.07.31.15.43.33;	author maxv;	state Exp;
branches;
next	1.1161;

1.1161
date	2017.07.29.18.08.58;	author maxv;	state Exp;
branches;
next	1.1160;

1.1160
date	2017.07.29.12.00.56;	author maxv;	state Exp;
branches;
next	1.1159;

1.1159
date	2017.07.28.14.13.13;	author maxv;	state Exp;
branches;
next	1.1158;

1.1158
date	2017.07.28.13.59.07;	author maxv;	state Exp;
branches;
next	1.1157;

1.1157
date	2017.07.12.17.40.34;	author maxv;	state Exp;
branches;
next	1.1156;

1.1156
date	2017.05.27.22.53.29;	author bouyer;	state Exp;
branches
	1.1156.2.1;
next	1.1155;

1.1155
date	2017.05.24.20.23.04;	author christos;	state Exp;
branches;
next	1.1154;

1.1154
date	2017.04.18.19.09.12;	author riastradh;	state Exp;
branches;
next	1.1153;

1.1153
date	2017.04.17.08.59.37;	author riastradh;	state Exp;
branches;
next	1.1152;

1.1152
date	2017.02.26.12.41.50;	author rin;	state Exp;
branches;
next	1.1151;

1.1151
date	2017.02.26.12.21.15;	author maya;	state Exp;
branches;
next	1.1150;

1.1150
date	2017.02.26.12.03.14;	author rin;	state Exp;
branches;
next	1.1149;

1.1149
date	2017.02.19.07.47.00;	author rin;	state Exp;
branches;
next	1.1148;

1.1148
date	2017.02.18.14.36.32;	author maxv;	state Exp;
branches;
next	1.1147;

1.1147
date	2017.02.17.12.10.40;	author maxv;	state Exp;
branches;
next	1.1146;

1.1146
date	2017.01.12.05.24.36;	author ryo;	state Exp;
branches
	1.1146.2.1;
next	1.1145;

1.1145
date	2016.12.13.20.42.18;	author christos;	state Exp;
branches;
next	1.1144;

1.1144
date	2016.12.10.23.03.24;	author christos;	state Exp;
branches;
next	1.1143;

1.1143
date	2016.12.09.02.24.17;	author christos;	state Exp;
branches;
next	1.1142;

1.1142
date	2016.12.08.11.31.10;	author nat;	state Exp;
branches;
next	1.1141;

1.1141
date	2016.11.26.13.59.45;	author christos;	state Exp;
branches;
next	1.1140;

1.1140
date	2016.09.17.18.37.46;	author jdolecek;	state Exp;
branches;
next	1.1139;

1.1139
date	2016.08.07.10.44.05;	author christos;	state Exp;
branches;
next	1.1138;

1.1138
date	2016.07.27.07.04.56;	author msaitoh;	state Exp;
branches;
next	1.1137;

1.1137
date	2016.06.21.11.37.25;	author nonaka;	state Exp;
branches
	1.1137.2.1;
next	1.1136;

1.1136
date	2016.05.20.01.37.47;	author christos;	state Exp;
branches;
next	1.1135;

1.1135
date	2016.04.23.10.15.29;	author skrll;	state Exp;
branches;
next	1.1134;

1.1134
date	2016.04.13.15.26.27;	author riastradh;	state Exp;
branches;
next	1.1133;

1.1133
date	2016.03.19.23.21.02;	author gdt;	state Exp;
branches;
next	1.1132;

1.1132
date	2016.03.05.17.08.48;	author riastradh;	state Exp;
branches;
next	1.1131;

1.1131
date	2016.02.13.19.53.23;	author riastradh;	state Exp;
branches;
next	1.1130;

1.1130
date	2016.01.22.21.56.56;	author riz;	state Exp;
branches;
next	1.1129;

1.1129
date	2016.01.05.11.33.18;	author msaitoh;	state Exp;
branches;
next	1.1128;

1.1128
date	2015.09.26.11.16.12;	author maxv;	state Exp;
branches;
next	1.1127;

1.1127
date	2015.09.21.12.32.06;	author nonaka;	state Exp;
branches;
next	1.1126;

1.1126
date	2015.08.27.14.04.07;	author nonaka;	state Exp;
branches;
next	1.1125;

1.1125
date	2015.05.23.18.13.31;	author maxv;	state Exp;
branches;
next	1.1124;

1.1124
date	2015.05.04.07.08.10;	author pgoyette;	state Exp;
branches;
next	1.1123;

1.1123
date	2015.05.03.02.52.50;	author pgoyette;	state Exp;
branches;
next	1.1122;

1.1122
date	2015.04.29.17.43.06;	author riastradh;	state Exp;
branches;
next	1.1121;

1.1121
date	2015.03.18.02.05.05;	author snj;	state Exp;
branches;
next	1.1120;

1.1120
date	2015.03.07.07.28.37;	author mrg;	state Exp;
branches;
next	1.1119;

1.1119
date	2015.02.13.18.57.47;	author nonaka;	state Exp;
branches;
next	1.1118;

1.1118
date	2014.11.16.16.01.41;	author manu;	state Exp;
branches
	1.1118.2.1;
next	1.1117;

1.1117
date	2014.11.12.10.47.22;	author manu;	state Exp;
branches;
next	1.1116;

1.1116
date	2014.11.02.23.14.20;	author christos;	state Exp;
branches;
next	1.1115;

1.1115
date	2014.10.18.16.56.51;	author uebayasi;	state Exp;
branches;
next	1.1114;

1.1114
date	2014.09.19.17.30.03;	author christos;	state Exp;
branches;
next	1.1113;

1.1113
date	2014.09.19.15.24.24;	author christos;	state Exp;
branches;
next	1.1112;

1.1112
date	2014.09.18.14.58.21;	author wiz;	state Exp;
branches;
next	1.1111;

1.1111
date	2014.08.24.07.59.22;	author jnemeth;	state Exp;
branches;
next	1.1110;

1.1110
date	2014.08.23.20.26.58;	author dholland;	state Exp;
branches;
next	1.1109;

1.1109
date	2014.08.18.06.31.24;	author christos;	state Exp;
branches;
next	1.1108;

1.1108
date	2014.08.16.17.56.32;	author apb;	state Exp;
branches;
next	1.1107;

1.1107
date	2014.07.25.15.01.14;	author dholland;	state Exp;
branches
	1.1107.2.1;
next	1.1106;

1.1106
date	2014.06.16.19.08.17;	author dsl;	state Exp;
branches;
next	1.1105;

1.1105
date	2014.06.10.01.42.39;	author hikaru;	state Exp;
branches;
next	1.1104;

1.1104
date	2014.05.29.14.48.40;	author christos;	state Exp;
branches;
next	1.1103;

1.1103
date	2014.04.21.16.35.38;	author chs;	state Exp;
branches;
next	1.1102;

1.1102
date	2014.04.08.19.40.57;	author christos;	state Exp;
branches;
next	1.1101;

1.1101
date	2014.03.24.14.15.38;	author szptvlfn;	state Exp;
branches
	1.1101.2.1;
next	1.1100;

1.1100
date	2014.03.19.15.26.42;	author nonaka;	state Exp;
branches;
next	1.1099;

1.1099
date	2014.01.26.19.16.16;	author dsl;	state Exp;
branches;
next	1.1098;

1.1098
date	2013.10.26.09.16.20;	author nonaka;	state Exp;
branches;
next	1.1097;

1.1097
date	2013.10.23.17.26.08;	author matt;	state Exp;
branches;
next	1.1096;

1.1096
date	2013.06.30.21.38.57;	author rmind;	state Exp;
branches;
next	1.1095;

1.1095
date	2013.06.10.07.14.01;	author kardel;	state Exp;
branches
	1.1095.2.1;
next	1.1094;

1.1094
date	2013.06.05.23.08.01;	author christos;	state Exp;
branches;
next	1.1093;

1.1093
date	2013.05.28.12.13.55;	author kiyohara;	state Exp;
branches;
next	1.1092;

1.1092
date	2013.04.27.22.21.14;	author christos;	state Exp;
branches;
next	1.1091;

1.1091
date	2013.04.27.21.43.29;	author christos;	state Exp;
branches;
next	1.1090;

1.1090
date	2013.04.27.18.19.38;	author christos;	state Exp;
branches;
next	1.1089;

1.1089
date	2013.04.06.16.59.59;	author martin;	state Exp;
branches;
next	1.1088;

1.1088
date	2013.03.02.02.42.15;	author christos;	state Exp;
branches;
next	1.1087;

1.1087
date	2013.03.01.18.25.44;	author joerg;	state Exp;
branches;
next	1.1086;

1.1086
date	2012.12.25.10.51.03;	author mbalmer;	state Exp;
branches;
next	1.1085;

1.1085
date	2012.12.17.20.38.00;	author mbalmer;	state Exp;
branches;
next	1.1084;

1.1084
date	2012.12.10.02.03.45;	author dholland;	state Exp;
branches;
next	1.1083;

1.1083
date	2012.12.05.16.19.46;	author christos;	state Exp;
branches;
next	1.1082;

1.1082
date	2012.10.17.14.48.13;	author apb;	state Exp;
branches;
next	1.1081;

1.1081
date	2012.09.30.21.36.18;	author dsl;	state Exp;
branches;
next	1.1080;

1.1080
date	2012.09.23.01.05.21;	author chs;	state Exp;
branches;
next	1.1079;

1.1079
date	2012.09.01.18.17.50;	author jakllsch;	state Exp;
branches
	1.1079.2.1;
next	1.1078;

1.1078
date	2012.08.10.11.32.32;	author sborrill;	state Exp;
branches;
next	1.1077;

1.1077
date	2012.08.01.04.20.05;	author matt;	state Exp;
branches;
next	1.1076;

1.1076
date	2012.07.30.19.40.52;	author degroote;	state Exp;
branches;
next	1.1075;

1.1075
date	2012.06.14.04.23.49;	author riz;	state Exp;
branches;
next	1.1074;

1.1074
date	2012.06.05.08.44.12;	author abs;	state Exp;
branches;
next	1.1073;

1.1073
date	2012.05.30.14.30.34;	author nonaka;	state Exp;
branches;
next	1.1072;

1.1072
date	2012.04.19.17.50.51;	author bouyer;	state Exp;
branches;
next	1.1071;

1.1071
date	2012.04.13.13.11.16;	author cegger;	state Exp;
branches;
next	1.1070;

1.1070
date	2012.04.08.20.49.29;	author christos;	state Exp;
branches;
next	1.1069;

1.1069
date	2012.04.07.05.40.41;	author christos;	state Exp;
branches;
next	1.1068;

1.1068
date	2012.03.25.00.11.16;	author nonaka;	state Exp;
branches;
next	1.1067;

1.1067
date	2012.03.10.21.51.53;	author joerg;	state Exp;
branches;
next	1.1066;

1.1066
date	2012.01.22.06.44.29;	author christos;	state Exp;
branches
	1.1066.2.1;
next	1.1065;

1.1065
date	2012.01.16.14.43.09;	author jmcneill;	state Exp;
branches;
next	1.1064;

1.1064
date	2012.01.15.15.05.06;	author jmcneill;	state Exp;
branches;
next	1.1063;

1.1063
date	2012.01.14.12.14.28;	author tron;	state Exp;
branches;
next	1.1062;

1.1062
date	2012.01.13.16.05.14;	author cegger;	state Exp;
branches;
next	1.1061;

1.1061
date	2011.12.31.00.11.21;	author christos;	state Exp;
branches;
next	1.1060;

1.1060
date	2011.12.18.05.49.28;	author dholland;	state Exp;
branches;
next	1.1059;

1.1059
date	2011.12.18.02.31.51;	author dholland;	state Exp;
branches;
next	1.1058;

1.1058
date	2011.11.22.21.25.19;	author tls;	state Exp;
branches
	1.1058.2.1;
next	1.1057;

1.1057
date	2011.11.13.12.47.54;	author mbalmer;	state Exp;
branches;
next	1.1056;

1.1056
date	2011.11.13.09.41.46;	author mbalmer;	state Exp;
branches;
next	1.1055;

1.1055
date	2011.10.30.12.12.21;	author hannken;	state Exp;
branches
	1.1055.2.1;
next	1.1054;

1.1054
date	2011.10.02.12.19.17;	author mbalmer;	state Exp;
branches;
next	1.1053;

1.1053
date	2011.09.04.12.31.30;	author mbalmer;	state Exp;
branches;
next	1.1052;

1.1052
date	2011.08.30.13.03.17;	author mbalmer;	state Exp;
branches;
next	1.1051;

1.1051
date	2011.08.30.12.13.25;	author jmcneill;	state Exp;
branches;
next	1.1050;

1.1050
date	2011.08.30.08.01.13;	author jruoho;	state Exp;
branches;
next	1.1049;

1.1049
date	2011.08.27.09.28.55;	author mbalmer;	state Exp;
branches;
next	1.1048;

1.1048
date	2011.08.18.20.55.20;	author jakllsch;	state Exp;
branches;
next	1.1047;

1.1047
date	2011.08.11.07.38.56;	author mbalmer;	state Exp;
branches;
next	1.1046;

1.1046
date	2011.08.09.02.52.29;	author jmcneill;	state Exp;
branches;
next	1.1045;

1.1045
date	2011.08.08.18.58.18;	author jmcneill;	state Exp;
branches;
next	1.1044;

1.1044
date	2011.08.08.17.02.31;	author jakllsch;	state Exp;
branches;
next	1.1043;

1.1043
date	2011.08.08.16.27.07;	author jakllsch;	state Exp;
branches;
next	1.1042;

1.1042
date	2011.08.07.10.04.41;	author tron;	state Exp;
branches;
next	1.1041;

1.1041
date	2011.07.23.21.12.58;	author jakllsch;	state Exp;
branches;
next	1.1040;

1.1040
date	2011.07.20.20.29.54;	author jakllsch;	state Exp;
branches;
next	1.1039;

1.1039
date	2011.07.19.21.02.25;	author jmcneill;	state Exp;
branches;
next	1.1038;

1.1038
date	2011.07.13.07.52.48;	author jruoho;	state Exp;
branches;
next	1.1037;

1.1037
date	2011.07.11.18.31.10;	author jmcneill;	state Exp;
branches;
next	1.1036;

1.1036
date	2011.07.09.15.02.43;	author jmcneill;	state Exp;
branches;
next	1.1035;

1.1035
date	2011.07.03.10.40.16;	author bouyer;	state Exp;
branches;
next	1.1034;

1.1034
date	2011.06.21.05.01.17;	author jruoho;	state Exp;
branches;
next	1.1033;

1.1033
date	2011.06.14.13.59.23;	author jruoho;	state Exp;
branches;
next	1.1032;

1.1032
date	2011.05.28.13.01.49;	author ryo;	state Exp;
branches
	1.1032.2.1;
next	1.1031;

1.1031
date	2011.04.26.16.57.40;	author joerg;	state Exp;
branches;
next	1.1030;

1.1030
date	2011.04.26.15.51.22;	author joerg;	state Exp;
branches;
next	1.1029;

1.1029
date	2011.04.04.17.09.39;	author bouyer;	state Exp;
branches;
next	1.1028;

1.1028
date	2011.04.04.14.33.51;	author bouyer;	state Exp;
branches;
next	1.1027;

1.1027
date	2011.04.01.12.11.16;	author jruoho;	state Exp;
branches;
next	1.1026;

1.1026
date	2011.03.06.17.08.25;	author bouyer;	state Exp;
branches;
next	1.1025;

1.1025
date	2011.03.04.04.48.40;	author jruoho;	state Exp;
branches;
next	1.1024;

1.1024
date	2011.02.27.17.10.34;	author jruoho;	state Exp;
branches;
next	1.1023;

1.1023
date	2011.02.24.13.58.39;	author jruoho;	state Exp;
branches;
next	1.1022;

1.1022
date	2011.02.24.10.56.01;	author jruoho;	state Exp;
branches;
next	1.1021;

1.1021
date	2011.02.23.11.43.22;	author jruoho;	state Exp;
branches;
next	1.1020;

1.1020
date	2011.02.23.00.45.56;	author jmcneill;	state Exp;
branches;
next	1.1019;

1.1019
date	2011.02.20.13.42.45;	author jruoho;	state Exp;
branches;
next	1.1018;

1.1018
date	2011.02.19.13.52.27;	author jmcneill;	state Exp;
branches;
next	1.1017;

1.1017
date	2011.02.19.00.13.55;	author jmcneill;	state Exp;
branches;
next	1.1016;

1.1016
date	2011.02.16.07.30.27;	author jruoho;	state Exp;
branches;
next	1.1015;

1.1015
date	2011.02.15.12.06.22;	author jmcneill;	state Exp;
branches;
next	1.1014;

1.1014
date	2011.02.14.08.50.39;	author hannken;	state Exp;
branches;
next	1.1013;

1.1013
date	2011.02.13.04.37.21;	author jym;	state Exp;
branches;
next	1.1012;

1.1012
date	2011.02.13.04.22.41;	author jym;	state Exp;
branches;
next	1.1011;

1.1011
date	2011.02.11.01.59.57;	author jmcneill;	state Exp;
branches;
next	1.1010;

1.1010
date	2011.02.07.04.05.49;	author jmcneill;	state Exp;
branches;
next	1.1009;

1.1009
date	2011.01.26.18.48.12;	author bouyer;	state Exp;
branches;
next	1.1008;

1.1008
date	2011.01.26.00.25.55;	author pooka;	state Exp;
branches;
next	1.1007;

1.1007
date	2011.01.17.15.56.03;	author jmcneill;	state Exp;
branches
	1.1007.2.1;
next	1.1006;

1.1006
date	2011.01.09.15.12.33;	author jruoho;	state Exp;
branches
	1.1006.2.1;
next	1.1005;

1.1005
date	2011.01.05.20.08.12;	author jruoho;	state Exp;
branches;
next	1.1004;

1.1004
date	2011.01.03.06.07.43;	author tsutsui;	state Exp;
branches;
next	1.1003;

1.1003
date	2010.12.27.20.45.00;	author jmcneill;	state Exp;
branches;
next	1.1002;

1.1002
date	2010.12.27.15.56.50;	author jmcneill;	state Exp;
branches;
next	1.1001;

1.1001
date	2010.11.27.20.18.46;	author christos;	state Exp;
branches;
next	1.1000;

1.1000
date	2010.11.23.11.14.00;	author hannken;	state Exp;
branches;
next	1.999;

1.999
date	2010.11.13.09.48.55;	author jnemeth;	state Exp;
branches;
next	1.998;

1.998
date	2010.11.06.15.06.29;	author jakllsch;	state Exp;
branches;
next	1.997;

1.997
date	2010.11.05.10.28.21;	author gsutre;	state Exp;
branches;
next	1.996;

1.996
date	2010.11.03.20.10.00;	author christos;	state Exp;
branches;
next	1.995;

1.995
date	2010.10.24.08.54.14;	author jruoho;	state Exp;
branches;
next	1.994;

1.994
date	2010.10.12.19.10.50;	author gsutre;	state Exp;
branches;
next	1.993;

1.993
date	2010.08.22.18.56.21;	author rmind;	state Exp;
branches;
next	1.992;

1.992
date	2010.08.21.11.55.21;	author jmcneill;	state Exp;
branches;
next	1.991;

1.991
date	2010.08.21.03.06.37;	author tsutsui;	state Exp;
branches;
next	1.990;

1.990
date	2010.08.08.20.04.24;	author chs;	state Exp;
branches;
next	1.989;

1.989
date	2010.07.24.00.45.54;	author jym;	state Exp;
branches;
next	1.988;

1.988
date	2010.07.23.00.43.20;	author jakllsch;	state Exp;
branches;
next	1.987;

1.987
date	2010.07.18.09.29.12;	author jruoho;	state Exp;
branches;
next	1.986;

1.986
date	2010.06.26.15.17.56;	author kefren;	state Exp;
branches;
next	1.985;

1.985
date	2010.06.26.14.36.48;	author kefren;	state Exp;
branches;
next	1.984;

1.984
date	2010.06.01.02.40.13;	author mrg;	state Exp;
branches;
next	1.983;

1.983
date	2010.05.22.19.02.08;	author plunky;	state Exp;
branches;
next	1.982;

1.982
date	2010.05.08.22.16.28;	author mrg;	state Exp;
branches;
next	1.981;

1.981
date	2010.05.02.17.24.35;	author chs;	state Exp;
branches;
next	1.980;

1.980
date	2010.04.16.13.48.32;	author pooka;	state Exp;
branches;
next	1.979;

1.979
date	2010.04.10.17.55.25;	author jruoho;	state Exp;
branches;
next	1.978;

1.978
date	2010.04.09.14.02.05;	author ahoka;	state Exp;
branches;
next	1.977;

1.977
date	2010.04.08.17.32.30;	author jruoho;	state Exp;
branches;
next	1.976;

1.976
date	2010.04.08.09.45.17;	author jruoho;	state Exp;
branches;
next	1.975;

1.975
date	2010.03.27.03.04.51;	author nonaka;	state Exp;
branches;
next	1.974;

1.974
date	2010.03.08.22.51.52;	author hubertf;	state Exp;
branches
	1.974.2.1;
next	1.973;

1.973
date	2010.03.06.21.12.04;	author plunky;	state Exp;
branches;
next	1.972;

1.972
date	2010.03.06.04.28.53;	author cnst;	state Exp;
branches;
next	1.971;

1.971
date	2010.02.22.17.27.04;	author pgoyette;	state Exp;
branches;
next	1.970;

1.970
date	2010.02.22.05.57.10;	author ahoka;	state Exp;
branches;
next	1.969;

1.969
date	2010.02.21.05.16.29;	author cnst;	state Exp;
branches;
next	1.968;

1.968
date	2010.02.12.15.51.16;	author hubertf;	state Exp;
branches;
next	1.967;

1.967
date	2010.02.10.19.54.36;	author tonio;	state Exp;
branches;
next	1.966;

1.966
date	2010.02.09.22.38.32;	author tonio;	state Exp;
branches;
next	1.965;

1.965
date	2010.02.09.03.19.50;	author cnst;	state Exp;
branches;
next	1.964;

1.964
date	2010.02.08.21.45.31;	author pgoyette;	state Exp;
branches;
next	1.963;

1.963
date	2010.02.06.20.12.32;	author pgoyette;	state Exp;
branches
	1.963.2.1;
next	1.962;

1.962
date	2010.01.31.12.14.45;	author jruoho;	state Exp;
branches;
next	1.961;

1.961
date	2010.01.21.12.02.25;	author pooka;	state Exp;
branches;
next	1.960;

1.960
date	2010.01.19.22.06.20;	author pooka;	state Exp;
branches;
next	1.959;

1.959
date	2010.01.07.18.49.30;	author tnn;	state Exp;
branches;
next	1.958;

1.958
date	2010.01.07.00.18.47;	author martin;	state Exp;
branches;
next	1.957;

1.957
date	2010.01.03.03.53.34;	author dholland;	state Exp;
branches;
next	1.956;

1.956
date	2010.01.03.03.50.38;	author dholland;	state Exp;
branches;
next	1.955;

1.955
date	2009.12.23.01.04.46;	author pooka;	state Exp;
branches;
next	1.954;

1.954
date	2009.12.05.20.11.15;	author pooka;	state Exp;
branches;
next	1.953;

1.953
date	2009.11.30.16.19.55;	author tsutsui;	state Exp;
branches;
next	1.952;

1.952
date	2009.11.21.12.15.55;	author tsutsui;	state Exp;
branches;
next	1.951;

1.951
date	2009.11.21.12.09.15;	author tsutsui;	state Exp;
branches;
next	1.950;

1.950
date	2009.10.03.13.37.27;	author jmcneill;	state Exp;
branches;
next	1.949;

1.949
date	2009.10.02.18.50.49;	author jmcneill;	state Exp;
branches;
next	1.948;

1.948
date	2009.10.02.16.47.52;	author jmcneill;	state Exp;
branches;
next	1.947;

1.947
date	2009.09.30.22.19.00;	author jmcneill;	state Exp;
branches;
next	1.946;

1.946
date	2009.09.30.20.47.10;	author jmcneill;	state Exp;
branches;
next	1.945;

1.945
date	2009.09.20.01.14.31;	author christos;	state Exp;
branches;
next	1.944;

1.944
date	2009.09.07.22.59.09;	author jmcneill;	state Exp;
branches;
next	1.943;

1.943
date	2009.09.07.10.40.54;	author jmcneill;	state Exp;
branches;
next	1.942;

1.942
date	2009.09.06.17.25.56;	author sborrill;	state Exp;
branches;
next	1.941;

1.941
date	2009.08.15.08.44.35;	author mbalmer;	state Exp;
branches;
next	1.940;

1.940
date	2009.07.29.11.58.31;	author mbalmer;	state Exp;
branches;
next	1.939;

1.939
date	2009.07.29.11.55.40;	author mbalmer;	state Exp;
branches;
next	1.938;

1.938
date	2009.07.27.12.34.13;	author kiyohara;	state Exp;
branches;
next	1.937;

1.937
date	2009.07.19.06.28.08;	author kiyohara;	state Exp;
branches;
next	1.936;

1.936
date	2009.07.19.02.50.44;	author rmind;	state Exp;
branches;
next	1.935;

1.935
date	2009.07.18.16.31.42;	author reinoud;	state Exp;
branches;
next	1.934;

1.934
date	2009.04.21.03.00.29;	author nonaka;	state Exp;
branches;
next	1.933;

1.933
date	2009.04.20.20.49.21;	author cegger;	state Exp;
branches;
next	1.932;

1.932
date	2009.04.10.23.00.53;	author perry;	state Exp;
branches;
next	1.931;

1.931
date	2009.03.29.15.45.08;	author ad;	state Exp;
branches;
next	1.930;

1.930
date	2009.03.27.21.04.35;	author ad;	state Exp;
branches;
next	1.929;

1.929
date	2009.03.17.20.04.39;	author dyoung;	state Exp;
branches;
next	1.928;

1.928
date	2009.03.06.09.58.14;	author cegger;	state Exp;
branches;
next	1.927;

1.927
date	2009.02.16.23.40.14;	author jmcneill;	state Exp;
branches;
next	1.926;

1.926
date	2009.02.16.22.43.47;	author jmcneill;	state Exp;
branches;
next	1.925;

1.925
date	2009.02.07.09.58.10;	author mrg;	state Exp;
branches
	1.925.2.1;
next	1.924;

1.924
date	2009.01.29.21.48.13;	author ad;	state Exp;
branches;
next	1.923;

1.923
date	2009.01.24.05.06.06;	author mrg;	state Exp;
branches;
next	1.922;

1.922
date	2008.12.28.15.18.21;	author jmcneill;	state Exp;
branches;
next	1.921;

1.921
date	2008.12.14.00.44.29;	author jmcneill;	state Exp;
branches;
next	1.920;

1.920
date	2008.11.25.02.47.19;	author cube;	state Exp;
branches;
next	1.919;

1.919
date	2008.11.24.11.41.11;	author ad;	state Exp;
branches;
next	1.918;

1.918
date	2008.11.21.15.55.59;	author ad;	state Exp;
branches;
next	1.917;

1.917
date	2008.11.12.14.36.31;	author ad;	state Exp;
branches;
next	1.916;

1.916
date	2008.11.12.12.36.01;	author ad;	state Exp;
branches;
next	1.915;

1.915
date	2008.10.29.11.56.53;	author joerg;	state Exp;
branches
	1.915.2.1;
next	1.914;

1.914
date	2008.10.19.11.34.31;	author joerg;	state Exp;
branches
	1.914.2.1;
next	1.913;

1.913
date	2008.10.11.21.54.11;	author bouyer;	state Exp;
branches;
next	1.912;

1.912
date	2008.10.07.12.43.32;	author pgoyette;	state Exp;
branches;
next	1.911;

1.911
date	2008.10.07.09.30.04;	author rmind;	state Exp;
branches;
next	1.910;

1.910
date	2008.09.30.16.45.33;	author jmcneill;	state Exp;
branches;
next	1.909;

1.909
date	2008.09.09.03.26.42;	author ober;	state Exp;
branches;
next	1.908;

1.908
date	2008.09.09.01.19.37;	author jmcneill;	state Exp;
branches;
next	1.907;

1.907
date	2008.09.07.12.01.25;	author tron;	state Exp;
branches;
next	1.906;

1.906
date	2008.09.06.20.08.01;	author jmcneill;	state Exp;
branches;
next	1.905;

1.905
date	2008.08.21.18.06.18;	author bouyer;	state Exp;
branches;
next	1.904;

1.904
date	2008.08.04.03.55.47;	author tls;	state Exp;
branches;
next	1.903;

1.903
date	2008.07.31.14.15.00;	author joerg;	state Exp;
branches;
next	1.902;

1.902
date	2008.07.31.07.41.01;	author simonb;	state Exp;
branches;
next	1.901;

1.901
date	2008.06.11.20.37.38;	author perry;	state Exp;
branches
	1.901.2.1;
next	1.900;

1.900
date	2008.05.30.19.51.00;	author dyoung;	state Exp;
branches
	1.900.2.1;
next	1.899;

1.899
date	2008.05.26.00.25.32;	author christos;	state Exp;
branches;
next	1.898;

1.898
date	2008.05.25.19.05.17;	author agc;	state Exp;
branches;
next	1.897;

1.897
date	2008.05.23.21.17.40;	author jnemeth;	state Exp;
branches;
next	1.896;

1.896
date	2008.05.18.22.05.59;	author cegger;	state Exp;
branches;
next	1.895;

1.895
date	2008.05.13.13.43.47;	author ad;	state Exp;
branches;
next	1.894;

1.894
date	2008.05.05.14.43.18;	author ad;	state Exp;
branches
	1.894.2.1;
next	1.893;

1.893
date	2008.05.02.15.26.38;	author ad;	state Exp;
branches;
next	1.892;

1.892
date	2008.05.01.20.18.18;	author cegger;	state Exp;
branches;
next	1.891;

1.891
date	2008.04.30.15.29.11;	author ad;	state Exp;
branches;
next	1.890;

1.890
date	2008.04.22.22.37.14;	author cegger;	state Exp;
branches
	1.890.2.1;
next	1.889;

1.889
date	2008.04.11.11.55.18;	author tsutsui;	state Exp;
branches
	1.889.2.1;
next	1.888;

1.888
date	2008.04.09.17.35.17;	author dyoung;	state Exp;
branches;
next	1.887;

1.887
date	2008.04.03.22.51.09;	author xtraeme;	state Exp;
branches;
next	1.886;

1.886
date	2008.03.31.15.19.28;	author jmcneill;	state Exp;
branches;
next	1.885;

1.885
date	2008.03.29.00.21.01;	author cube;	state Exp;
branches;
next	1.884;

1.884
date	2008.03.18.20.48.42;	author cube;	state Exp;
branches;
next	1.883;

1.883
date	2008.03.18.20.46.35;	author cube;	state Exp;
branches;
next	1.882;

1.882
date	2008.02.29.14.42.32;	author jmmv;	state Exp;
branches;
next	1.881;

1.881
date	2008.01.30.19.58.19;	author ad;	state Exp;
branches
	1.881.2.1
	1.881.6.1;
next	1.880;

1.880
date	2008.01.21.22.12.00;	author ichiro;	state Exp;
branches;
next	1.879;

1.879
date	2008.01.16.09.37.05;	author ad;	state Exp;
branches;
next	1.878;

1.878
date	2008.01.09.14.28.54;	author xtraeme;	state Exp;
branches;
next	1.877;

1.877
date	2008.01.07.08.39.03;	author martti;	state Exp;
branches;
next	1.876;

1.876
date	2008.01.03.07.21.21;	author kiyohara;	state Exp;
branches;
next	1.875;

1.875
date	2007.12.31.15.31.56;	author ad;	state Exp;
branches;
next	1.874;

1.874
date	2007.12.30.13.15.22;	author joerg;	state Exp;
branches;
next	1.873;

1.873
date	2007.12.29.06.09.04;	author xtraeme;	state Exp;
branches;
next	1.872;

1.872
date	2007.12.26.23.00.51;	author elad;	state Exp;
branches;
next	1.871;

1.871
date	2007.12.26.16.28.15;	author joerg;	state Exp;
branches;
next	1.870;

1.870
date	2007.12.25.01.03.32;	author ad;	state Exp;
branches;
next	1.869;

1.869
date	2007.12.21.15.20.13;	author jmcneill;	state Exp;
branches;
next	1.868;

1.868
date	2007.12.17.04.36.16;	author riz;	state Exp;
branches;
next	1.867;

1.867
date	2007.12.09.20.27.46;	author jmcneill;	state Exp;
branches
	1.867.2.1;
next	1.866;

1.866
date	2007.12.05.00.19.41;	author xtraeme;	state Exp;
branches
	1.866.2.1;
next	1.865;

1.865
date	2007.12.04.18.53.57;	author xtraeme;	state Exp;
branches;
next	1.864;

1.864
date	2007.12.02.05.19.13;	author kiyohara;	state Exp;
branches
	1.864.2.1;
next	1.863;

1.863
date	2007.11.22.14.33.53;	author jnemeth;	state Exp;
branches;
next	1.862;

1.862
date	2007.11.15.12.58.29;	author xtraeme;	state Exp;
branches;
next	1.861;

1.861
date	2007.11.14.17.54.57;	author ad;	state Exp;
branches;
next	1.860;

1.860
date	2007.11.11.17.56.10;	author jmcneill;	state Exp;
branches;
next	1.859;

1.859
date	2007.11.04.14.34.22;	author xtraeme;	state Exp;
branches
	1.859.2.1;
next	1.858;

1.858
date	2007.11.01.13.54.29;	author xtraeme;	state Exp;
branches;
next	1.857;

1.857
date	2007.11.01.13.48.52;	author xtraeme;	state Exp;
branches;
next	1.856;

1.856
date	2007.10.30.00.03.50;	author xtraeme;	state Exp;
branches;
next	1.855;

1.855
date	2007.10.29.00.47.17;	author xtraeme;	state Exp;
branches;
next	1.854;

1.854
date	2007.10.26.22.20.43;	author xtraeme;	state Exp;
branches;
next	1.853;

1.853
date	2007.10.17.19.54.42;	author garbled;	state Exp;
branches;
next	1.852;

1.852
date	2007.09.25.17.14.11;	author xtraeme;	state Exp;
branches
	1.852.2.1;
next	1.851;

1.851
date	2007.09.22.18.51.13;	author xtraeme;	state Exp;
branches
	1.851.2.1;
next	1.850;

1.850
date	2007.09.22.18.40.22;	author martin;	state Exp;
branches;
next	1.849;

1.849
date	2007.09.11.21.46.53;	author xtraeme;	state Exp;
branches;
next	1.848;

1.848
date	2007.09.06.18.09.00;	author joerg;	state Exp;
branches;
next	1.847;

1.847
date	2007.09.06.10.24.18;	author martti;	state Exp;
branches;
next	1.846;

1.846
date	2007.09.06.00.31.08;	author joerg;	state Exp;
branches;
next	1.845;

1.845
date	2007.09.03.17.57.36;	author tshiozak;	state Exp;
branches;
next	1.844;

1.844
date	2007.08.26.17.05.23;	author xtraeme;	state Exp;
branches
	1.844.2.1;
next	1.843;

1.843
date	2007.08.21.02.48.15;	author kiyohara;	state Exp;
branches;
next	1.842;

1.842
date	2007.08.20.00.54.42;	author kiyohara;	state Exp;
branches;
next	1.841;

1.841
date	2007.08.18.11.35.55;	author tnn;	state Exp;
branches;
next	1.840;

1.840
date	2007.08.06.21.26.55;	author adrianp;	state Exp;
branches;
next	1.839;

1.839
date	2007.07.28.11.06.23;	author kiyohara;	state Exp;
branches
	1.839.4.1;
next	1.838;

1.838
date	2007.07.14.16.16.17;	author kiyohara;	state Exp;
branches
	1.838.2.1
	1.838.4.1;
next	1.837;

1.837
date	2007.07.11.08.01.50;	author kiyohara;	state Exp;
branches;
next	1.836;

1.836
date	2007.07.08.03.01.19;	author jmcneill;	state Exp;
branches;
next	1.835;

1.835
date	2007.06.27.23.12.03;	author xtraeme;	state Exp;
branches;
next	1.834;

1.834
date	2007.06.16.12.35.55;	author ad;	state Exp;
branches;
next	1.833;

1.833
date	2007.06.15.23.05.29;	author jmcneill;	state Exp;
branches;
next	1.832;

1.832
date	2007.06.09.11.34.02;	author kiyohara;	state Exp;
branches;
next	1.831;

1.831
date	2007.06.04.08.55.21;	author martin;	state Exp;
branches;
next	1.830;

1.830
date	2007.06.01.14.26.36;	author blymn;	state Exp;
branches;
next	1.829;

1.829
date	2007.05.29.21.37.07;	author christos;	state Exp;
branches;
next	1.828;

1.828
date	2007.05.20.05.13.17;	author dogcow;	state Exp;
branches;
next	1.827;

1.827
date	2007.05.15.17.53.44;	author bouyer;	state Exp;
branches;
next	1.826;

1.826
date	2007.05.08.16.55.54;	author xtraeme;	state Exp;
branches;
next	1.825;

1.825
date	2007.05.01.17.18.54;	author bouyer;	state Exp;
branches;
next	1.824;

1.824
date	2007.04.26.17.11.36;	author dyoung;	state Exp;
branches
	1.824.2.1;
next	1.823;

1.823
date	2007.04.19.14.34.35;	author xtraeme;	state Exp;
branches;
next	1.822;

1.822
date	2007.04.05.19.17.41;	author reed;	state Exp;
branches;
next	1.821;

1.821
date	2007.03.22.12.40.06;	author gdt;	state Exp;
branches;
next	1.820;

1.820
date	2007.03.20.21.29.28;	author xtraeme;	state Exp;
branches;
next	1.819;

1.819
date	2007.03.14.12.27.22;	author drochner;	state Exp;
branches
	1.819.2.1;
next	1.818;

1.818
date	2007.03.13.23.49.38;	author xtraeme;	state Exp;
branches;
next	1.817;

1.817
date	2007.03.13.04.09.28;	author xtraeme;	state Exp;
branches;
next	1.816;

1.816
date	2007.03.10.10.54.53;	author bouyer;	state Exp;
branches
	1.816.2.1
	1.816.4.1;
next	1.815;

1.815
date	2007.03.08.15.16.04;	author njoly;	state Exp;
branches;
next	1.814;

1.814
date	2007.03.07.22.23.14;	author bouyer;	state Exp;
branches;
next	1.813;

1.813
date	2007.03.06.21.47.46;	author bouyer;	state Exp;
branches;
next	1.812;

1.812
date	2007.03.06.11.28.46;	author dillo;	state Exp;
branches;
next	1.811;

1.811
date	2007.03.05.23.30.18;	author dillo;	state Exp;
branches;
next	1.810;

1.810
date	2007.03.01.14.57.38;	author kiyohara;	state Exp;
branches;
next	1.809;

1.809
date	2007.02.18.18.05.52;	author dsl;	state Exp;
branches;
next	1.808;

1.808
date	2007.02.17.00.28.23;	author daniel;	state Exp;
branches
	1.808.2.1;
next	1.807;

1.807
date	2007.02.09.21.55.04;	author ad;	state Exp;
branches;
next	1.806;

1.806
date	2007.01.24.19.46.26;	author tls;	state Exp;
branches;
next	1.805;

1.805
date	2007.01.20.18.48.17;	author xtraeme;	state Exp;
branches;
next	1.804;

1.804
date	2007.01.11.05.36.29;	author mouse;	state Exp;
branches;
next	1.803;

1.803
date	2006.12.17.23.02.06;	author bouyer;	state Exp;
branches;
next	1.802;

1.802
date	2006.12.17.22.57.15;	author bouyer;	state Exp;
branches;
next	1.801;

1.801
date	2006.12.11.15.24.28;	author yamt;	state Exp;
branches;
next	1.800;

1.800
date	2006.12.04.01.32.37;	author dyoung;	state Exp;
branches;
next	1.799;

1.799
date	2006.11.30.21.01.16;	author bouyer;	state Exp;
branches
	1.799.2.1;
next	1.798;

1.798
date	2006.11.28.16.15.36;	author christos;	state Exp;
branches;
next	1.797;

1.797
date	2006.11.17.22.18.22;	author tsutsui;	state Exp;
branches;
next	1.796;

1.796
date	2006.11.11.19.00.16;	author jmmv;	state Exp;
branches;
next	1.795;

1.795
date	2006.11.11.18.47.10;	author jmmv;	state Exp;
branches;
next	1.794;

1.794
date	2006.11.01.19.33.41;	author tls;	state Exp;
branches;
next	1.793;

1.793
date	2006.10.31.22.21.16;	author joerg;	state Exp;
branches;
next	1.792;

1.792
date	2006.10.27.17.37.44;	author perry;	state Exp;
branches;
next	1.791;

1.791
date	2006.10.26.11.48.38;	author elad;	state Exp;
branches;
next	1.790;

1.790
date	2006.10.25.13.56.15;	author jmmv;	state Exp;
branches;
next	1.789;

1.789
date	2006.10.22.16.26.27;	author bouyer;	state Exp;
branches;
next	1.788;

1.788
date	2006.10.21.14.10.33;	author bouyer;	state Exp;
branches;
next	1.787;

1.787
date	2006.10.01.18.37.54;	author bouyer;	state Exp;
branches;
next	1.786;

1.786
date	2006.10.01.09.53.08;	author itohy;	state Exp;
branches;
next	1.785;

1.785
date	2006.09.27.23.58.50;	author hubertf;	state Exp;
branches;
next	1.784;

1.784
date	2006.09.26.14.30.26;	author elad;	state Exp;
branches;
next	1.783;

1.783
date	2006.09.26.14.08.19;	author elad;	state Exp;
branches;
next	1.782;

1.782
date	2006.09.19.13.58.55;	author jmmv;	state Exp;
branches;
next	1.781;

1.781
date	2006.09.10.15.45.56;	author plunky;	state Exp;
branches
	1.781.2.1;
next	1.780;

1.780
date	2006.09.10.02.28.33;	author riz;	state Exp;
branches;
next	1.779;

1.779
date	2006.09.07.14.23.44;	author itohy;	state Exp;
branches
	1.779.2.1;
next	1.778;

1.778
date	2006.08.26.20.26.45;	author christos;	state Exp;
branches;
next	1.777;

1.777
date	2006.08.20.07.06.57;	author plunky;	state Exp;
branches;
next	1.776;

1.776
date	2006.08.14.09.34.43;	author itohy;	state Exp;
branches;
next	1.775;

1.775
date	2006.08.14.06.22.34;	author skrll;	state Exp;
branches;
next	1.774;

1.774
date	2006.08.13.02.27.32;	author simonb;	state Exp;
branches;
next	1.773;

1.773
date	2006.08.12.15.29.53;	author christos;	state Exp;
branches;
next	1.772;

1.772
date	2006.08.07.21.33.49;	author xtraeme;	state Exp;
branches
	1.772.2.1;
next	1.771;

1.771
date	2006.08.03.00.19.21;	author hubertf;	state Exp;
branches;
next	1.770;

1.770
date	2006.08.02.16.24.29;	author reed;	state Exp;
branches;
next	1.769;

1.769
date	2006.07.31.23.29.54;	author hubertf;	state Exp;
branches;
next	1.768;

1.768
date	2006.07.31.22.23.09;	author wiz;	state Exp;
branches;
next	1.767;

1.767
date	2006.07.30.17.53.50;	author bouyer;	state Exp;
branches;
next	1.766;

1.766
date	2006.07.26.15.34.39;	author elad;	state Exp;
branches;
next	1.765;

1.765
date	2006.07.26.10.43.02;	author tron;	state Exp;
branches;
next	1.764;

1.764
date	2006.07.26.10.31.00;	author tron;	state Exp;
branches;
next	1.763;

1.763
date	2006.07.24.14.24.48;	author gdt;	state Exp;
branches;
next	1.762;

1.762
date	2006.07.15.07.55.20;	author elad;	state Exp;
branches;
next	1.761;

1.761
date	2006.07.12.18.45.51;	author perry;	state Exp;
branches;
next	1.760;

1.760
date	2006.07.04.00.30.22;	author christos;	state Exp;
branches;
next	1.759;

1.759
date	2006.06.28.15.19.28;	author liamjfoy;	state Exp;
branches;
next	1.758;

1.758
date	2006.06.19.15.44.44;	author gdamore;	state Exp;
branches;
next	1.757;

1.757
date	2006.06.16.22.13.35;	author jmcneill;	state Exp;
branches;
next	1.756;

1.756
date	2006.06.16.06.41.13;	author simonb;	state Exp;
branches;
next	1.755;

1.755
date	2006.06.13.17.17.15;	author perry;	state Exp;
branches
	1.755.2.1;
next	1.754;

1.754
date	2006.06.07.22.37.57;	author kardel;	state Exp;
branches;
next	1.753;

1.753
date	2006.06.04.15.48.08;	author perry;	state Exp;
branches;
next	1.752;

1.752
date	2006.05.14.21.55.11;	author elad;	state Exp;
branches
	1.752.2.1;
next	1.751;

1.751
date	2006.05.13.09.02.18;	author xtraeme;	state Exp;
branches;
next	1.750;

1.750
date	2006.05.07.01.38.54;	author jmcneill;	state Exp;
branches;
next	1.749;

1.749
date	2006.05.06.15.49.38;	author jmcneill;	state Exp;
branches;
next	1.748;

1.748
date	2006.05.04.19.09.41;	author rpaulo;	state Exp;
branches;
next	1.747;

1.747
date	2006.04.20.15.58.52;	author perry;	state Exp;
branches;
next	1.746;

1.746
date	2006.04.19.10.31.44;	author drochner;	state Exp;
branches;
next	1.745;

1.745
date	2006.04.18.17.03.18;	author xtraeme;	state Exp;
branches;
next	1.744;

1.744
date	2006.04.18.16.49.19;	author rittera;	state Exp;
branches;
next	1.743;

1.743
date	2006.04.15.17.48.23;	author jmmv;	state Exp;
branches;
next	1.742;

1.742
date	2006.04.13.00.30.19;	author christos;	state Exp;
branches;
next	1.741;

1.741
date	2006.04.12.03.41.51;	author martti;	state Exp;
branches;
next	1.740;

1.740
date	2006.04.07.18.55.22;	author riz;	state Exp;
branches;
next	1.739;

1.739
date	2006.04.03.16.08.49;	author scw;	state Exp;
branches;
next	1.738;

1.738
date	2006.03.31.00.03.57;	author rittera;	state Exp;
branches;
next	1.737;

1.737
date	2006.03.28.20.58.40;	author pavel;	state Exp;
branches;
next	1.736;

1.736
date	2006.03.25.17.44.29;	author xtraeme;	state Exp;
branches;
next	1.735;

1.735
date	2006.03.17.12.25.01;	author jmcneill;	state Exp;
branches;
next	1.734;

1.734
date	2006.03.17.12.22.14;	author jmcneill;	state Exp;
branches;
next	1.733;

1.733
date	2006.03.12.22.57.01;	author chs;	state Exp;
branches
	1.733.2.1;
next	1.732;

1.732
date	2006.03.06.18.35.24;	author bouyer;	state Exp;
branches
	1.732.2.1;
next	1.731;

1.731
date	2006.02.25.01.33.15;	author christos;	state Exp;
branches
	1.731.2.1;
next	1.730;

1.730
date	2006.02.24.10.20.32;	author jmmv;	state Exp;
branches;
next	1.729;

1.729
date	2006.02.24.10.05.41;	author jmmv;	state Exp;
branches;
next	1.728;

1.728
date	2006.02.19.21.41.18;	author jmcneill;	state Exp;
branches;
next	1.727;

1.727
date	2006.02.19.02.55.21;	author tls;	state Exp;
branches;
next	1.726;

1.726
date	2006.02.18.19.15.19;	author jmcneill;	state Exp;
branches;
next	1.725;

1.725
date	2006.02.05.05.01.55;	author cube;	state Exp;
branches;
next	1.724;

1.724
date	2006.02.04.03.09.40;	author rpaulo;	state Exp;
branches;
next	1.723;

1.723
date	2006.02.03.11.08.23;	author jmmv;	state Exp;
branches
	1.723.2.1;
next	1.722;

1.722
date	2006.02.02.21.32.09;	author reinoud;	state Exp;
branches;
next	1.721;

1.721
date	2006.01.31.16.42.09;	author xtraeme;	state Exp;
branches
	1.721.2.1;
next	1.720;

1.720
date	2006.01.31.09.31.01;	author kochi;	state Exp;
branches;
next	1.719;

1.719
date	2006.01.29.11.32.01;	author augustss;	state Exp;
branches;
next	1.718;

1.718
date	2006.01.05.10.24.11;	author xtraeme;	state Exp;
branches;
next	1.717;

1.717
date	2006.01.04.23.40.45;	author xtraeme;	state Exp;
branches;
next	1.716;

1.716
date	2006.01.04.20.44.26;	author dsl;	state Exp;
branches;
next	1.715;

1.715
date	2005.12.31.17.55.55;	author xtraeme;	state Exp;
branches;
next	1.714;

1.714
date	2005.12.20.05.35.28;	author thorpej;	state Exp;
branches
	1.714.2.1;
next	1.713;

1.713
date	2005.12.11.02.11.50;	author christos;	state Exp;
branches;
next	1.712;

1.712
date	2005.12.10.11.32.14;	author elad;	state Exp;
branches;
next	1.711;

1.711
date	2005.12.09.23.34.02;	author elad;	state Exp;
branches;
next	1.710;

1.710
date	2005.12.07.09.10.14;	author tsutsui;	state Exp;
branches;
next	1.709;

1.709
date	2005.11.25.16.41.31;	author thorpej;	state Exp;
branches;
next	1.708;

1.708
date	2005.11.25.16.35.11;	author thorpej;	state Exp;
branches;
next	1.707;

1.707
date	2005.11.25.16.30.23;	author thorpej;	state Exp;
branches;
next	1.706;

1.706
date	2005.10.07.15.59.49;	author riz;	state Exp;
branches
	1.706.6.1;
next	1.705;

1.705
date	2005.10.07.08.18.13;	author abs;	state Exp;
branches;
next	1.704;

1.704
date	2005.09.27.02.57.47;	author jmcneill;	state Exp;
branches;
next	1.703;

1.703
date	2005.09.27.02.57.02;	author jmcneill;	state Exp;
branches;
next	1.702;

1.702
date	2005.09.27.02.47.42;	author jmcneill;	state Exp;
branches;
next	1.701;

1.701
date	2005.09.22.07.09.35;	author dyoung;	state Exp;
branches;
next	1.700;

1.700
date	2005.09.14.08.22.24;	author tron;	state Exp;
branches;
next	1.699;

1.699
date	2005.09.10.19.20.49;	author jmmv;	state Exp;
branches;
next	1.698;

1.698
date	2005.09.09.16.26.19;	author drochner;	state Exp;
branches;
next	1.697;

1.697
date	2005.09.06.02.03.52;	author dogcow;	state Exp;
branches;
next	1.696;

1.696
date	2005.08.19.05.19.50;	author christos;	state Exp;
branches;
next	1.695;

1.695
date	2005.08.19.02.03.51;	author christos;	state Exp;
branches;
next	1.694;

1.694
date	2005.08.18.15.57.00;	author perry;	state Exp;
branches;
next	1.693;

1.693
date	2005.08.05.09.23.16;	author skrll;	state Exp;
branches;
next	1.692;

1.692
date	2005.07.31.04.04.32;	author yamt;	state Exp;
branches;
next	1.691;

1.691
date	2005.07.30.06.35.36;	author yamt;	state Exp;
branches;
next	1.690;

1.690
date	2005.07.29.14.57.30;	author elad;	state Exp;
branches;
next	1.689;

1.689
date	2005.07.18.12.02.21;	author augustss;	state Exp;
branches;
next	1.688;

1.688
date	2005.07.17.00.08.28;	author hubertf;	state Exp;
branches;
next	1.687;

1.687
date	2005.07.16.23.20.00;	author wiz;	state Exp;
branches;
next	1.686;

1.686
date	2005.07.16.22.54.34;	author christos;	state Exp;
branches;
next	1.685;

1.685
date	2005.07.11.15.37.04;	author kiyohara;	state Exp;
branches;
next	1.684;

1.684
date	2005.07.07.17.05.47;	author tron;	state Exp;
branches;
next	1.683;

1.683
date	2005.07.03.19.23.29;	author cube;	state Exp;
branches
	1.683.2.1;
next	1.682;

1.682
date	2005.07.02.11.19.23;	author rpaulo;	state Exp;
branches;
next	1.681;

1.681
date	2005.06.28.09.08.04;	author wiz;	state Exp;
branches;
next	1.680;

1.680
date	2005.06.25.12.05.17;	author rpaulo;	state Exp;
branches;
next	1.679;

1.679
date	2005.06.21.08.19.25;	author sekiya;	state Exp;
branches;
next	1.678;

1.678
date	2005.06.21.02.23.13;	author kent;	state Exp;
branches;
next	1.677;

1.677
date	2005.06.19.00.23.43;	author chs;	state Exp;
branches;
next	1.676;

1.676
date	2005.06.18.17.34.18;	author chs;	state Exp;
branches;
next	1.675;

1.675
date	2005.06.18.16.12.19;	author chs;	state Exp;
branches;
next	1.674;

1.674
date	2005.06.09.14.43.30;	author tsutsui;	state Exp;
branches;
next	1.673;

1.673
date	2005.05.17.17.20.41;	author hubertf;	state Exp;
branches;
next	1.672;

1.672
date	2005.05.06.04.42.24;	author elad;	state Exp;
branches;
next	1.671;

1.671
date	2005.05.04.02.40.55;	author augustss;	state Exp;
branches;
next	1.670;

1.670
date	2005.05.04.01.55.24;	author augustss;	state Exp;
branches;
next	1.669;

1.669
date	2005.04.29.16.58.39;	author augustss;	state Exp;
branches;
next	1.668;

1.668
date	2005.04.26.12.13.33;	author augustss;	state Exp;
branches;
next	1.667;

1.667
date	2005.04.20.13.44.45;	author blymn;	state Exp;
branches;
next	1.666;

1.666
date	2005.04.15.17.27.21;	author itohy;	state Exp;
branches;
next	1.665;

1.665
date	2005.04.10.23.02.01;	author perry;	state Exp;
branches;
next	1.664;

1.664
date	2005.04.03.11.39.07;	author jdolecek;	state Exp;
branches;
next	1.663;

1.663
date	2005.03.25.23.28.44;	author cube;	state Exp;
branches;
next	1.662;

1.662
date	2005.03.21.14.15.27;	author xtraeme;	state Exp;
branches;
next	1.661;

1.661
date	2005.03.03.23.02.01;	author tron;	state Exp;
branches
	1.661.2.1;
next	1.660;

1.660
date	2005.03.01.02.31.25;	author itojun;	state Exp;
branches;
next	1.659;

1.659
date	2005.02.20.18.39.41;	author jdolecek;	state Exp;
branches;
next	1.658;

1.658
date	2005.02.18.21.05.52;	author dsl;	state Exp;
branches;
next	1.657;

1.657
date	2005.02.15.21.07.37;	author jwise;	state Exp;
branches;
next	1.656;

1.656
date	2005.02.12.13.07.27;	author jdolecek;	state Exp;
branches;
next	1.655;

1.655
date	2005.02.11.08.25.54;	author dsl;	state Exp;
branches;
next	1.654;

1.654
date	2005.01.31.16.54.34;	author hannken;	state Exp;
branches;
next	1.653;

1.653
date	2005.01.28.03.19.50;	author rumble;	state Exp;
branches;
next	1.652;

1.652
date	2005.01.24.03.02.45;	author joff;	state Exp;
branches
	1.652.2.1;
next	1.651;

1.651
date	2005.01.18.10.28.00;	author scw;	state Exp;
branches;
next	1.650;

1.650
date	2005.01.17.15.28.51;	author cube;	state Exp;
branches;
next	1.649;

1.649
date	2005.01.12.00.18.16;	author reinoud;	state Exp;
branches
	1.649.2.1;
next	1.648;

1.648
date	2005.01.11.18.43.42;	author skrll;	state Exp;
branches;
next	1.647;

1.647
date	2005.01.07.01.31.14;	author perry;	state Exp;
branches;
next	1.646;

1.646
date	2004.12.06.19.28.12;	author cube;	state Exp;
branches;
next	1.645;

1.645
date	2004.12.02.14.33.31;	author xtraeme;	state Exp;
branches;
next	1.644;

1.644
date	2004.12.02.09.50.42;	author xtraeme;	state Exp;
branches;
next	1.643;

1.643
date	2004.12.01.22.27.46;	author grant;	state Exp;
branches;
next	1.642;

1.642
date	2004.11.25.16.13.34;	author kim;	state Exp;
branches;
next	1.641;

1.641
date	2004.11.24.20.49.21;	author bouyer;	state Exp;
branches;
next	1.640;

1.640
date	2004.11.10.17.54.05;	author christos;	state Exp;
branches;
next	1.639;

1.639
date	2004.11.10.17.25.21;	author christos;	state Exp;
branches;
next	1.638;

1.638
date	2004.11.01.23.20.42;	author wiz;	state Exp;
branches;
next	1.637;

1.637
date	2004.10.26.19.52.23;	author perry;	state Exp;
branches;
next	1.636;

1.636
date	2004.10.23.14.00.51;	author augustss;	state Exp;
branches;
next	1.635;

1.635
date	2004.10.22.13.10.20;	author augustss;	state Exp;
branches;
next	1.634;

1.634
date	2004.10.21.17.12.41;	author augustss;	state Exp;
branches;
next	1.633;

1.633
date	2004.10.19.05.44.25;	author lukem;	state Exp;
branches;
next	1.632;

1.632
date	2004.10.10.16.39.36;	author augustss;	state Exp;
branches;
next	1.631;

1.631
date	2004.09.08.11.38.22;	author jmmv;	state Exp;
branches;
next	1.630;

1.630
date	2004.09.04.23.29.48;	author manu;	state Exp;
branches;
next	1.629;

1.629
date	2004.08.26.14.33.01;	author itohy;	state Exp;
branches;
next	1.628;

1.628
date	2004.08.10.20.50.11;	author mycroft;	state Exp;
branches;
next	1.627;

1.627
date	2004.08.08.08.57.09;	author mycroft;	state Exp;
branches;
next	1.626;

1.626
date	2004.07.31.17.35.19;	author mrg;	state Exp;
branches;
next	1.625;

1.625
date	2004.07.29.22.29.35;	author jmmv;	state Exp;
branches;
next	1.624;

1.624
date	2004.07.28.12.34.02;	author jmmv;	state Exp;
branches;
next	1.623;

1.623
date	2004.07.19.14.23.59;	author tron;	state Exp;
branches;
next	1.622;

1.622
date	2004.07.15.03.53.47;	author atatat;	state Exp;
branches;
next	1.621;

1.621
date	2004.07.10.18.51.01;	author cube;	state Exp;
branches;
next	1.620;

1.620
date	2004.07.09.18.38.40;	author bouyer;	state Exp;
branches;
next	1.619;

1.619
date	2004.07.06.22.53.36;	author mycroft;	state Exp;
branches;
next	1.618;

1.618
date	2004.07.05.22.30.38;	author abs;	state Exp;
branches;
next	1.617;

1.617
date	2004.06.29.04.51.29;	author itojun;	state Exp;
branches;
next	1.616;

1.616
date	2004.06.26.07.32.06;	author abs;	state Exp;
branches;
next	1.615;

1.615
date	2004.06.22.15.18.33;	author toshii;	state Exp;
branches;
next	1.614;

1.614
date	2004.06.22.14.09.50;	author itojun;	state Exp;
branches;
next	1.613;

1.613
date	2004.06.18.15.04.39;	author christos;	state Exp;
branches;
next	1.612;

1.612
date	2004.06.14.01.28.00;	author lukem;	state Exp;
branches;
next	1.611;

1.611
date	2004.06.08.12.46.11;	author kochi;	state Exp;
branches;
next	1.610;

1.610
date	2004.06.07.15.33.52;	author kochi;	state Exp;
branches;
next	1.609;

1.609
date	2004.06.01.16.29.36;	author augustss;	state Exp;
branches;
next	1.608;

1.608
date	2004.05.28.21.44.51;	author christos;	state Exp;
branches;
next	1.607;

1.607
date	2004.05.27.02.57.24;	author christos;	state Exp;
branches;
next	1.606;

1.606
date	2004.05.24.23.50.11;	author tsarna;	state Exp;
branches;
next	1.605;

1.605
date	2004.05.22.03.16.26;	author grant;	state Exp;
branches;
next	1.604;

1.604
date	2004.05.21.03.30.40;	author atatat;	state Exp;
branches;
next	1.603;

1.603
date	2004.05.11.23.07.35;	author wiz;	state Exp;
branches;
next	1.602;

1.602
date	2004.04.30.17.41.19;	author gendalia;	state Exp;
branches;
next	1.601;

1.601
date	2004.04.30.15.55.10;	author fredb;	state Exp;
branches;
next	1.600;

1.600
date	2004.04.30.02.47.16;	author christos;	state Exp;
branches;
next	1.599;

1.599
date	2004.04.30.02.08.17;	author lukem;	state Exp;
branches;
next	1.598;

1.598
date	2004.04.29.11.54.24;	author minoura;	state Exp;
branches;
next	1.597;

1.597
date	2004.04.21.01.05.35;	author christos;	state Exp;
branches;
next	1.596;

1.596
date	2004.04.07.13.13.59;	author augustss;	state Exp;
branches;
next	1.595;

1.595
date	2004.03.14.08.09.42;	author minoura;	state Exp;
branches
	1.595.2.1;
next	1.594;

1.594
date	2004.02.25.18.56.26;	author perry;	state Exp;
branches;
next	1.593;

1.593
date	2004.02.25.18.50.01;	author perry;	state Exp;
branches;
next	1.592;

1.592
date	2004.01.16.17.02.05;	author perry;	state Exp;
branches;
next	1.591;

1.591
date	2004.01.09.18.31.25;	author perry;	state Exp;
branches;
next	1.590;

1.590
date	2003.12.31.16.44.26;	author jonathan;	state Exp;
branches;
next	1.589;

1.589
date	2003.12.30.18.09.50;	author augustss;	state Exp;
branches;
next	1.588;

1.588
date	2003.12.23.10.11.42;	author kochi;	state Exp;
branches;
next	1.587;

1.587
date	2003.12.17.09.18.45;	author tls;	state Exp;
branches;
next	1.586;

1.586
date	2003.12.14.09.54.01;	author dyoung;	state Exp;
branches;
next	1.585;

1.585
date	2003.12.14.01.32.02;	author thorpej;	state Exp;
branches;
next	1.584;

1.584
date	2003.12.13.23.13.41;	author thorpej;	state Exp;
branches;
next	1.583;

1.583
date	2003.11.20.13.32.41;	author fvdl;	state Exp;
branches;
next	1.582;

1.582
date	2003.11.18.23.07.37;	author jonathan;	state Exp;
branches;
next	1.581;

1.581
date	2003.11.05.07.51.12;	author tron;	state Exp;
branches;
next	1.580;

1.580
date	2003.11.04.23.38.41;	author fvdl;	state Exp;
branches;
next	1.579;

1.579
date	2003.11.04.16.57.57;	author mycroft;	state Exp;
branches;
next	1.578;

1.578
date	2003.10.31.06.49.58;	author nisimura;	state Exp;
branches;
next	1.577;

1.577
date	2003.10.18.08.12.07;	author lukem;	state Exp;
branches;
next	1.576;

1.576
date	2003.10.13.05.45.59;	author dyoung;	state Exp;
branches;
next	1.575;

1.575
date	2003.10.10.04.50.07;	author grog;	state Exp;
branches;
next	1.574;

1.574
date	2003.10.08.12.08.38;	author augustss;	state Exp;
branches;
next	1.573;

1.573
date	2003.10.08.11.55.43;	author bouyer;	state Exp;
branches;
next	1.572;

1.572
date	2003.10.08.11.10.04;	author bouyer;	state Exp;
branches;
next	1.571;

1.571
date	2003.09.27.13.16.16;	author mrg;	state Exp;
branches;
next	1.570;

1.570
date	2003.09.06.22.39.23;	author christos;	state Exp;
branches;
next	1.569;

1.569
date	2003.08.26.21.12.48;	author jdolecek;	state Exp;
branches;
next	1.568;

1.568
date	2003.08.22.05.14.00;	author itojun;	state Exp;
branches;
next	1.567;

1.567
date	2003.08.07.12.06.15;	author soren;	state Exp;
branches;
next	1.566;

1.566
date	2003.08.06.12.32.07;	author bouyer;	state Exp;
branches;
next	1.565;

1.565
date	2003.07.06.04.03.21;	author kochi;	state Exp;
branches;
next	1.564;

1.564
date	2003.06.29.22.28.23;	author fvdl;	state Exp;
branches
	1.564.2.1;
next	1.563;

1.563
date	2003.06.28.15.34.41;	author darrenr;	state Exp;
branches;
next	1.562;

1.562
date	2003.06.28.14.20.53;	author darrenr;	state Exp;
branches;
next	1.561;

1.561
date	2003.05.29.20.22.28;	author fvdl;	state Exp;
branches;
next	1.560;

1.560
date	2003.05.15.13.13.23;	author wiz;	state Exp;
branches;
next	1.559;

1.559
date	2003.05.04.16.16.18;	author ad;	state Exp;
branches;
next	1.558;

1.558
date	2003.04.26.14.10.11;	author ragge;	state Exp;
branches;
next	1.557;

1.557
date	2003.04.21.00.17.46;	author fvdl;	state Exp;
branches;
next	1.556;

1.556
date	2003.04.16.23.39.02;	author thorpej;	state Exp;
branches;
next	1.555;

1.555
date	2003.04.16.23.36.22;	author thorpej;	state Exp;
branches;
next	1.554;

1.554
date	2003.04.10.22.06.57;	author christos;	state Exp;
branches;
next	1.553;

1.553
date	2003.04.08.18.58.20;	author abs;	state Exp;
branches;
next	1.552;

1.552
date	2003.04.05.18.41.19;	author perry;	state Exp;
branches;
next	1.551;

1.551
date	2003.03.25.19.37.12;	author jmmv;	state Exp;
branches;
next	1.550;

1.550
date	2003.03.15.19.34.17;	author jmmv;	state Exp;
branches;
next	1.549;

1.549
date	2003.03.05.10.27.59;	author grant;	state Exp;
branches;
next	1.548;

1.548
date	2003.02.27.19.22.41;	author perseant;	state Exp;
branches;
next	1.547;

1.547
date	2003.02.18.20.13.03;	author jdolecek;	state Exp;
branches;
next	1.546;

1.546
date	2003.02.16.17.35.15;	author augustss;	state Exp;
branches;
next	1.545;

1.545
date	2003.01.27.22.31.12;	author thorpej;	state Exp;
branches;
next	1.544;

1.544
date	2003.01.21.02.44.15;	author itojun;	state Exp;
branches;
next	1.543;

1.543
date	2003.01.20.20.08.30;	author christos;	state Exp;
branches;
next	1.542;

1.542
date	2003.01.19.10.42.06;	author tron;	state Exp;
branches;
next	1.541;

1.541
date	2003.01.18.22.33.29;	author christos;	state Exp;
branches;
next	1.540;

1.540
date	2003.01.08.13.41.17;	author tron;	state Exp;
branches;
next	1.539;

1.539
date	2003.01.08.13.20.26;	author fvdl;	state Exp;
branches;
next	1.538;

1.538
date	2003.01.07.18.55.36;	author fvdl;	state Exp;
branches;
next	1.537;

1.537
date	2003.01.07.03.19.38;	author jmcneill;	state Exp;
branches;
next	1.536;

1.536
date	2003.01.05.22.31.13;	author christos;	state Exp;
branches;
next	1.535;

1.535
date	2003.01.05.21.44.32;	author jmcneill;	state Exp;
branches;
next	1.534;

1.534
date	2003.01.02.12.36.51;	author tron;	state Exp;
branches;
next	1.533;

1.533
date	2002.12.26.08.21.56;	author junyoung;	state Exp;
branches;
next	1.532;

1.532
date	2002.12.09.16.24.39;	author david;	state Exp;
branches;
next	1.531;

1.531
date	2002.12.09.15.50.57;	author perry;	state Exp;
branches;
next	1.530;

1.530
date	2002.12.09.02.38.13;	author david;	state Exp;
branches;
next	1.529;

1.529
date	2002.12.07.07.26.51;	author jmc;	state Exp;
branches;
next	1.528;

1.528
date	2002.12.05.09.32.22;	author ichiro;	state Exp;
branches;
next	1.527;

1.527
date	2002.12.04.23.44.12;	author david;	state Exp;
branches;
next	1.526;

1.526
date	2002.11.22.12.21.02;	author wiz;	state Exp;
branches;
next	1.525;

1.525
date	2002.11.14.22.37.18;	author atatat;	state Exp;
branches;
next	1.524;

1.524
date	2002.11.13.20.00.04;	author jdolecek;	state Exp;
branches;
next	1.523;

1.523
date	2002.11.13.19.20.24;	author christos;	state Exp;
branches;
next	1.522;

1.522
date	2002.11.07.21.56.56;	author martin;	state Exp;
branches;
next	1.521;

1.521
date	2002.10.27.10.28.39;	author tsutsui;	state Exp;
branches;
next	1.520;

1.520
date	2002.10.24.18.22.53;	author junyoung;	state Exp;
branches;
next	1.519;

1.519
date	2002.10.18.15.11.11;	author junyoung;	state Exp;
branches;
next	1.518;

1.518
date	2002.10.15.18.20.58;	author junyoung;	state Exp;
branches;
next	1.517;

1.517
date	2002.10.08.13.09.05;	author augustss;	state Exp;
branches;
next	1.516;

1.516
date	2002.10.05.16.02.39;	author elric;	state Exp;
branches;
next	1.515;

1.515
date	2002.10.04.16.24.47;	author tsutsui;	state Exp;
branches;
next	1.514;

1.514
date	2002.10.04.03.17.00;	author itojun;	state Exp;
branches;
next	1.513;

1.513
date	2002.10.01.12.56.39;	author fvdl;	state Exp;
branches;
next	1.512;

1.512
date	2002.09.25.11.49.51;	author martti;	state Exp;
branches;
next	1.511;

1.511
date	2002.09.21.15.24.29;	author perry;	state Exp;
branches;
next	1.510;

1.510
date	2002.09.20.10.39.52;	author martti;	state Exp;
branches;
next	1.509;

1.509
date	2002.09.18.02.44.00;	author lukem;	state Exp;
branches;
next	1.508;

1.508
date	2002.09.03.18.55.47;	author augustss;	state Exp;
branches;
next	1.507;

1.507
date	2002.08.12.03.28.52;	author thorpej;	state Exp;
branches;
next	1.506;

1.506
date	2002.08.11.13.50.45;	author isaki;	state Exp;
branches;
next	1.505;

1.505
date	2002.08.11.13.26.28;	author isaki;	state Exp;
branches;
next	1.504;

1.504
date	2002.08.06.12.09.42;	author grant;	state Exp;
branches;
next	1.503;

1.503
date	2002.08.02.05.26.45;	author ichiro;	state Exp;
branches;
next	1.502;

1.502
date	2002.07.22.11.06.00;	author wiz;	state Exp;
branches;
next	1.501;

1.501
date	2002.07.10.08.37.40;	author itojun;	state Exp;
branches;
next	1.500;

1.500
date	2002.07.01.13.19.05;	author christos;	state Exp;
branches;
next	1.499;

1.499
date	2002.06.27.06.34.23;	author junyoung;	state Exp;
branches;
next	1.498;

1.498
date	2002.06.25.03.12.06;	author lukem;	state Exp;
branches;
next	1.497;

1.497
date	2002.06.22.23.13.37;	author fvdl;	state Exp;
branches;
next	1.496;

1.496
date	2002.06.18.03.06.58;	author itojun;	state Exp;
branches;
next	1.495;

1.495
date	2002.06.17.16.33.06;	author christos;	state Exp;
branches;
next	1.494;

1.494
date	2002.06.17.05.14.12;	author lukem;	state Exp;
branches;
next	1.493;

1.493
date	2002.06.06.21.16.48;	author gmcgarry;	state Exp;
branches;
next	1.492;

1.492
date	2002.05.25.17.05.33;	author jmcneill;	state Exp;
branches;
next	1.491;

1.491
date	2002.04.26.02.05.10;	author ad;	state Exp;
branches
	1.491.2.1
	1.491.4.1;
next	1.490;

1.490
date	2002.04.25.15.22.44;	author wiz;	state Exp;
branches;
next	1.489;

1.489
date	2002.04.25.15.06.28;	author atatat;	state Exp;
branches;
next	1.488;

1.488
date	2002.04.25.00.54.54;	author kleink;	state Exp;
branches;
next	1.487;

1.487
date	2002.04.22.21.05.22;	author ad;	state Exp;
branches;
next	1.486;

1.486
date	2002.04.18.12.54.13;	author wiz;	state Exp;
branches;
next	1.485;

1.485
date	2002.04.18.12.06.11;	author bouyer;	state Exp;
branches;
next	1.484;

1.484
date	2002.04.17.02.22.49;	author mycroft;	state Exp;
branches;
next	1.483;

1.483
date	2002.04.15.15.00.18;	author mycroft;	state Exp;
branches;
next	1.482;

1.482
date	2002.04.14.01.42.52;	author mycroft;	state Exp;
branches;
next	1.481;

1.481
date	2002.04.12.17.58.17;	author mycroft;	state Exp;
branches;
next	1.480;

1.480
date	2002.04.12.08.11.01;	author gmcgarry;	state Exp;
branches;
next	1.479;

1.479
date	2002.04.02.20.48.01;	author augustss;	state Exp;
branches;
next	1.478;

1.478
date	2002.03.29.02.25.21;	author itojun;	state Exp;
branches;
next	1.477;

1.477
date	2002.03.29.01.31.28;	author itojun;	state Exp;
branches;
next	1.476;

1.476
date	2002.03.28.21.13.20;	author ichiro;	state Exp;
branches;
next	1.475;

1.475
date	2002.03.19.15.10.21;	author augustss;	state Exp;
branches;
next	1.474;

1.474
date	2002.03.04.13.24.10;	author sommerfeld;	state Exp;
branches;
next	1.473;

1.473
date	2002.02.27.00.31.12;	author jmcneill;	state Exp;
branches;
next	1.472;

1.472
date	2002.02.10.17.36.57;	author wiz;	state Exp;
branches;
next	1.471;

1.471
date	2002.02.08.01.47.59;	author jmcneill;	state Exp;
branches;
next	1.470;

1.470
date	2002.02.06.19.58.02;	author wiz;	state Exp;
branches;
next	1.469;

1.469
date	2002.02.01.15.17.04;	author wiz;	state Exp;
branches;
next	1.468;

1.468
date	2002.01.28.01.23.32;	author augustss;	state Exp;
branches;
next	1.467;

1.467
date	2002.01.27.13.23.18;	author jdolecek;	state Exp;
branches;
next	1.466;

1.466
date	2002.01.19.18.45.10;	author oster;	state Exp;
branches;
next	1.465;

1.465
date	2002.01.17.16.06.49;	author augustss;	state Exp;
branches;
next	1.464;

1.464
date	2002.01.08.04.36.51;	author itojun;	state Exp;
branches;
next	1.463;

1.463
date	2002.01.07.19.34.25;	author jmcneill;	state Exp;
branches;
next	1.462;

1.462
date	2002.01.07.12.12.55;	author tron;	state Exp;
branches;
next	1.461;

1.461
date	2002.01.06.16.07.06;	author jmcneill;	state Exp;
branches;
next	1.460;

1.460
date	2002.01.06.02.45.52;	author jmcneill;	state Exp;
branches;
next	1.459;

1.459
date	2002.01.04.21.04.42;	author augustss;	state Exp;
branches;
next	1.458;

1.458
date	2002.01.03.18.56.40;	author augustss;	state Exp;
branches;
next	1.457;

1.457
date	2002.01.02.04.08.41;	author augustss;	state Exp;
branches;
next	1.456;

1.456
date	2002.01.02.03.23.07;	author augustss;	state Exp;
branches;
next	1.455;

1.455
date	2002.01.01.22.15.43;	author augustss;	state Exp;
branches;
next	1.454;

1.454
date	2002.01.01.21.54.21;	author augustss;	state Exp;
branches;
next	1.453;

1.453
date	2002.01.01.16.52.23;	author hpeyerl;	state Exp;
branches;
next	1.452;

1.452
date	2001.12.28.17.37.03;	author augustss;	state Exp;
branches;
next	1.451;

1.451
date	2001.12.28.12.21.56;	author martin;	state Exp;
branches;
next	1.450;

1.450
date	2001.12.24.13.47.13;	author augustss;	state Exp;
branches;
next	1.449;

1.449
date	2001.12.14.16.24.52;	author augustss;	state Exp;
branches;
next	1.448;

1.448
date	2001.12.14.05.34.48;	author gmcgarry;	state Exp;
branches;
next	1.447;

1.447
date	2001.12.12.15.32.13;	author augustss;	state Exp;
branches;
next	1.446;

1.446
date	2001.12.06.16.51.31;	author soren;	state Exp;
branches;
next	1.445;

1.445
date	2001.12.06.16.35.09;	author augustss;	state Exp;
branches;
next	1.444;

1.444
date	2001.12.05.16.48.03;	author augustss;	state Exp;
branches;
next	1.443;

1.443
date	2001.12.02.16.37.24;	author augustss;	state Exp;
branches;
next	1.442;

1.442
date	2001.12.01.00.09.07;	author bouyer;	state Exp;
branches;
next	1.441;

1.441
date	2001.11.21.17.11.02;	author augustss;	state Exp;
branches;
next	1.440;

1.440
date	2001.11.20.12.56.29;	author lukem;	state Exp;
branches;
next	1.439;

1.439
date	2001.11.20.08.43.24;	author lukem;	state Exp;
branches;
next	1.438;

1.438
date	2001.11.18.03.24.38;	author someya;	state Exp;
branches;
next	1.437;

1.437
date	2001.11.16.13.46.31;	author junyoung;	state Exp;
branches;
next	1.436;

1.436
date	2001.11.13.17.54.51;	author augustss;	state Exp;
branches;
next	1.435;

1.435
date	2001.11.04.09.00.39;	author yamt;	state Exp;
branches;
next	1.434;

1.434
date	2001.11.04.07.39.41;	author itohy;	state Exp;
branches;
next	1.433;

1.433
date	2001.11.03.17.08.56;	author tsutsui;	state Exp;
branches;
next	1.432;

1.432
date	2001.10.17.18.41.20;	author jdolecek;	state Exp;
branches
	1.432.2.1;
next	1.431;

1.431
date	2001.10.13.15.06.12;	author ichiro;	state Exp;
branches;
next	1.430;

1.430
date	2001.10.04.15.51.32;	author augustss;	state Exp;
branches;
next	1.429;

1.429
date	2001.09.30.00.56.51;	author hubertf;	state Exp;
branches;
next	1.428;

1.428
date	2001.09.29.18.47.07;	author augustss;	state Exp;
branches;
next	1.427;

1.427
date	2001.09.21.23.44.21;	author ad;	state Exp;
branches;
next	1.426;

1.426
date	2001.09.14.21.44.21;	author nathanw;	state Exp;
branches;
next	1.425;

1.425
date	2001.09.10.10.19.12;	author fvdl;	state Exp;
branches;
next	1.424;

1.424
date	2001.09.10.10.18.37;	author fvdl;	state Exp;
branches;
next	1.423;

1.423
date	2001.09.10.10.17.29;	author fvdl;	state Exp;
branches;
next	1.422;

1.422
date	2001.09.07.00.18.27;	author lukem;	state Exp;
branches
	1.422.2.1;
next	1.421;

1.421
date	2001.09.06.13.29.29;	author augustss;	state Exp;
branches;
next	1.420;

1.420
date	2001.09.01.21.52.27;	author atatat;	state Exp;
branches;
next	1.419;

1.419
date	2001.08.27.22.25.42;	author augustss;	state Exp;
branches;
next	1.418;

1.418
date	2001.08.27.22.23.47;	author augustss;	state Exp;
branches;
next	1.417;

1.417
date	2001.08.27.12.08.00;	author augustss;	state Exp;
branches;
next	1.416;

1.416
date	2001.08.22.15.28.57;	author hubertf;	state Exp;
branches;
next	1.415;

1.415
date	2001.08.14.13.15.45;	author augustss;	state Exp;
branches;
next	1.414;

1.414
date	2001.07.30.19.59.05;	author ad;	state Exp;
branches;
next	1.413;

1.413
date	2001.07.30.18.03.54;	author jdolecek;	state Exp;
branches;
next	1.412;

1.412
date	2001.07.21.13.22.05;	author jdolecek;	state Exp;
branches;
next	1.411;

1.411
date	2001.07.14.02.00.39;	author christos;	state Exp;
branches;
next	1.410;

1.410
date	2001.07.08.16.32.18;	author abs;	state Exp;
branches
	1.410.2.1;
next	1.409;

1.409
date	2001.07.07.17.09.48;	author tsutsui;	state Exp;
branches;
next	1.408;

1.408
date	2001.06.27.13.40.12;	author darcy;	state Exp;
branches;
next	1.407;

1.407
date	2001.06.18.22.45.54;	author thorpej;	state Exp;
branches;
next	1.406;

1.406
date	2001.06.03.13.46.58;	author tsutsui;	state Exp;
branches;
next	1.405;

1.405
date	2001.05.10.22.12.38;	author tron;	state Exp;
branches;
next	1.404;

1.404
date	2001.05.06.19.55.01;	author ad;	state Exp;
branches;
next	1.403;

1.403
date	2001.04.21.20.49.14;	author fvdl;	state Exp;
branches;
next	1.402;

1.402
date	2001.03.30.14.47.49;	author minoura;	state Exp;
branches;
next	1.401;

1.401
date	2001.03.28.18.45.07;	author ichiro;	state Exp;
branches;
next	1.400;

1.400
date	2001.02.04.17.36.03;	author perry;	state Exp;
branches
	1.400.2.1;
next	1.399;

1.399
date	2001.02.04.17.05.15;	author ad;	state Exp;
branches;
next	1.398;

1.398
date	2001.02.02.10.53.48;	author fvdl;	state Exp;
branches;
next	1.397;

1.397
date	2001.01.30.23.32.35;	author tshiozak;	state Exp;
branches;
next	1.396;

1.396
date	2001.01.28.00.50.23;	author nathanw;	state Exp;
branches;
next	1.395;

1.395
date	2001.01.23.01.44.38;	author augustss;	state Exp;
branches;
next	1.394;

1.394
date	2001.01.23.01.27.23;	author ichiro;	state Exp;
branches;
next	1.393;

1.393
date	2001.01.22.01.39.05;	author augustss;	state Exp;
branches;
next	1.392;

1.392
date	2001.01.16.03.38.23;	author augustss;	state Exp;
branches;
next	1.391;

1.391
date	2001.01.11.06.03.21;	author augustss;	state Exp;
branches;
next	1.390;

1.390
date	2001.01.09.00.40.53;	author lukem;	state Exp;
branches;
next	1.389;

1.389
date	2001.01.08.20.48.11;	author rh;	state Exp;
branches;
next	1.388;

1.388
date	2000.12.22.16.35.51;	author tv;	state Exp;
branches;
next	1.387;

1.387
date	2000.12.20.10.44.29;	author augustss;	state Exp;
branches;
next	1.386;

1.386
date	2000.12.19.10.34.11;	author bouyer;	state Exp;
branches;
next	1.385;

1.385
date	2000.12.17.22.53.52;	author jmc;	state Exp;
branches;
next	1.384;

1.384
date	2000.12.17.20.35.45;	author thorpej;	state Exp;
branches;
next	1.383;

1.383
date	2000.12.14.04.11.26;	author onoe;	state Exp;
branches;
next	1.382;

1.382
date	2000.12.11.23.16.51;	author onoe;	state Exp;
branches;
next	1.381;

1.381
date	2000.11.28.19.44.07;	author augustss;	state Exp;
branches;
next	1.380;

1.380
date	2000.11.28.05.18.42;	author thorpej;	state Exp;
branches;
next	1.379;

1.379
date	2000.11.26.17.44.09;	author ad;	state Exp;
branches;
next	1.378;

1.378
date	2000.11.20.19.53.43;	author jdolecek;	state Exp;
branches;
next	1.377;

1.377
date	2000.11.14.19.52.05;	author augustss;	state Exp;
branches;
next	1.376;

1.376
date	2000.11.08.21.47.25;	author ad;	state Exp;
branches;
next	1.375;

1.375
date	2000.11.08.19.50.07;	author ad;	state Exp;
branches;
next	1.374;

1.374
date	2000.10.19.14.32.20;	author ad;	state Exp;
branches;
next	1.373;

1.373
date	2000.10.15.10.08.00;	author minoura;	state Exp;
branches;
next	1.372;

1.372
date	2000.09.26.11.51.14;	author ad;	state Exp;
branches;
next	1.371;

1.371
date	2000.09.24.15.59.33;	author jdolecek;	state Exp;
branches;
next	1.370;

1.370
date	2000.09.20.18.22.22;	author thorpej;	state Exp;
branches;
next	1.369;

1.369
date	2000.09.10.11.48.38;	author lukem;	state Exp;
branches;
next	1.368;

1.368
date	2000.08.21.07.39.42;	author itohy;	state Exp;
branches;
next	1.367;

1.367
date	2000.08.15.20.09.26;	author ross;	state Exp;
branches;
next	1.366;

1.366
date	2000.08.13.01.31.18;	author itojun;	state Exp;
branches;
next	1.365;

1.365
date	2000.08.10.21.33.18;	author soda;	state Exp;
branches;
next	1.364;

1.364
date	2000.08.04.11.51.37;	author augustss;	state Exp;
branches;
next	1.363;

1.363
date	2000.08.01.08.16.54;	author augustss;	state Exp;
branches;
next	1.362;

1.362
date	2000.07.27.14.34.07;	author mrg;	state Exp;
branches;
next	1.361;

1.361
date	2000.07.18.11.41.32;	author soda;	state Exp;
branches;
next	1.360;

1.360
date	2000.07.17.14.37.53;	author minoura;	state Exp;
branches;
next	1.359;

1.359
date	2000.07.09.00.41.24;	author mycroft;	state Exp;
branches;
next	1.358;

1.358
date	2000.07.05.04.07.25;	author sommerfeld;	state Exp;
branches;
next	1.357;

1.357
date	2000.07.03.01.17.35;	author augustss;	state Exp;
branches;
next	1.356;

1.356
date	2000.06.30.17.10.17;	author itojun;	state Exp;
branches;
next	1.355;

1.355
date	2000.06.22.20.27.52;	author fvdl;	state Exp;
branches;
next	1.354;

1.354
date	2000.06.16.10.31.03;	author hubertf;	state Exp;
branches
	1.354.2.1;
next	1.353;

1.353
date	2000.06.14.22.02.27;	author veego;	state Exp;
branches;
next	1.352;

1.352
date	2000.06.11.02.41.10;	author mycroft;	state Exp;
branches;
next	1.351;

1.351
date	2000.06.11.00.21.01;	author augustss;	state Exp;
branches;
next	1.350;

1.350
date	2000.06.08.21.42.14;	author fvdl;	state Exp;
branches;
next	1.349;

1.349
date	2000.06.05.23.18.51;	author gmcgarry;	state Exp;
branches;
next	1.348;

1.348
date	2000.06.05.13.34.13;	author joda;	state Exp;
branches;
next	1.347;

1.347
date	2000.06.01.04.24.01;	author david;	state Exp;
branches;
next	1.346;

1.346
date	2000.05.28.21.46.04;	author jhawk;	state Exp;
branches;
next	1.345;

1.345
date	2000.05.28.21.12.00;	author jhawk;	state Exp;
branches;
next	1.344;

1.344
date	2000.05.28.20.11.59;	author thorpej;	state Exp;
branches;
next	1.343;

1.343
date	2000.05.28.02.42.16;	author tv;	state Exp;
branches;
next	1.342;

1.342
date	2000.05.25.01.34.18;	author mason;	state Exp;
branches
	1.342.2.1;
next	1.341;

1.341
date	2000.05.22.16.48.41;	author thorpej;	state Exp;
branches;
next	1.340;

1.340
date	2000.05.20.21.34.48;	author augustss;	state Exp;
branches;
next	1.339;

1.339
date	2000.05.19.10.23.36;	author veego;	state Exp;
branches;
next	1.338;

1.338
date	2000.05.17.18.08.50;	author thorpej;	state Exp;
branches;
next	1.337;

1.337
date	2000.05.14.04.36.09;	author jhawk;	state Exp;
branches;
next	1.336;

1.336
date	2000.05.08.18.41.26;	author joda;	state Exp;
branches;
next	1.335;

1.335
date	2000.05.08.13.49.47;	author augustss;	state Exp;
branches;
next	1.334;

1.334
date	2000.05.07.00.44.45;	author wiz;	state Exp;
branches;
next	1.333;

1.333
date	2000.05.04.19.41.44;	author jhawk;	state Exp;
branches;
next	1.332;

1.332
date	2000.05.02.11.00.56;	author augustss;	state Exp;
branches;
next	1.331;

1.331
date	2000.04.30.22.00.54;	author augustss;	state Exp;
branches;
next	1.330;

1.330
date	2000.04.30.19.08.19;	author dante;	state Exp;
branches;
next	1.329;

1.329
date	2000.04.28.17.23.52;	author uch;	state Exp;
branches;
next	1.328;

1.328
date	2000.04.21.17.52.06;	author explorer;	state Exp;
branches;
next	1.327;

1.327
date	2000.04.19.08.44.33;	author haya;	state Exp;
branches;
next	1.326;

1.326
date	2000.04.19.06.50.31;	author itojun;	state Exp;
branches;
next	1.325;

1.325
date	2000.04.14.14.53.32;	author augustss;	state Exp;
branches;
next	1.324;

1.324
date	2000.04.14.14.46.17;	author augustss;	state Exp;
branches;
next	1.323;

1.323
date	2000.04.13.11.20.06;	author joda;	state Exp;
branches;
next	1.322;

1.322
date	2000.04.10.07.58.18;	author haya;	state Exp;
branches;
next	1.321;

1.321
date	2000.04.09.18.34.02;	author augustss;	state Exp;
branches;
next	1.320;

1.320
date	2000.04.03.00.03.30;	author augustss;	state Exp;
branches;
next	1.319;

1.319
date	2000.03.31.04.47.52;	author tsarna;	state Exp;
branches;
next	1.318;

1.318
date	2000.03.30.17.01.01;	author augustss;	state Exp;
branches;
next	1.317;

1.317
date	2000.03.26.15.36.49;	author martin;	state Exp;
branches;
next	1.316;

1.316
date	2000.03.22.11.22.21;	author onoe;	state Exp;
branches;
next	1.315;

1.315
date	2000.03.22.00.58.20;	author cgd;	state Exp;
branches;
next	1.314;

1.314
date	2000.03.19.22.35.43;	author mycroft;	state Exp;
branches;
next	1.313;

1.313
date	2000.03.19.22.32.59;	author mycroft;	state Exp;
branches;
next	1.312;

1.312
date	2000.03.16.15.05.18;	author ad;	state Exp;
branches;
next	1.311;

1.311
date	2000.03.14.22.37.55;	author augustss;	state Exp;
branches;
next	1.310;

1.310
date	2000.03.10.06.03.18;	author groo;	state Exp;
branches;
next	1.309;

1.309
date	2000.03.09.16.49.22;	author hubertf;	state Exp;
branches;
next	1.308;

1.308
date	2000.03.09.04.12.42;	author groo;	state Exp;
branches;
next	1.307;

1.307
date	2000.03.06.18.45.42;	author itojun;	state Exp;
branches;
next	1.306;

1.306
date	2000.03.04.21.37.23;	author mycroft;	state Exp;
branches;
next	1.305;

1.305
date	2000.02.29.06.32.25;	author simonb;	state Exp;
branches;
next	1.304;

1.304
date	2000.02.27.16.51.39;	author augustss;	state Exp;
branches;
next	1.303;

1.303
date	2000.02.26.17.35.37;	author oster;	state Exp;
branches;
next	1.302;

1.302
date	2000.02.26.17.12.37;	author itojun;	state Exp;
branches;
next	1.301;

1.301
date	2000.02.24.18.49.40;	author ad;	state Exp;
branches;
next	1.300;

1.300
date	2000.02.15.17.14.50;	author nathanw;	state Exp;
branches
	1.300.2.1;
next	1.299;

1.299
date	2000.02.03.20.31.42;	author dante;	state Exp;
branches;
next	1.298;

1.298
date	2000.02.02.20.39.35;	author augustss;	state Exp;
branches;
next	1.297;

1.297
date	2000.02.02.20.17.13;	author augustss;	state Exp;
branches;
next	1.296;

1.296
date	2000.02.02.19.48.18;	author augustss;	state Exp;
branches;
next	1.295;

1.295
date	2000.01.25.08.32.01;	author augustss;	state Exp;
branches;
next	1.294;

1.294
date	2000.01.24.01.09.57;	author augustss;	state Exp;
branches;
next	1.293;

1.293
date	2000.01.23.23.46.12;	author hubertf;	state Exp;
branches;
next	1.292;

1.292
date	2000.01.20.19.12.31;	author wrstuden;	state Exp;
branches;
next	1.291;

1.291
date	2000.01.17.17.47.06;	author augustss;	state Exp;
branches;
next	1.290;

1.290
date	2000.01.17.02.04.01;	author augustss;	state Exp;
branches;
next	1.289;

1.289
date	2000.01.16.13.59.38;	author augustss;	state Exp;
branches;
next	1.288;

1.288
date	2000.01.09.17.31.56;	author joda;	state Exp;
branches;
next	1.287;

1.287
date	2000.01.04.06.58.54;	author chopps;	state Exp;
branches;
next	1.286;

1.286
date	99.12.31.00.14.56;	author simonb;	state Exp;
branches;
next	1.285;

1.285
date	99.12.30.04.18.51;	author hubertf;	state Exp;
branches;
next	1.284;

1.284
date	99.12.26.17.07.23;	author itojun;	state Exp;
branches;
next	1.283;

1.283
date	99.12.13.20.22.53;	author augustss;	state Exp;
branches;
next	1.282;

1.282
date	99.12.12.11.53.41;	author soren;	state Exp;
branches;
next	1.281;

1.281
date	99.12.07.19.38.54;	author thorpej;	state Exp;
branches;
next	1.280;

1.280
date	99.11.29.12.56.25;	author itojun;	state Exp;
branches;
next	1.279;

1.279
date	99.11.21.14.00.40;	author itojun;	state Exp;
branches;
next	1.278;

1.278
date	99.11.15.20.10.49;	author augustss;	state Exp;
branches;
next	1.277;

1.277
date	99.11.15.20.03.50;	author dante;	state Exp;
branches;
next	1.276;

1.276
date	99.11.15.19.10.47;	author fvdl;	state Exp;
branches;
next	1.275;

1.275
date	99.11.14.13.31.04;	author drochner;	state Exp;
branches;
next	1.274;

1.274
date	99.11.13.17.57.28;	author perry;	state Exp;
branches;
next	1.273;

1.273
date	99.11.13.17.54.17;	author perry;	state Exp;
branches;
next	1.272;

1.272
date	99.11.10.22.39.45;	author hubertf;	state Exp;
branches;
next	1.271;

1.271
date	99.11.06.16.23.49;	author mycroft;	state Exp;
branches
	1.271.2.1;
next	1.270;

1.270
date	99.11.05.21.36.21;	author thorpej;	state Exp;
branches;
next	1.269;

1.269
date	99.11.04.19.43.13;	author sommerfeld;	state Exp;
branches;
next	1.268;

1.268
date	99.11.01.23.27.56;	author augustss;	state Exp;
branches;
next	1.267;

1.267
date	99.11.01.21.44.35;	author augustss;	state Exp;
branches;
next	1.266;

1.266
date	99.11.01.20.43.13;	author augustss;	state Exp;
branches;
next	1.265;

1.265
date	99.10.25.16.47.03;	author itojun;	state Exp;
branches;
next	1.264;

1.264
date	99.10.08.13.53.00;	author drochner;	state Exp;
branches
	1.264.2.1
	1.264.4.1;
next	1.263;

1.263
date	99.10.06.23.01.45;	author ad;	state Exp;
branches;
next	1.262;

1.262
date	99.10.06.12.21.43;	author drochner;	state Exp;
branches;
next	1.261;

1.261
date	99.10.06.08.13.17;	author itohy;	state Exp;
branches;
next	1.260;

1.260
date	99.09.28.18.07.29;	author thorpej;	state Exp;
branches
	1.260.2.1;
next	1.259;

1.259
date	99.09.27.23.59.50;	author ad;	state Exp;
branches;
next	1.258;

1.258
date	99.09.19.21.50.06;	author ad;	state Exp;
branches;
next	1.257;

1.257
date	99.09.09.12.33.45;	author augustss;	state Exp;
branches;
next	1.256;

1.256
date	99.08.29.16.59.19;	author thorpej;	state Exp;
branches;
next	1.255;

1.255
date	99.08.17.17.48.38;	author drochner;	state Exp;
branches;
next	1.254;

1.254
date	99.08.16.22.27.14;	author augustss;	state Exp;
branches;
next	1.253;

1.253
date	99.08.14.21.20.45;	author augustss;	state Exp;
branches;
next	1.252;

1.252
date	99.08.09.18.13.26;	author bouyer;	state Exp;
branches;
next	1.251;

1.251
date	99.08.05.15.52.11;	author jdolecek;	state Exp;
branches;
next	1.250;

1.250
date	99.08.03.03.23.29;	author thorpej;	state Exp;
branches;
next	1.249;

1.249
date	99.08.02.17.44.59;	author augustss;	state Exp;
branches;
next	1.248;

1.248
date	99.08.02.17.37.41;	author augustss;	state Exp;
branches;
next	1.247;

1.247
date	99.08.01.18.16.35;	author augustss;	state Exp;
branches;
next	1.246;

1.246
date	99.07.29.19.36.59;	author augustss;	state Exp;
branches;
next	1.245;

1.245
date	99.07.29.10.37.17;	author augustss;	state Exp;
branches;
next	1.244;

1.244
date	99.07.22.09.35.06;	author augustss;	state Exp;
branches;
next	1.243;

1.243
date	99.07.21.20.28.45;	author tron;	state Exp;
branches;
next	1.242;

1.242
date	99.07.20.07.40.35;	author christos;	state Exp;
branches;
next	1.241;

1.241
date	99.07.12.15.16.23;	author kleink;	state Exp;
branches;
next	1.240;

1.240
date	99.07.05.22.40.34;	author fvdl;	state Exp;
branches;
next	1.239;

1.239
date	99.07.05.09.14.09;	author fvdl;	state Exp;
branches;
next	1.238;

1.238
date	99.07.03.12.09.52;	author tron;	state Exp;
branches;
next	1.237;

1.237
date	99.06.18.20.27.59;	author augustss;	state Exp;
branches;
next	1.236;

1.236
date	99.06.06.17.37.03;	author dante;	state Exp;
branches;
next	1.235;

1.235
date	99.05.19.14.41.54;	author bouyer;	state Exp;
branches;
next	1.234;

1.234
date	99.05.06.16.29.26;	author christos;	state Exp;
branches;
next	1.233;

1.233
date	99.04.17.16.52.06;	author drochner;	state Exp;
branches;
next	1.232;

1.232
date	99.04.17.16.50.26;	author drochner;	state Exp;
branches;
next	1.231;

1.231
date	99.03.29.21.51.25;	author perry;	state Exp;
branches
	1.231.2.1;
next	1.230;

1.230
date	99.03.29.19.57.34;	author drochner;	state Exp;
branches;
next	1.229;

1.229
date	99.03.27.23.27.58;	author nathanw;	state Exp;
branches;
next	1.228;

1.228
date	99.03.27.11.42.12;	author kleink;	state Exp;
branches;
next	1.227;

1.227
date	99.03.27.07.04.36;	author explorer;	state Exp;
branches;
next	1.226;

1.226
date	99.03.25.17.06.38;	author perry;	state Exp;
branches;
next	1.225;

1.225
date	99.03.25.03.35.26;	author explorer;	state Exp;
branches;
next	1.224;

1.224
date	99.03.25.02.22.21;	author perry;	state Exp;
branches;
next	1.223;

1.223
date	99.03.23.20.08.55;	author bad;	state Exp;
branches;
next	1.222;

1.222
date	99.03.22.23.43.30;	author bad;	state Exp;
branches;
next	1.221;

1.221
date	99.03.16.16.31.54;	author drochner;	state Exp;
branches;
next	1.220;

1.220
date	99.02.16.17.46.17;	author abs;	state Exp;
branches;
next	1.219;

1.219
date	99.02.02.16.18.17;	author bouyer;	state Exp;
branches;
next	1.218;

1.218
date	99.02.01.01.36.21;	author cjs;	state Exp;
branches;
next	1.217;

1.217
date	99.01.30.13.44.25;	author drochner;	state Exp;
branches;
next	1.216;

1.216
date	99.01.29.00.00.17;	author cjs;	state Exp;
branches;
next	1.215;

1.215
date	99.01.23.15.35.21;	author drochner;	state Exp;
branches;
next	1.214;

1.214
date	99.01.22.22.47.16;	author tron;	state Exp;
branches;
next	1.213;

1.213
date	99.01.22.05.40.16;	author sakamoto;	state Exp;
branches;
next	1.212;

1.212
date	99.01.06.23.30.53;	author thorpej;	state Exp;
branches;
next	1.211;

1.211
date	98.12.20.17.56.18;	author nathanw;	state Exp;
branches;
next	1.210;

1.210
date	98.12.16.11.42.07;	author christos;	state Exp;
branches;
next	1.209;

1.209
date	98.12.10.19.01.41;	author augustss;	state Exp;
branches;
next	1.208;

1.208
date	98.12.10.15.46.20;	author augustss;	state Exp;
branches;
next	1.207;

1.207
date	98.12.08.15.52.32;	author augustss;	state Exp;
branches;
next	1.206;

1.206
date	98.12.02.10.54.26;	author bouyer;	state Exp;
branches;
next	1.205;

1.205
date	98.11.23.20.47.03;	author christos;	state Exp;
branches;
next	1.204;

1.204
date	98.11.16.16.44.56;	author oster;	state Exp;
branches;
next	1.203;

1.203
date	98.11.12.21.12.34;	author rvb;	state Exp;
branches;
next	1.202;

1.202
date	98.11.10.14.09.15;	author bouyer;	state Exp;
branches;
next	1.201;

1.201
date	98.11.05.00.38.10;	author thorpej;	state Exp;
branches;
next	1.200;

1.200
date	98.11.04.00.31.59;	author fvdl;	state Exp;
branches;
next	1.199;

1.199
date	98.11.03.23.52.50;	author thorpej;	state Exp;
branches;
next	1.198;

1.198
date	98.11.03.00.12.45;	author thorpej;	state Exp;
branches;
next	1.197;

1.197
date	98.10.30.13.47.02;	author lukem;	state Exp;
branches;
next	1.196;

1.196
date	98.10.25.18.40.17;	author christos;	state Exp;
branches;
next	1.195;

1.195
date	98.10.24.00.46.17;	author thorpej;	state Exp;
branches;
next	1.194;

1.194
date	98.10.22.15.11.39;	author bouyer;	state Exp;
branches;
next	1.193;

1.193
date	98.10.19.12.29.55;	author bouyer;	state Exp;
branches;
next	1.192;

1.192
date	98.10.19.12.06.55;	author bouyer;	state Exp;
branches;
next	1.191;

1.191
date	98.10.13.11.43.50;	author bouyer;	state Exp;
branches;
next	1.190;

1.190
date	98.10.13.03.57.27;	author enami;	state Exp;
branches;
next	1.189;

1.189
date	98.10.12.16.09.13;	author bouyer;	state Exp;
branches;
next	1.188;

1.188
date	98.10.10.21.58.22;	author thorpej;	state Exp;
branches;
next	1.187;

1.187
date	98.10.06.01.44.11;	author rvb;	state Exp;
branches;
next	1.186;

1.186
date	98.09.26.16.38.43;	author dante;	state Exp;
branches;
next	1.185;

1.185
date	98.09.22.01.16.48;	author mycroft;	state Exp;
branches;
next	1.184;

1.184
date	98.09.18.12.22.54;	author drochner;	state Exp;
branches;
next	1.183;

1.183
date	98.09.13.21.02.02;	author hwr;	state Exp;
branches;
next	1.182;

1.182
date	98.09.12.15.05.47;	author rvb;	state Exp;
branches;
next	1.181;

1.181
date	98.09.08.20.56.08;	author rvb;	state Exp;
branches;
next	1.180;

1.180
date	98.08.31.17.58.46;	author thorpej;	state Exp;
branches;
next	1.179;

1.179
date	98.08.26.14.27.44;	author dante;	state Exp;
branches;
next	1.178;

1.178
date	98.08.26.13.37.49;	author augustss;	state Exp;
branches;
next	1.177;

1.177
date	98.08.18.17.03.42;	author mycroft;	state Exp;
branches;
next	1.176;

1.176
date	98.08.17.21.16.10;	author augustss;	state Exp;
branches;
next	1.175;

1.175
date	98.08.13.17.47.56;	author rvb;	state Exp;
branches;
next	1.174;

1.174
date	98.08.12.18.32.18;	author mycroft;	state Exp;
branches;
next	1.173;

1.173
date	98.08.12.18.17.55;	author augustss;	state Exp;
branches;
next	1.172;

1.172
date	98.08.11.00.32.04;	author thorpej;	state Exp;
branches;
next	1.171;

1.171
date	98.08.10.01.54.59;	author mycroft;	state Exp;
branches;
next	1.170;

1.170
date	98.08.07.00.00.56;	author augustss;	state Exp;
branches;
next	1.169;

1.169
date	98.07.29.12.36.47;	author augustss;	state Exp;
branches;
next	1.168;

1.168
date	98.07.27.23.55.23;	author perry;	state Exp;
branches;
next	1.167;

1.167
date	98.07.27.18.42.27;	author bouyer;	state Exp;
branches;
next	1.166;

1.166
date	98.07.27.18.38.08;	author bouyer;	state Exp;
branches;
next	1.165;

1.165
date	98.07.27.13.39.51;	author bouyer;	state Exp;
branches;
next	1.164;

1.164
date	98.07.27.01.51.29;	author thorpej;	state Exp;
branches;
next	1.163;

1.163
date	98.07.26.17.45.53;	author augustss;	state Exp;
branches;
next	1.162;

1.162
date	98.07.12.19.51.56;	author augustss;	state Exp;
branches;
next	1.161;

1.161
date	98.07.09.20.59.38;	author perry;	state Exp;
branches;
next	1.160;

1.160
date	98.06.26.18.58.38;	author cgd;	state Exp;
branches;
next	1.159;

1.159
date	98.06.26.01.53.58;	author lukem;	state Exp;
branches;
next	1.158;

1.158
date	98.06.24.20.58.44;	author sommerfe;	state Exp;
branches;
next	1.157;

1.157
date	98.06.24.05.38.09;	author bouyer;	state Exp;
branches;
next	1.156;

1.156
date	98.06.07.18.34.38;	author sommerfe;	state Exp;
branches;
next	1.155;

1.155
date	98.06.07.02.36.53;	author enami;	state Exp;
branches;
next	1.154;

1.154
date	98.06.07.02.34.41;	author enami;	state Exp;
branches;
next	1.153;

1.153
date	98.06.06.10.14.21;	author augustss;	state Exp;
branches;
next	1.152;

1.152
date	98.06.03.21.17.52;	author mjacob;	state Exp;
branches
	1.152.2.1;
next	1.151;

1.151
date	98.06.03.10.03.25;	author frueauf;	state Exp;
branches;
next	1.150;

1.150
date	98.06.02.01.44.57;	author thorpej;	state Exp;
branches;
next	1.149;

1.149
date	98.05.20.16.25.06;	author augustss;	state Exp;
branches;
next	1.148;

1.148
date	98.05.01.22.00.37;	author augustss;	state Exp;
branches;
next	1.147;

1.147
date	98.04.20.10.58.01;	author drochner;	state Exp;
branches;
next	1.146;

1.146
date	98.04.16.22.01.42;	author drochner;	state Exp;
branches;
next	1.145;

1.145
date	98.04.03.04.35.05;	author enami;	state Exp;
branches;
next	1.144;

1.144
date	98.04.03.04.29.13;	author enami;	state Exp;
branches;
next	1.143;

1.143
date	98.04.03.04.23.50;	author enami;	state Exp;
branches;
next	1.142;

1.142
date	98.03.22.18.18.45;	author drochner;	state Exp;
branches;
next	1.141;

1.141
date	98.03.18.16.34.43;	author bouyer;	state Exp;
branches;
next	1.140;

1.140
date	98.02.27.23.57.31;	author pk;	state Exp;
branches;
next	1.139;

1.139
date	98.02.19.23.21.33;	author mycroft;	state Exp;
branches;
next	1.138;

1.138
date	98.02.19.14.21.57;	author drochner;	state Exp;
branches;
next	1.137;

1.137
date	98.02.13.04.12.33;	author mrg;	state Exp;
branches;
next	1.136;

1.136
date	98.02.06.11.20.31;	author mrg;	state Exp;
branches;
next	1.135;

1.135
date	98.02.06.07.53.27;	author thorpej;	state Exp;
branches;
next	1.134;

1.134
date	98.02.06.07.21.44;	author mrg;	state Exp;
branches;
next	1.133;

1.133
date	98.01.29.01.53.03;	author tron;	state Exp;
branches;
next	1.132;

1.132
date	98.01.23.20.42.34;	author mycroft;	state Exp;
branches;
next	1.131;

1.131
date	98.01.23.01.16.03;	author mycroft;	state Exp;
branches;
next	1.130;

1.130
date	98.01.15.02.26.35;	author cgd;	state Exp;
branches;
next	1.129;

1.129
date	98.01.14.15.27.44;	author drochner;	state Exp;
branches;
next	1.128;

1.128
date	98.01.09.15.18.50;	author drochner;	state Exp;
branches;
next	1.127;

1.127
date	97.12.09.13.32.35;	author tv;	state Exp;
branches;
next	1.126;

1.126
date	97.11.27.09.58.33;	author fvdl;	state Exp;
branches;
next	1.125;

1.125
date	97.11.25.20.29.32;	author kleink;	state Exp;
branches;
next	1.124;

1.124
date	97.11.24.00.21.51;	author thorpej;	state Exp;
branches;
next	1.123;

1.123
date	97.11.17.03.39.42;	author thorpej;	state Exp;
branches;
next	1.122;

1.122
date	97.11.17.01.57.50;	author lukem;	state Exp;
branches;
next	1.121;

1.121
date	97.11.11.20.31.38;	author drochner;	state Exp;
branches;
next	1.120;

1.120
date	97.11.11.05.53.06;	author thorpej;	state Exp;
branches;
next	1.119;

1.119
date	97.11.05.18.13.13;	author thorpej;	state Exp;
branches;
next	1.118;

1.118
date	97.11.03.21.33.33;	author thorpej;	state Exp;
branches;
next	1.117;

1.117
date	97.11.02.01.02.23;	author thorpej;	state Exp;
branches;
next	1.116;

1.116
date	97.10.23.05.49.42;	author mikel;	state Exp;
branches;
next	1.115;

1.115
date	97.10.21.06.01.16;	author bouyer;	state Exp;
branches;
next	1.114;

1.114
date	97.10.20.18.45.09;	author explorer;	state Exp;
branches
	1.114.2.1;
next	1.113;

1.113
date	97.10.20.15.19.51;	author explorer;	state Exp;
branches;
next	1.112;

1.112
date	97.10.19.20.14.21;	author perry;	state Exp;
branches;
next	1.111;

1.111
date	97.10.19.00.00.18;	author perry;	state Exp;
branches;
next	1.110;

1.110
date	97.10.18.01.42.22;	author thorpej;	state Exp;
branches;
next	1.109;

1.109
date	97.10.17.19.25.36;	author bouyer;	state Exp;
branches;
next	1.108;

1.108
date	97.10.17.07.27.02;	author thorpej;	state Exp;
branches;
next	1.107;

1.107
date	97.10.17.07.08.55;	author enami;	state Exp;
branches;
next	1.106;

1.106
date	97.10.17.07.07.26;	author enami;	state Exp;
branches;
next	1.105;

1.105
date	97.10.16.23.32.35;	author thorpej;	state Exp;
branches;
next	1.104;

1.104
date	97.10.14.23.31.00;	author thorpej;	state Exp;
branches;
next	1.103;

1.103
date	97.10.13.00.46.27;	author explorer;	state Exp;
branches;
next	1.102;

1.102
date	97.10.08.10.09.38;	author mycroft;	state Exp;
branches;
next	1.101;

1.101
date	97.10.08.09.32.37;	author mycroft;	state Exp;
branches;
next	1.100;

1.100
date	97.10.07.10.39.56;	author augustss;	state Exp;
branches;
next	1.99;

1.99
date	97.09.12.05.22.55;	author mycroft;	state Exp;
branches;
next	1.98;

1.98
date	97.08.28.08.00.12;	author mikel;	state Exp;
branches;
next	1.97;

1.97
date	97.08.27.11.23.43;	author bouyer;	state Exp;
branches;
next	1.96;

1.96
date	97.08.26.19.26.38;	author augustss;	state Exp;
branches;
next	1.95;

1.95
date	97.08.26.18.39.02;	author fvdl;	state Exp;
branches;
next	1.94;

1.94
date	97.08.23.14.25.55;	author drochner;	state Exp;
branches;
next	1.93;

1.93
date	97.08.20.18.40.35;	author mjacob;	state Exp;
branches;
next	1.92;

1.92
date	97.08.19.23.49.47;	author augustss;	state Exp;
branches;
next	1.91;

1.91
date	97.08.15.21.44.31;	author perry;	state Exp;
branches;
next	1.90;

1.90
date	97.08.14.16.23.41;	author drochner;	state Exp;
branches;
next	1.89;

1.89
date	97.08.03.21.59.11;	author perry;	state Exp;
branches;
next	1.88;

1.88
date	97.08.03.05.26.35;	author mikel;	state Exp;
branches;
next	1.87;

1.87
date	97.07.31.22.03.33;	author matt;	state Exp;
branches;
next	1.86;

1.86
date	97.07.28.22.58.21;	author perry;	state Exp;
branches
	1.86.2.1;
next	1.85;

1.85
date	97.07.16.13.40.24;	author hpeyerl;	state Exp;
branches;
next	1.84;

1.84
date	97.07.13.19.33.29;	author hpeyerl;	state Exp;
branches;
next	1.83;

1.83
date	97.07.02.02.44.10;	author cjs;	state Exp;
branches;
next	1.82;

1.82
date	97.06.25.04.41.16;	author mellon;	state Exp;
branches
	1.82.2.1;
next	1.81;

1.81
date	97.06.12.07.05.49;	author veego;	state Exp;
branches;
next	1.80;

1.80
date	97.06.11.21.05.41;	author perry;	state Exp;
branches;
next	1.79;

1.79
date	97.06.11.10.54.53;	author bouyer;	state Exp;
branches;
next	1.78;

1.78
date	97.06.05.02.27.44;	author thorpej;	state Exp;
branches;
next	1.77;

1.77
date	97.06.02.00.26.49;	author perry;	state Exp;
branches;
next	1.76;

1.76
date	97.05.13.22.48.33;	author jtk;	state Exp;
branches;
next	1.75;

1.75
date	97.04.01.13.12.14;	author mycroft;	state Exp;
branches;
next	1.74;

1.74
date	97.03.26.01.16.23;	author perry;	state Exp;
branches;
next	1.73;

1.73
date	97.03.13.04.15.24;	author cgd;	state Exp;
branches;
next	1.72;

1.72
date	97.02.18.21.07.56;	author mrg;	state Exp;
branches;
next	1.71;

1.71
date	97.01.31.01.50.48;	author thorpej;	state Exp;
branches
	1.71.4.1;
next	1.70;

1.70
date	97.01.22.23.46.59;	author mycroft;	state Exp;
branches;
next	1.69;

1.69
date	97.01.16.23.30.29;	author perry;	state Exp;
branches;
next	1.68;

1.68
date	97.01.16.23.25.03;	author christos;	state Exp;
branches;
next	1.67;

1.67
date	97.01.15.01.28.45;	author perry;	state Exp;
branches;
next	1.66;

1.66
date	97.01.07.11.35.14;	author mrg;	state Exp;
branches
	1.66.2.1;
next	1.65;

1.65
date	97.01.07.08.01.32;	author veego;	state Exp;
branches;
next	1.64;

1.64
date	96.12.07.00.26.02;	author thorpej;	state Exp;
branches;
next	1.63;

1.63
date	96.11.28.03.15.19;	author thorpej;	state Exp;
branches;
next	1.62;

1.62
date	96.11.16.01.16.40;	author fvdl;	state Exp;
branches;
next	1.61;

1.61
date	96.11.15.09.19.33;	author fvdl;	state Exp;
branches;
next	1.60;

1.60
date	96.10.02.23.56.43;	author mycroft;	state Exp;
branches;
next	1.59;

1.59
date	96.10.02.22.20.52;	author mycroft;	state Exp;
branches;
next	1.58;

1.58
date	96.09.24.19.10.41;	author christos;	state Exp;
branches;
next	1.57;

1.57
date	96.09.09.17.18.47;	author mycroft;	state Exp;
branches;
next	1.56;

1.56
date	96.09.09.16.37.08;	author mycroft;	state Exp;
branches;
next	1.55;

1.55
date	96.09.09.16.30.47;	author mycroft;	state Exp;
branches;
next	1.54;

1.54
date	96.08.31.20.43.56;	author mycroft;	state Exp;
branches;
next	1.53;

1.53
date	96.08.31.20.39.17;	author mycroft;	state Exp;
branches;
next	1.52;

1.52
date	96.08.26.23.39.57;	author mrg;	state Exp;
branches;
next	1.51;

1.51
date	96.08.25.23.39.27;	author jtk;	state Exp;
branches;
next	1.50;

1.50
date	96.08.05.21.15.58;	author soda;	state Exp;
branches;
next	1.49;

1.49
date	96.07.14.00.10.11;	author explorer;	state Exp;
branches;
next	1.48;

1.48
date	96.05.20.18.17.23;	author mrg;	state Exp;
branches
	1.48.2.1;
next	1.47;

1.47
date	96.05.20.03.32.16;	author thorpej;	state Exp;
branches;
next	1.46;

1.46
date	96.05.20.00.50.33;	author thorpej;	state Exp;
branches;
next	1.45;

1.45
date	96.05.07.00.59.53;	author thorpej;	state Exp;
branches;
next	1.44;

1.44
date	96.04.25.20.14.13;	author scottr;	state Exp;
branches;
next	1.43;

1.43
date	96.04.25.18.59.14;	author thorpej;	state Exp;
branches;
next	1.42;

1.42
date	96.04.25.02.23.38;	author thorpej;	state Exp;
branches;
next	1.41;

1.41
date	96.04.21.20.55.28;	author ghudson;	state Exp;
branches;
next	1.40;

1.40
date	96.03.30.23.57.09;	author perry;	state Exp;
branches;
next	1.39;

1.39
date	96.03.30.05.42.45;	author mycroft;	state Exp;
branches;
next	1.38;

1.38
date	96.03.25.05.45.18;	author perry;	state Exp;
branches;
next	1.37;

1.37
date	96.03.18.01.46.37;	author jtk;	state Exp;
branches;
next	1.36;

1.36
date	96.03.16.06.09.03;	author thorpej;	state Exp;
branches;
next	1.35;

1.35
date	96.03.12.01.32.47;	author perry;	state Exp;
branches;
next	1.34;

1.34
date	96.03.10.09.03.17;	author cgd;	state Exp;
branches;
next	1.33;

1.33
date	96.03.07.00.48.36;	author jtk;	state Exp;
branches;
next	1.32;

1.32
date	96.03.05.01.32.14;	author thorpej;	state Exp;
branches;
next	1.31;

1.31
date	96.03.04.03.25.52;	author cgd;	state Exp;
branches;
next	1.30;

1.30
date	96.02.28.02.02.32;	author cgd;	state Exp;
branches;
next	1.29;

1.29
date	96.02.27.00.06.53;	author cgd;	state Exp;
branches;
next	1.28;

1.28
date	96.01.13.02.05.24;	author thorpej;	state Exp;
branches;
next	1.27;

1.27
date	95.12.24.00.22.20;	author neil;	state Exp;
branches;
next	1.26;

1.26
date	95.12.14.01.09.59;	author tls;	state Exp;
branches;
next	1.25;

1.25
date	95.11.30.00.58.14;	author jtc;	state Exp;
branches;
next	1.24;

1.24
date	95.11.10.19.34.54;	author christos;	state Exp;
branches;
next	1.23;

1.23
date	95.10.10.01.29.15;	author mycroft;	state Exp;
branches
	1.23.2.1;
next	1.22;

1.22
date	95.10.03.20.18.58;	author mycroft;	state Exp;
branches;
next	1.21;

1.21
date	95.09.14.12.46.42;	author hpeyerl;	state Exp;
branches;
next	1.20;

1.20
date	95.08.22.19.43.14;	author jtc;	state Exp;
branches;
next	1.19;

1.19
date	95.07.24.03.33.12;	author mycroft;	state Exp;
branches;
next	1.18;

1.18
date	95.07.19.19.59.00;	author brezak;	state Exp;
branches;
next	1.17;

1.17
date	95.06.24.20.39.40;	author christos;	state Exp;
branches;
next	1.16;

1.16
date	95.05.12.03.18.05;	author cgd;	state Exp;
branches;
next	1.15;

1.15
date	95.04.17.22.44.38;	author brezak;	state Exp;
branches;
next	1.14;

1.14
date	95.04.17.07.23.34;	author cgd;	state Exp;
branches;
next	1.13;

1.13
date	95.03.05.22.32.54;	author mycroft;	state Exp;
branches;
next	1.12;

1.12
date	95.02.21.01.43.02;	author brezak;	state Exp;
branches;
next	1.11;

1.11
date	95.01.25.04.58.18;	author cgd;	state Exp;
branches;
next	1.10;

1.10
date	95.01.16.12.23.50;	author mycroft;	state Exp;
branches;
next	1.9;

1.9
date	95.01.16.12.00.50;	author mycroft;	state Exp;
branches;
next	1.8;

1.8
date	95.01.11.20.59.50;	author mycroft;	state Exp;
branches;
next	1.7;

1.7
date	94.12.11.16.20.52;	author mycroft;	state Exp;
branches;
next	1.6;

1.6
date	94.11.04.07.36.45;	author mycroft;	state Exp;
branches;
next	1.5;

1.5
date	94.11.03.22.18.40;	author mycroft;	state Exp;
branches;
next	1.4;

1.4
date	94.11.03.20.12.09;	author mycroft;	state Exp;
branches;
next	1.3;

1.3
date	94.11.03.19.09.22;	author mycroft;	state Exp;
branches;
next	1.2;

1.2
date	94.11.03.18.27.13;	author mycroft;	state Exp;
branches;
next	1.1;

1.1
date	94.11.03.18.14.50;	author mycroft;	state Exp;
branches;
next	;

1.1260.2.1
date	2025.10.20.14.09.34;	author martin;	state Exp;
branches;
next	1.1260.2.2;
commitid	bra2brGIH8L9AjfG;

1.1260.2.2
date	2026.02.03.20.51.25;	author snj;	state Exp;
branches;
next	;
commitid	xJf92BKl6kL8oYsG;

1.1256.2.1
date	2025.08.02.05.55.43;	author perseant;	state Exp;
branches;
next	;
commitid	23j6GFaDws3O875G;

1.1243.2.1
date	2023.08.01.16.07.19;	author martin;	state Exp;
branches;
next	1.1243.2.2;
commitid	4QF9bF3y0m0Ni6zE;

1.1243.2.2
date	2023.10.09.23.33.46;	author snj;	state Exp;
branches;
next	1.1243.2.3;
commitid	Gy7Rt3RMsJCGx0IE;

1.1243.2.3
date	2023.11.03.08.56.36;	author martin;	state Exp;
branches;
next	1.1243.2.4;
commitid	AR4S6GRpNaHHT8LE;

1.1243.2.4
date	2024.06.20.11.00.06;	author martin;	state Exp;
branches;
next	1.1243.2.5;
commitid	BLhYSECfRO5HbIeF;

1.1243.2.5
date	2024.10.09.13.25.11;	author martin;	state Exp;
branches;
next	;
commitid	tFVNF0IZFD0fqZsF;

1.1236.4.1
date	2021.06.17.04.46.20;	author thorpej;	state Exp;
branches;
next	;
commitid	d7CrUzY34skBrrXC;

1.1236.6.1
date	2021.05.31.22.15.12;	author cjep;	state Exp;
branches;
next	;
commitid	eWz9SBW0XqKjJlVC;

1.1233.2.1
date	2021.04.03.22.28.27;	author thorpej;	state Exp;
branches;
next	;
commitid	1gqS07EfPjskJTNC;

1.1227.2.1
date	2020.04.20.19.38.11;	author bouyer;	state Exp;
branches;
next	1.1227.2.2;
commitid	ck7WDUgO9fjAY95C;

1.1227.2.2
date	2020.04.25.15.03.18;	author bouyer;	state Exp;
branches;
next	;
commitid	YP7523WS3jqQhM5C;

1.1218.2.1
date	2020.01.25.22.38.40;	author ad;	state Exp;
branches;
next	1.1218.2.2;
commitid	ethRERRmx7bMJ7UB;

1.1218.2.2
date	2020.02.29.20.18.24;	author ad;	state Exp;
branches;
next	;
commitid	3HPOJ2wqM6gUPBYB;

1.1208.2.1
date	2019.08.09.15.59.52;	author martin;	state Exp;
branches;
next	1.1208.2.2;
commitid	WbPqdSkPYkUUXmyB;

1.1208.2.2
date	2019.11.21.18.17.59;	author martin;	state Exp;
branches;
next	1.1208.2.3;
commitid	MmECFs8hRKPpnKLB;

1.1208.2.3
date	2019.11.25.16.44.32;	author martin;	state Exp;
branches;
next	1.1208.2.4;
commitid	zYMlm4CdD6OYJfMB;

1.1208.2.4
date	2019.11.25.20.47.24;	author martin;	state Exp;
branches;
next	1.1208.2.5;
commitid	LP9709JHvDWj5hMB;

1.1208.2.5
date	2020.07.07.10.29.06;	author martin;	state Exp;
branches;
next	1.1208.2.6;
commitid	Ga1ZbzTMoHzNq8fC;

1.1208.2.6
date	2023.02.12.11.43.29;	author martin;	state Exp;
branches;
next	;
commitid	RKBEAYJFIBW4jedE;

1.1180.2.1
date	2019.06.10.22.06.20;	author christos;	state Exp;
branches;
next	1.1180.2.2;
commitid	jtc8rnCzWiEEHGqB;

1.1180.2.2
date	2020.04.08.14.07.39;	author martin;	state Exp;
branches;
next	1.1180.2.3;
commitid	Qli2aW9E74UFuA3C;

1.1180.2.3
date	2020.04.13.08.03.52;	author martin;	state Exp;
branches;
next	;
commitid	X01YhRUPVUDaec4C;

1.1174.2.1
date	2018.04.16.01.59.54;	author pgoyette;	state Exp;
branches;
next	1.1174.2.2;
commitid	qk3nktk0szmTIByA;

1.1174.2.2
date	2018.05.21.04.36.00;	author pgoyette;	state Exp;
branches;
next	1.1174.2.3;
commitid	X5L8kSrBWQcDt7DA;

1.1174.2.3
date	2018.06.25.07.25.42;	author pgoyette;	state Exp;
branches;
next	1.1174.2.4;
commitid	8PtAu9af7VvhiDHA;

1.1174.2.4
date	2018.07.28.04.37.34;	author pgoyette;	state Exp;
branches;
next	1.1174.2.5;
commitid	1UP1xAIUxv1ZgRLA;

1.1174.2.5
date	2018.09.06.06.55.34;	author pgoyette;	state Exp;
branches;
next	1.1174.2.6;
commitid	HCi1bXD317XIK0RA;

1.1174.2.6
date	2018.09.30.01.45.44;	author pgoyette;	state Exp;
branches;
next	1.1174.2.7;
commitid	SQ44grEPCeKPh4UA;

1.1174.2.7
date	2018.11.26.01.52.25;	author pgoyette;	state Exp;
branches;
next	1.1174.2.8;
commitid	Zj4q5SspGdKXto1B;

1.1174.2.8
date	2018.12.26.14.01.38;	author pgoyette;	state Exp;
branches;
next	;
commitid	xUhK8IAeBM1azj5B;

1.1156.2.1
date	2017.07.05.13.58.48;	author martin;	state Exp;
branches;
next	1.1156.2.2;

1.1156.2.2
date	2017.08.01.23.18.30;	author snj;	state Exp;
branches;
next	1.1156.2.3;

1.1156.2.3
date	2017.08.25.05.53.12;	author snj;	state Exp;
branches;
next	1.1156.2.4;
commitid	JHondM7DRYxHyy4A;

1.1156.2.4
date	2017.08.29.09.42.19;	author martin;	state Exp;
branches;
next	1.1156.2.5;
commitid	KV6cyviI22vSG55A;

1.1156.2.5
date	2017.08.31.08.41.33;	author bouyer;	state Exp;
branches;
next	1.1156.2.6;
commitid	H3jwynmAmeJail5A;

1.1156.2.6
date	2017.09.11.05.13.45;	author snj;	state Exp;
branches;
next	1.1156.2.7;
commitid	NZvVkI65HZNgNJ6A;

1.1156.2.7
date	2017.12.04.19.47.05;	author snj;	state Exp;
branches;
next	1.1156.2.8;
commitid	VxKEnKfBrLbvVBhA;

1.1156.2.8
date	2018.04.11.14.23.30;	author martin;	state Exp;
branches;
next	1.1156.2.9;
commitid	q9ShjU00H40q12yA;

1.1156.2.9
date	2018.04.18.14.45.08;	author martin;	state Exp;
branches;
next	1.1156.2.10;
commitid	yXtHkg7uZYYFUVyA;

1.1156.2.10
date	2018.06.09.15.12.21;	author martin;	state Exp;
branches;
next	1.1156.2.11;
commitid	P5M1AKXRxyP6oCFA;

1.1156.2.11
date	2018.09.07.12.27.26;	author martin;	state Exp;
branches;
next	1.1156.2.12;
commitid	kKObzjnYzWWEAaRA;

1.1156.2.12
date	2018.10.31.09.30.10;	author martin;	state Exp;
branches;
next	1.1156.2.13;
commitid	SAkoMMTm28LZR5YA;

1.1156.2.13
date	2018.12.07.17.11.37;	author martin;	state Exp;
branches;
next	1.1156.2.14;
commitid	xhcHIeCy9V3NeT2B;

1.1156.2.14
date	2019.03.09.17.10.20;	author martin;	state Exp;
branches;
next	1.1156.2.15;
commitid	kVHCjjdr7Wv0hIeB;

1.1156.2.15
date	2019.06.12.10.17.32;	author martin;	state Exp;
branches;
next	;
commitid	2hQDQy0pODk4WSqB;

1.1146.2.1
date	2017.04.21.16.53.28;	author bouyer;	state Exp;
branches;
next	;

1.1137.2.1
date	2016.08.06.00.19.04;	author pgoyette;	state Exp;
branches;
next	1.1137.2.2;

1.1137.2.2
date	2016.11.04.14.49.01;	author pgoyette;	state Exp;
branches;
next	1.1137.2.3;

1.1137.2.3
date	2017.01.07.08.56.18;	author pgoyette;	state Exp;
branches;
next	1.1137.2.4;

1.1137.2.4
date	2017.03.20.06.57.14;	author pgoyette;	state Exp;
branches;
next	1.1137.2.5;

1.1137.2.5
date	2017.04.26.02.53.03;	author pgoyette;	state Exp;
branches;
next	;

1.1118.2.1
date	2015.04.06.15.17.57;	author skrll;	state Exp;
branches;
next	1.1118.2.2;

1.1118.2.2
date	2015.06.06.14.40.00;	author skrll;	state Exp;
branches;
next	1.1118.2.3;

1.1118.2.3
date	2015.09.21.07.14.16;	author skrll;	state Exp;
branches;
next	1.1118.2.4;

1.1118.2.4
date	2015.09.22.12.05.44;	author skrll;	state Exp;
branches;
next	1.1118.2.5;

1.1118.2.5
date	2015.12.27.12.09.36;	author skrll;	state Exp;
branches;
next	1.1118.2.6;

1.1118.2.6
date	2016.03.19.11.30.00;	author skrll;	state Exp;
branches;
next	1.1118.2.7;

1.1118.2.7
date	2016.04.22.15.44.10;	author skrll;	state Exp;
branches;
next	1.1118.2.8;

1.1118.2.8
date	2016.05.29.08.44.17;	author skrll;	state Exp;
branches;
next	1.1118.2.9;

1.1118.2.9
date	2016.07.09.20.24.52;	author skrll;	state Exp;
branches;
next	1.1118.2.10;

1.1118.2.10
date	2016.10.05.20.55.28;	author skrll;	state Exp;
branches;
next	1.1118.2.11;

1.1118.2.11
date	2016.12.05.10.54.53;	author skrll;	state Exp;
branches;
next	1.1118.2.12;

1.1118.2.12
date	2017.02.05.13.40.12;	author skrll;	state Exp;
branches;
next	1.1118.2.13;

1.1118.2.13
date	2017.08.28.17.51.40;	author skrll;	state Exp;
branches;
next	;
commitid	UQQpnjvcNkUZn05A;

1.1107.2.1
date	2014.10.10.18.16.37;	author snj;	state Exp;
branches;
next	1.1107.2.2;

1.1107.2.2
date	2014.11.14.15.16.17;	author martin;	state Exp;
branches;
next	1.1107.2.3;

1.1107.2.3
date	2014.11.18.19.05.30;	author snj;	state Exp;
branches;
next	1.1107.2.4;

1.1107.2.4
date	2015.01.20.20.40.50;	author martin;	state Exp;
branches;
next	1.1107.2.5;

1.1107.2.5
date	2015.03.09.09.06.04;	author snj;	state Exp;
branches;
next	1.1107.2.6;

1.1107.2.6
date	2015.03.18.03.57.15;	author snj;	state Exp;
branches;
next	1.1107.2.7;

1.1107.2.7
date	2015.05.15.03.44.18;	author snj;	state Exp;
branches;
next	1.1107.2.8;

1.1107.2.8
date	2015.06.05.16.52.39;	author snj;	state Exp;
branches
	1.1107.2.8.2.1
	1.1107.2.8.4.1;
next	1.1107.2.9;

1.1107.2.9
date	2016.12.09.05.10.45;	author snj;	state Exp;
branches
	1.1107.2.9.2.1;
next	1.1107.2.10;

1.1107.2.10
date	2017.04.05.19.54.17;	author snj;	state Exp;
branches;
next	1.1107.2.11;

1.1107.2.11
date	2017.07.25.19.43.03;	author snj;	state Exp;
branches;
next	1.1107.2.12;

1.1107.2.12
date	2017.08.24.06.52.06;	author snj;	state Exp;
branches;
next	1.1107.2.13;
commitid	SPvGl3qKDtWTUq4A;

1.1107.2.13
date	2018.02.25.21.16.07;	author snj;	state Exp;
branches;
next	;
commitid	Fg9D3IrPNbEDKhsA;

1.1107.2.8.2.1
date	2017.08.24.06.50.16;	author snj;	state Exp;
branches;
next	1.1107.2.8.2.2;
commitid	yytApFvYiH9gUq4A;

1.1107.2.8.2.2
date	2018.02.25.21.15.19;	author snj;	state Exp;
branches;
next	;
commitid	QmNwtWGthc8kKhsA;

1.1107.2.8.4.1
date	2016.09.06.20.33.06;	author skrll;	state Exp;
branches;
next	1.1107.2.8.4.2;

1.1107.2.8.4.2
date	2017.01.18.08.46.25;	author skrll;	state Exp;
branches;
next	;

1.1107.2.9.2.1
date	2017.08.24.06.51.17;	author snj;	state Exp;
branches;
next	1.1107.2.9.2.2;
commitid	xKRhdMA5YWMBUq4A;

1.1107.2.9.2.2
date	2018.02.25.21.15.38;	author snj;	state Exp;
branches;
next	;
commitid	9bjBa1HhQG9tKhsA;

1.1101.2.1
date	2014.08.10.06.53.59;	author tls;	state Exp;
branches;
next	;

1.1095.2.1
date	2013.08.28.23.59.17;	author rmind;	state Exp;
branches;
next	1.1095.2.2;

1.1095.2.2
date	2014.05.18.17.45.12;	author rmind;	state Exp;
branches;
next	;

1.1079.2.1
date	2012.11.20.03.01.25;	author tls;	state Exp;
branches;
next	1.1079.2.2;

1.1079.2.2
date	2013.02.25.00.28.43;	author tls;	state Exp;
branches;
next	1.1079.2.3;

1.1079.2.3
date	2013.06.23.06.20.06;	author tls;	state Exp;
branches;
next	1.1079.2.4;

1.1079.2.4
date	2014.08.20.00.03.06;	author tls;	state Exp;
branches;
next	1.1079.2.5;

1.1079.2.5
date	2017.12.03.11.36.17;	author jdolecek;	state Exp;
branches;
next	;
commitid	XcIYRZTAh1LmerhA;

1.1066.2.1
date	2012.04.23.16.31.35;	author riz;	state Exp;
branches;
next	1.1066.2.2;

1.1066.2.2
date	2012.06.12.17.47.51;	author riz;	state Exp;
branches;
next	1.1066.2.3;

1.1066.2.3
date	2012.06.12.22.07.07;	author riz;	state Exp;
branches;
next	1.1066.2.4;

1.1066.2.4
date	2012.06.14.09.48.46;	author sborrill;	state Exp;
branches;
next	1.1066.2.5;

1.1066.2.5
date	2012.06.15.08.48.46;	author sborrill;	state Exp;
branches;
next	1.1066.2.6;

1.1066.2.6
date	2012.08.12.18.41.35;	author martin;	state Exp;
branches;
next	1.1066.2.7;

1.1066.2.7
date	2012.08.15.15.33.00;	author sborrill;	state Exp;
branches
	1.1066.2.7.4.1
	1.1066.2.7.6.1;
next	1.1066.2.8;

1.1066.2.8
date	2017.08.26.16.26.46;	author snj;	state Exp;
branches;
next	1.1066.2.9;
commitid	2DyayuHO0rE42K4A;

1.1066.2.9
date	2018.05.22.14.38.20;	author martin;	state Exp;
branches;
next	;
commitid	OGSb8OUOhfuAMiDA;

1.1066.2.7.4.1
date	2017.08.26.16.26.06;	author snj;	state Exp;
branches;
next	1.1066.2.7.4.2;
commitid	wwCyEvr4QfwQ1K4A;

1.1066.2.7.4.2
date	2018.05.22.14.49.02;	author martin;	state Exp;
branches;
next	;
commitid	QyAwkt5kT1DoQiDA;

1.1066.2.7.6.1
date	2017.08.26.16.26.29;	author snj;	state Exp;
branches;
next	1.1066.2.7.6.2;
commitid	YHqZgq5C8ouY1K4A;

1.1066.2.7.6.2
date	2018.05.22.14.44.30;	author martin;	state Exp;
branches;
next	;
commitid	hqrMF9QBTlnIOiDA;

1.1058.2.1
date	2012.02.18.07.32.19;	author mrg;	state Exp;
branches;
next	1.1058.2.2;

1.1058.2.2
date	2012.03.11.01.52.22;	author mrg;	state Exp;
branches;
next	1.1058.2.3;

1.1058.2.3
date	2012.04.05.21.33.15;	author mrg;	state Exp;
branches;
next	1.1058.2.4;

1.1058.2.4
date	2012.04.29.23.04.40;	author mrg;	state Exp;
branches;
next	1.1058.2.5;

1.1058.2.5
date	2012.06.02.11.09.00;	author mrg;	state Exp;
branches;
next	;

1.1055.2.1
date	2012.04.17.00.06.27;	author yamt;	state Exp;
branches;
next	1.1055.2.2;

1.1055.2.2
date	2012.05.23.10.07.43;	author yamt;	state Exp;
branches;
next	1.1055.2.3;

1.1055.2.3
date	2012.10.30.17.19.47;	author yamt;	state Exp;
branches;
next	1.1055.2.4;

1.1055.2.4
date	2013.01.16.05.32.58;	author yamt;	state Exp;
branches;
next	1.1055.2.5;

1.1055.2.5
date	2013.01.23.00.05.48;	author yamt;	state Exp;
branches;
next	1.1055.2.6;

1.1055.2.6
date	2014.05.22.11.39.51;	author yamt;	state Exp;
branches;
next	;

1.1032.2.1
date	2011.06.23.14.19.13;	author cherry;	state Exp;
branches;
next	;

1.1007.2.1
date	2011.02.08.16.19.25;	author bouyer;	state Exp;
branches;
next	1.1007.2.2;

1.1007.2.2
date	2011.02.08.19.29.35;	author bouyer;	state Exp;
branches;
next	1.1007.2.3;

1.1007.2.3
date	2011.02.17.11.59.44;	author bouyer;	state Exp;
branches;
next	1.1007.2.4;

1.1007.2.4
date	2011.03.05.15.09.43;	author bouyer;	state Exp;
branches;
next	;

1.1006.2.1
date	2011.06.06.09.05.47;	author jruoho;	state Exp;
branches;
next	;

1.974.2.1
date	2010.05.30.05.16.53;	author rmind;	state Exp;
branches;
next	1.974.2.2;

1.974.2.2
date	2010.07.03.01.19.20;	author rmind;	state Exp;
branches;
next	1.974.2.3;

1.974.2.3
date	2011.03.05.20.50.37;	author rmind;	state Exp;
branches;
next	1.974.2.4;

1.974.2.4
date	2011.04.21.01.41.05;	author rmind;	state Exp;
branches;
next	1.974.2.5;

1.974.2.5
date	2011.05.31.03.04.03;	author rmind;	state Exp;
branches;
next	;

1.963.2.1
date	2010.04.30.14.39.28;	author uebayasi;	state Exp;
branches;
next	1.963.2.2;

1.963.2.2
date	2010.08.17.06.44.34;	author uebayasi;	state Exp;
branches;
next	1.963.2.3;

1.963.2.3
date	2010.10.22.07.21.19;	author uebayasi;	state Exp;
branches;
next	1.963.2.4;

1.963.2.4
date	2010.11.06.08.08.18;	author uebayasi;	state Exp;
branches;
next	1.963.2.5;

1.963.2.5
date	2010.11.09.06.03.37;	author uebayasi;	state Exp;
branches;
next	;

1.925.2.1
date	2009.05.13.17.17.48;	author jym;	state Exp;
branches;
next	1.925.2.2;

1.925.2.2
date	2009.07.23.23.31.35;	author jym;	state Exp;
branches;
next	1.925.2.3;

1.925.2.3
date	2009.11.01.13.58.19;	author jym;	state Exp;
branches;
next	1.925.2.4;

1.925.2.4
date	2011.03.28.23.04.38;	author jym;	state Exp;
branches;
next	1.925.2.5;

1.925.2.5
date	2011.03.29.20.42.58;	author jym;	state Exp;
branches;
next	1.925.2.6;

1.925.2.6
date	2011.05.02.22.49.55;	author jym;	state Exp;
branches;
next	1.925.2.7;

1.925.2.7
date	2011.08.27.15.37.23;	author jym;	state Exp;
branches;
next	;

1.915.2.1
date	2008.11.18.01.56.58;	author snj;	state Exp;
branches;
next	1.915.2.2;

1.915.2.2
date	2009.02.02.22.12.34;	author snj;	state Exp;
branches;
next	1.915.2.3;

1.915.2.3
date	2009.02.19.20.23.46;	author snj;	state Exp;
branches
	1.915.2.3.4.1;
next	1.915.2.4;

1.915.2.4
date	2009.05.01.01.20.42;	author snj;	state Exp;
branches;
next	1.915.2.5;

1.915.2.5
date	2009.05.03.23.45.46;	author snj;	state Exp;
branches;
next	1.915.2.6;

1.915.2.6
date	2009.09.13.22.11.14;	author snj;	state Exp;
branches;
next	1.915.2.7;

1.915.2.7
date	2009.09.26.19.52.09;	author snj;	state Exp;
branches;
next	1.915.2.8;

1.915.2.8
date	2009.10.05.11.37.13;	author sborrill;	state Exp;
branches;
next	1.915.2.9;

1.915.2.9
date	2009.10.08.09.47.09;	author sborrill;	state Exp;
branches;
next	1.915.2.10;

1.915.2.10
date	2009.10.28.09.03.42;	author bouyer;	state Exp;
branches;
next	1.915.2.11;

1.915.2.11
date	2010.11.21.03.05.05;	author riz;	state Exp;
branches;
next	1.915.2.12;

1.915.2.12
date	2012.01.25.21.18.14;	author riz;	state Exp;
branches;
next	1.915.2.13;

1.915.2.13
date	2012.09.28.10.58.15;	author sborrill;	state Exp;
branches;
next	1.915.2.14;

1.915.2.14
date	2013.06.19.07.50.14;	author bouyer;	state Exp;
branches;
next	;

1.915.2.3.4.1
date	2010.04.21.00.33.50;	author matt;	state Exp;
branches;
next	;

1.914.2.1
date	2009.01.19.13.16.15;	author skrll;	state Exp;
branches;
next	1.914.2.2;

1.914.2.2
date	2009.03.03.18.28.59;	author skrll;	state Exp;
branches;
next	1.914.2.3;

1.914.2.3
date	2009.04.28.07.34.07;	author skrll;	state Exp;
branches;
next	;

1.901.2.1
date	2008.10.19.22.15.48;	author haad;	state Exp;
branches;
next	1.901.2.2;

1.901.2.2
date	2008.12.13.01.13.13;	author haad;	state Exp;
branches;
next	;

1.900.2.1
date	2008.06.10.14.51.21;	author simonb;	state Exp;
branches;
next	1.900.2.2;

1.900.2.2
date	2008.06.18.16.32.41;	author simonb;	state Exp;
branches;
next	;

1.894.2.1
date	2008.06.23.04.30.26;	author wrstuden;	state Exp;
branches;
next	1.894.2.2;

1.894.2.2
date	2008.09.18.04.33.27;	author wrstuden;	state Exp;
branches;
next	1.894.2.3;

1.894.2.3
date	2008.09.24.16.38.49;	author wrstuden;	state Exp;
branches;
next	1.894.2.4;

1.894.2.4
date	2008.10.10.22.29.04;	author skrll;	state Exp;
branches;
next	;

1.890.2.1
date	2008.05.16.02.22.32;	author yamt;	state Exp;
branches;
next	1.890.2.2;

1.890.2.2
date	2009.05.04.08.11.15;	author yamt;	state Exp;
branches;
next	1.890.2.3;

1.890.2.3
date	2009.08.19.18.46.18;	author yamt;	state Exp;
branches;
next	1.890.2.4;

1.890.2.4
date	2009.09.16.13.37.39;	author yamt;	state Exp;
branches;
next	1.890.2.5;

1.890.2.5
date	2010.03.11.15.02.27;	author yamt;	state Exp;
branches;
next	1.890.2.6;

1.890.2.6
date	2010.08.11.22.52.10;	author yamt;	state Exp;
branches;
next	1.890.2.7;

1.890.2.7
date	2010.10.09.03.31.46;	author yamt;	state Exp;
branches;
next	;

1.889.2.1
date	2008.05.18.12.32.09;	author yamt;	state Exp;
branches;
next	1.889.2.2;

1.889.2.2
date	2008.06.04.02.04.46;	author yamt;	state Exp;
branches;
next	1.889.2.3;

1.889.2.3
date	2008.06.17.09.14.01;	author yamt;	state Exp;
branches;
next	;

1.881.2.1
date	2008.03.24.07.14.58;	author keiichi;	state Exp;
branches;
next	;

1.881.6.1
date	2008.04.03.12.42.17;	author mjf;	state Exp;
branches;
next	1.881.6.2;

1.881.6.2
date	2008.06.02.13.22.13;	author mjf;	state Exp;
branches;
next	1.881.6.3;

1.881.6.3
date	2008.06.29.09.32.57;	author mjf;	state Exp;
branches;
next	1.881.6.4;

1.881.6.4
date	2008.09.28.10.39.58;	author mjf;	state Exp;
branches;
next	1.881.6.5;

1.881.6.5
date	2008.10.05.20.11.26;	author mjf;	state Exp;
branches;
next	1.881.6.6;

1.881.6.6
date	2009.01.17.13.28.02;	author mjf;	state Exp;
branches;
next	;

1.867.2.1
date	2008.01.02.21.48.09;	author bouyer;	state Exp;
branches;
next	1.867.2.2;

1.867.2.2
date	2008.01.08.22.09.52;	author bouyer;	state Exp;
branches;
next	1.867.2.3;

1.867.2.3
date	2008.01.10.23.43.18;	author bouyer;	state Exp;
branches;
next	1.867.2.4;

1.867.2.4
date	2008.01.19.12.14.15;	author bouyer;	state Exp;
branches;
next	1.867.2.5;

1.867.2.5
date	2008.01.23.19.27.15;	author bouyer;	state Exp;
branches;
next	;

1.866.2.1
date	2007.12.11.15.20.28;	author yamt;	state Exp;
branches;
next	;

1.864.2.1
date	2007.12.08.17.56.22;	author ad;	state Exp;
branches;
next	1.864.2.2;

1.864.2.2
date	2007.12.26.21.38.44;	author ad;	state Exp;
branches;
next	;

1.859.2.1
date	2007.11.19.00.46.18;	author mjf;	state Exp;
branches;
next	1.859.2.2;

1.859.2.2
date	2007.12.08.18.17.06;	author mjf;	state Exp;
branches;
next	1.859.2.3;

1.859.2.3
date	2007.12.27.00.43.00;	author mjf;	state Exp;
branches;
next	1.859.2.4;

1.859.2.4
date	2008.02.18.21.04.37;	author mjf;	state Exp;
branches;
next	;

1.852.2.1
date	2007.11.13.15.58.29;	author bouyer;	state Exp;
branches;
next	1.852.2.2;

1.852.2.2
date	2007.11.18.19.34.15;	author bouyer;	state Exp;
branches;
next	1.852.2.3;

1.852.2.3
date	2007.11.22.15.18.21;	author bouyer;	state Exp;
branches;
next	;

1.851.2.1
date	2007.10.06.15.34.49;	author yamt;	state Exp;
branches;
next	;

1.844.2.1
date	2007.11.06.23.17.10;	author matt;	state Exp;
branches;
next	1.844.2.2;

1.844.2.2
date	2008.01.09.01.46.27;	author matt;	state Exp;
branches;
next	1.844.2.3;

1.844.2.3
date	2008.03.23.02.04.05;	author matt;	state Exp;
branches;
next	;

1.839.4.1
date	2007.08.09.02.36.54;	author jmcneill;	state Exp;
branches;
next	1.839.4.2;

1.839.4.2
date	2007.09.03.16.47.21;	author jmcneill;	state Exp;
branches;
next	1.839.4.3;

1.839.4.3
date	2007.09.06.00.06.16;	author joerg;	state Exp;
branches;
next	1.839.4.4;

1.839.4.4
date	2007.10.02.18.27.06;	author joerg;	state Exp;
branches;
next	1.839.4.5;

1.839.4.5
date	2007.10.02.21.44.08;	author joerg;	state Exp;
branches;
next	1.839.4.6;

1.839.4.6
date	2007.10.28.20.10.37;	author joerg;	state Exp;
branches;
next	1.839.4.7;

1.839.4.7
date	2007.10.29.02.57.20;	author joerg;	state Exp;
branches;
next	1.839.4.8;

1.839.4.8
date	2007.10.31.23.13.59;	author joerg;	state Exp;
branches;
next	1.839.4.9;

1.839.4.9
date	2007.11.04.21.02.57;	author jmcneill;	state Exp;
branches;
next	1.839.4.10;

1.839.4.10
date	2007.11.14.19.04.08;	author joerg;	state Exp;
branches;
next	1.839.4.11;

1.839.4.11
date	2007.11.21.21.53.09;	author joerg;	state Exp;
branches;
next	1.839.4.12;

1.839.4.12
date	2007.11.27.19.35.38;	author joerg;	state Exp;
branches;
next	1.839.4.13;

1.839.4.13
date	2007.12.03.16.14.01;	author joerg;	state Exp;
branches;
next	1.839.4.14;

1.839.4.14
date	2007.12.09.19.35.19;	author jmcneill;	state Exp;
branches;
next	;

1.838.2.1
date	2007.08.07.18.05.18;	author matt;	state Exp;
branches;
next	;

1.838.4.1
date	2007.08.15.13.47.21;	author skrll;	state Exp;
branches;
next	1.838.4.2;

1.838.4.2
date	2007.09.03.10.19.01;	author skrll;	state Exp;
branches;
next	1.838.4.3;

1.838.4.3
date	2007.09.10.10.54.20;	author skrll;	state Exp;
branches;
next	;

1.824.2.1
date	2007.05.22.17.26.56;	author matt;	state Exp;
branches;
next	1.824.2.2;

1.824.2.2
date	2007.06.26.18.12.31;	author garbled;	state Exp;
branches;
next	1.824.2.3;

1.824.2.3
date	2007.10.03.19.23.35;	author garbled;	state Exp;
branches;
next	;

1.819.2.1
date	2007.03.29.19.27.26;	author reinoud;	state Exp;
branches;
next	;

1.816.2.1
date	2007.03.13.16.49.58;	author ad;	state Exp;
branches;
next	1.816.2.2;

1.816.2.2
date	2007.04.10.13.23.01;	author ad;	state Exp;
branches;
next	1.816.2.3;

1.816.2.3
date	2007.05.27.12.27.27;	author ad;	state Exp;
branches;
next	1.816.2.4;

1.816.2.4
date	2007.06.09.23.55.06;	author ad;	state Exp;
branches;
next	1.816.2.5;

1.816.2.5
date	2007.07.15.13.16.07;	author ad;	state Exp;
branches;
next	1.816.2.6;

1.816.2.6
date	2007.08.20.18.38.07;	author ad;	state Exp;
branches;
next	1.816.2.7;

1.816.2.7
date	2007.10.09.13.37.48;	author ad;	state Exp;
branches;
next	1.816.2.8;

1.816.2.8
date	2007.12.03.18.36.23;	author ad;	state Exp;
branches;
next	1.816.2.9;

1.816.2.9
date	2007.12.03.19.03.22;	author ad;	state Exp;
branches;
next	;

1.816.4.1
date	2007.07.11.19.59.45;	author mjf;	state Exp;
branches;
next	;

1.808.2.1
date	2007.02.17.00.28.23;	author rmind;	state dead;
branches;
next	1.808.2.2;

1.808.2.2
date	2007.02.20.21.48.43;	author rmind;	state Exp;
branches;
next	1.808.2.3;

1.808.2.3
date	2007.02.21.11.57.28;	author yamt;	state Exp;
branches;
next	1.808.2.4;

1.808.2.4
date	2007.02.27.16.51.32;	author yamt;	state Exp;
branches;
next	1.808.2.5;

1.808.2.5
date	2007.03.12.05.48.19;	author rmind;	state Exp;
branches;
next	1.808.2.6;

1.808.2.6
date	2007.03.24.14.54.43;	author yamt;	state Exp;
branches;
next	1.808.2.7;

1.808.2.7
date	2007.04.15.16.02.46;	author yamt;	state Exp;
branches;
next	1.808.2.8;

1.808.2.8
date	2007.05.07.10.54.55;	author yamt;	state Exp;
branches;
next	1.808.2.9;

1.808.2.9
date	2007.05.17.13.40.56;	author yamt;	state Exp;
branches;
next	;

1.799.2.1
date	2006.12.21.12.46.20;	author tron;	state Exp;
branches;
next	1.799.2.2;

1.799.2.2
date	2006.12.21.13.44.00;	author tron;	state Exp;
branches;
next	1.799.2.3;

1.799.2.3
date	2007.01.28.20.05.41;	author tron;	state Exp;
branches;
next	1.799.2.4;

1.799.2.4
date	2007.03.10.19.23.41;	author riz;	state Exp;
branches;
next	1.799.2.5;

1.799.2.5
date	2007.03.22.20.00.09;	author jdc;	state Exp;
branches;
next	1.799.2.6;

1.799.2.6
date	2007.05.08.10.45.07;	author pavel;	state Exp;
branches;
next	1.799.2.7;

1.799.2.7
date	2007.05.13.06.52.51;	author pavel;	state Exp;
branches
	1.799.2.7.2.1;
next	1.799.2.8;

1.799.2.8
date	2007.06.05.20.49.58;	author bouyer;	state Exp;
branches;
next	1.799.2.9;

1.799.2.9
date	2007.06.19.09.26.30;	author liamjfoy;	state Exp;
branches;
next	1.799.2.10;

1.799.2.10
date	2007.06.21.13.54.11;	author liamjfoy;	state Exp;
branches;
next	1.799.2.11;

1.799.2.11
date	2007.08.25.09.00.07;	author liamjfoy;	state Exp;
branches;
next	1.799.2.12;

1.799.2.12
date	2007.08.29.18.34.16;	author liamjfoy;	state Exp;
branches;
next	1.799.2.13;

1.799.2.13
date	2007.08.31.20.09.27;	author pavel;	state Exp;
branches;
next	1.799.2.14;

1.799.2.14
date	2007.09.27.22.04.27;	author xtraeme;	state Exp;
branches;
next	1.799.2.15;

1.799.2.15
date	2007.11.26.21.35.47;	author xtraeme;	state Exp;
branches;
next	1.799.2.16;

1.799.2.16
date	2008.01.11.17.03.17;	author xtraeme;	state Exp;
branches;
next	1.799.2.17;

1.799.2.17
date	2008.04.19.15.57.56;	author bouyer;	state Exp;
branches;
next	1.799.2.18;

1.799.2.18
date	2009.03.24.21.25.02;	author bouyer;	state Exp;
branches;
next	;

1.799.2.7.2.1
date	2007.09.03.07.03.31;	author wrstuden;	state Exp;
branches;
next	1.799.2.7.2.2;

1.799.2.7.2.2
date	2007.09.30.03.39.01;	author wrstuden;	state Exp;
branches;
next	1.799.2.7.2.3;

1.799.2.7.2.3
date	2008.01.06.05.00.56;	author wrstuden;	state Exp;
branches;
next	1.799.2.7.2.4;

1.799.2.7.2.4
date	2008.06.03.20.47.14;	author skrll;	state Exp;
branches;
next	;

1.781.2.1
date	2006.10.22.06.04.43;	author yamt;	state Exp;
branches;
next	1.781.2.2;

1.781.2.2
date	2006.12.10.07.16.02;	author yamt;	state Exp;
branches;
next	1.781.2.3;

1.781.2.3
date	2006.12.18.11.42.04;	author yamt;	state Exp;
branches;
next	;

1.779.2.1
date	2006.11.18.21.29.18;	author ad;	state Exp;
branches;
next	1.779.2.2;

1.779.2.2
date	2007.02.01.08.48.00;	author ad;	state Exp;
branches;
next	1.779.2.3;

1.779.2.3
date	2007.02.06.15.04.17;	author ad;	state Exp;
branches;
next	1.779.2.4;

1.779.2.4
date	2007.02.06.16.55.40;	author ad;	state Exp;
branches;
next	;

1.772.2.1
date	2006.08.14.13.41.26;	author tron;	state Exp;
branches;
next	1.772.2.2;

1.772.2.2
date	2006.09.14.21.16.33;	author riz;	state Exp;
branches;
next	1.772.2.3;

1.772.2.3
date	2006.09.15.11.58.46;	author tron;	state Exp;
branches;
next	1.772.2.4;

1.772.2.4
date	2006.09.23.23.46.02;	author snj;	state Exp;
branches;
next	;

1.755.2.1
date	2006.07.13.17.48.52;	author gdamore;	state Exp;
branches;
next	;

1.752.2.1
date	2006.06.19.03.44.03;	author chap;	state Exp;
branches;
next	1.752.2.2;

1.752.2.2
date	2006.06.22.03.39.47;	author chap;	state Exp;
branches;
next	;

1.733.2.1
date	2006.03.28.09.47.16;	author tron;	state Exp;
branches;
next	1.733.2.2;

1.733.2.2
date	2006.03.31.09.45.02;	author tron;	state Exp;
branches;
next	1.733.2.3;

1.733.2.3
date	2006.05.24.15.47.57;	author tron;	state Exp;
branches;
next	;

1.732.2.1
date	2006.04.19.02.32.44;	author elad;	state Exp;
branches;
next	1.732.2.2;

1.732.2.2
date	2006.05.11.23.26.20;	author elad;	state Exp;
branches;
next	;

1.731.2.1
date	2006.03.13.09.06.53;	author yamt;	state Exp;
branches;
next	1.731.2.2;

1.731.2.2
date	2006.04.01.12.06.18;	author yamt;	state Exp;
branches;
next	1.731.2.3;

1.731.2.3
date	2006.04.11.11.53.27;	author yamt;	state Exp;
branches;
next	1.731.2.4;

1.731.2.4
date	2006.05.24.10.56.51;	author yamt;	state Exp;
branches;
next	1.731.2.5;

1.731.2.5
date	2006.06.26.12.44.38;	author yamt;	state Exp;
branches;
next	1.731.2.6;

1.731.2.6
date	2006.08.11.15.41.53;	author yamt;	state Exp;
branches;
next	1.731.2.7;

1.731.2.7
date	2006.09.03.15.22.58;	author yamt;	state Exp;
branches;
next	1.731.2.8;

1.731.2.8
date	2006.09.14.12.31.10;	author yamt;	state Exp;
branches;
next	;

1.723.2.1
date	2006.02.28.20.25.08;	author kardel;	state Exp;
branches;
next	1.723.2.2;

1.723.2.2
date	2006.04.22.11.37.32;	author simonb;	state Exp;
branches;
next	1.723.2.3;

1.723.2.3
date	2006.06.01.22.34.33;	author kardel;	state Exp;
branches;
next	1.723.2.4;

1.723.2.4
date	2006.06.07.15.49.38;	author kardel;	state Exp;
branches;
next	;

1.721.2.1
date	2006.09.09.02.39.53;	author rpaulo;	state Exp;
branches;
next	;

1.714.2.1
date	2006.01.15.10.02.37;	author yamt;	state Exp;
branches;
next	1.714.2.2;

1.714.2.2
date	2006.02.01.14.51.28;	author yamt;	state Exp;
branches;
next	1.714.2.3;

1.714.2.3
date	2006.02.18.15.38.35;	author yamt;	state Exp;
branches;
next	1.714.2.4;

1.714.2.4
date	2006.03.01.09.27.54;	author yamt;	state Exp;
branches;
next	;

1.706.6.1
date	2005.11.29.21.22.58;	author yamt;	state Exp;
branches;
next	;

1.683.2.1
date	2006.06.21.14.52.09;	author yamt;	state Exp;
branches;
next	1.683.2.2;

1.683.2.2
date	2006.12.30.20.46.04;	author yamt;	state Exp;
branches;
next	1.683.2.3;

1.683.2.3
date	2007.02.26.09.06.50;	author yamt;	state Exp;
branches;
next	1.683.2.4;

1.683.2.4
date	2007.09.03.14.26.29;	author yamt;	state Exp;
branches;
next	1.683.2.5;

1.683.2.5
date	2007.10.27.11.26.22;	author yamt;	state Exp;
branches;
next	1.683.2.6;

1.683.2.6
date	2007.11.15.11.42.47;	author yamt;	state Exp;
branches;
next	1.683.2.7;

1.683.2.7
date	2007.12.07.17.24.54;	author yamt;	state Exp;
branches;
next	1.683.2.8;

1.683.2.8
date	2008.01.21.09.36.49;	author yamt;	state Exp;
branches;
next	1.683.2.9;

1.683.2.9
date	2008.02.04.09.22.00;	author yamt;	state Exp;
branches;
next	1.683.2.10;

1.683.2.10
date	2008.03.17.09.14.20;	author yamt;	state Exp;
branches;
next	;

1.661.2.1
date	2005.04.17.11.44.31;	author tron;	state Exp;
branches;
next	1.661.2.2;

1.661.2.2
date	2005.06.10.14.49.03;	author tron;	state Exp;
branches;
next	1.661.2.3;

1.661.2.3
date	2005.06.10.15.05.46;	author tron;	state Exp;
branches;
next	1.661.2.4;

1.661.2.4
date	2005.07.02.16.35.18;	author tron;	state Exp;
branches;
next	1.661.2.5;

1.661.2.5
date	2005.07.18.21.12.51;	author riz;	state Exp;
branches;
next	1.661.2.6;

1.661.2.6
date	2005.08.14.21.13.40;	author riz;	state Exp;
branches;
next	1.661.2.7;

1.661.2.7
date	2005.09.15.23.33.43;	author snj;	state Exp;
branches;
next	1.661.2.8;

1.661.2.8
date	2005.10.28.20.12.42;	author jmc;	state Exp;
branches
	1.661.2.8.2.1;
next	1.661.2.9;

1.661.2.9
date	2006.02.20.23.09.01;	author tron;	state Exp;
branches;
next	1.661.2.10;

1.661.2.10
date	2006.04.20.03.17.32;	author snj;	state Exp;
branches;
next	1.661.2.11;

1.661.2.11
date	2006.04.20.14.30.29;	author tron;	state Exp;
branches;
next	1.661.2.12;

1.661.2.12
date	2006.05.04.12.12.08;	author tron;	state Exp;
branches;
next	1.661.2.13;

1.661.2.13
date	2006.05.20.12.25.39;	author tron;	state Exp;
branches;
next	1.661.2.14;

1.661.2.14
date	2006.07.31.12.35.22;	author tron;	state Exp;
branches
	1.661.2.14.2.1;
next	1.661.2.15;

1.661.2.15
date	2006.12.23.14.43.45;	author ghen;	state Exp;
branches;
next	1.661.2.16;

1.661.2.16
date	2006.12.23.16.43.18;	author ghen;	state Exp;
branches;
next	1.661.2.17;

1.661.2.17
date	2007.01.08.16.36.20;	author ghen;	state Exp;
branches;
next	1.661.2.18;

1.661.2.18
date	2007.03.03.23.30.21;	author bouyer;	state Exp;
branches;
next	1.661.2.19;

1.661.2.19
date	2007.03.31.15.25.33;	author bouyer;	state Exp;
branches;
next	1.661.2.20;

1.661.2.20
date	2007.08.28.13.49.44;	author ghen;	state Exp;
branches;
next	1.661.2.21;

1.661.2.21
date	2007.10.15.05.09.55;	author riz;	state Exp;
branches;
next	;

1.661.2.8.2.1
date	2007.08.28.13.52.51;	author ghen;	state Exp;
branches;
next	;

1.661.2.14.2.1
date	2007.08.28.13.54.04;	author ghen;	state Exp;
branches;
next	;

1.652.2.1
date	2005.02.12.18.17.33;	author yamt;	state Exp;
branches;
next	1.652.2.2;

1.652.2.2
date	2005.03.19.08.33.01;	author yamt;	state Exp;
branches;
next	1.652.2.3;

1.652.2.3
date	2005.03.26.18.19.17;	author yamt;	state Exp;
branches;
next	;

1.649.2.1
date	2005.04.29.11.28.11;	author kent;	state Exp;
branches;
next	;

1.595.2.1
date	2004.04.30.03.41.59;	author jmc;	state Exp;
branches;
next	1.595.2.2;

1.595.2.2
date	2004.05.05.15.30.00;	author tron;	state Exp;
branches;
next	1.595.2.3;

1.595.2.3
date	2004.06.07.09.45.49;	author tron;	state Exp;
branches;
next	1.595.2.4;

1.595.2.4
date	2004.06.14.03.18.51;	author jmc;	state Exp;
branches;
next	1.595.2.5;

1.595.2.5
date	2004.06.30.21.08.45;	author jdc;	state Exp;
branches;
next	1.595.2.6;

1.595.2.6
date	2004.07.10.03.57.27;	author grant;	state Exp;
branches;
next	1.595.2.7;

1.595.2.7
date	2004.07.13.09.27.14;	author tron;	state Exp;
branches;
next	1.595.2.8;

1.595.2.8
date	2004.07.14.09.05.52;	author tron;	state Exp;
branches;
next	1.595.2.9;

1.595.2.9
date	2004.07.15.20.19.45;	author he;	state Exp;
branches;
next	1.595.2.10;

1.595.2.10
date	2004.07.23.23.33.20;	author he;	state Exp;
branches;
next	1.595.2.11;

1.595.2.11
date	2004.08.30.09.52.37;	author tron;	state Exp;
branches
	1.595.2.11.2.1;
next	1.595.2.12;

1.595.2.12
date	2007.08.11.14.49.07;	author bouyer;	state Exp;
branches;
next	;

1.595.2.11.2.1
date	2005.04.02.21.30.30;	author he;	state Exp;
branches;
next	1.595.2.11.2.2;

1.595.2.11.2.2
date	2005.07.21.19.27.58;	author riz;	state Exp;
branches
	1.595.2.11.2.2.2.1;
next	1.595.2.11.2.3;

1.595.2.11.2.3
date	2007.08.11.14.46.21;	author bouyer;	state Exp;
branches;
next	;

1.595.2.11.2.2.2.1
date	2007.08.11.14.40.08;	author bouyer;	state Exp;
branches;
next	;

1.564.2.1
date	2003.07.02.15.25.20;	author darrenr;	state Exp;
branches;
next	1.564.2.2;

1.564.2.2
date	2004.08.03.10.35.47;	author skrll;	state Exp;
branches;
next	1.564.2.3;

1.564.2.3
date	2004.08.05.20.23.05;	author skrll;	state Exp;
branches;
next	1.564.2.4;

1.564.2.4
date	2004.08.12.11.41.11;	author skrll;	state Exp;
branches;
next	1.564.2.5;

1.564.2.5
date	2004.09.03.12.44.47;	author skrll;	state Exp;
branches;
next	1.564.2.6;

1.564.2.6
date	2004.09.18.14.35.22;	author skrll;	state Exp;
branches;
next	1.564.2.7;

1.564.2.7
date	2004.09.21.13.16.35;	author skrll;	state Exp;
branches;
next	1.564.2.8;

1.564.2.8
date	2004.10.19.15.56.35;	author skrll;	state Exp;
branches;
next	1.564.2.9;

1.564.2.9
date	2004.11.02.07.50.34;	author skrll;	state Exp;
branches;
next	1.564.2.10;

1.564.2.10
date	2004.11.03.16.40.13;	author skrll;	state Exp;
branches;
next	1.564.2.11;

1.564.2.11
date	2004.11.14.08.15.16;	author skrll;	state Exp;
branches;
next	1.564.2.12;

1.564.2.12
date	2004.11.29.07.24.04;	author skrll;	state Exp;
branches;
next	1.564.2.13;

1.564.2.13
date	2004.12.18.09.31.03;	author skrll;	state Exp;
branches;
next	1.564.2.14;

1.564.2.14
date	2005.01.17.19.29.28;	author skrll;	state Exp;
branches;
next	1.564.2.15;

1.564.2.15
date	2005.01.24.08.34.12;	author skrll;	state Exp;
branches;
next	1.564.2.16;

1.564.2.16
date	2005.02.04.11.44.20;	author skrll;	state Exp;
branches;
next	1.564.2.17;

1.564.2.17
date	2005.02.15.21.32.41;	author skrll;	state Exp;
branches;
next	1.564.2.18;

1.564.2.18
date	2005.02.17.07.10.36;	author skrll;	state Exp;
branches;
next	1.564.2.19;

1.564.2.19
date	2005.03.04.16.38.37;	author skrll;	state Exp;
branches;
next	1.564.2.20;

1.564.2.20
date	2005.04.01.14.27.38;	author skrll;	state Exp;
branches;
next	1.564.2.21;

1.564.2.21
date	2005.11.10.13.56.32;	author skrll;	state Exp;
branches;
next	1.564.2.22;

1.564.2.22
date	2005.12.11.10.28.18;	author christos;	state Exp;
branches;
next	;

1.491.2.1
date	2002.05.30.15.33.19;	author gehenna;	state Exp;
branches;
next	1.491.2.2;

1.491.2.2
date	2002.07.14.17.47.51;	author gehenna;	state Exp;
branches;
next	1.491.2.3;

1.491.2.3
date	2002.07.16.08.29.11;	author gehenna;	state Exp;
branches;
next	1.491.2.4;

1.491.2.4
date	2002.08.31.13.44.49;	author gehenna;	state Exp;
branches;
next	;

1.491.4.1
date	2002.06.10.17.14.20;	author tv;	state Exp;
branches;
next	1.491.4.2;

1.491.4.2
date	2002.08.01.04.22.39;	author lukem;	state Exp;
branches;
next	1.491.4.3;

1.491.4.3
date	2002.10.24.09.34.22;	author lukem;	state Exp;
branches;
next	1.491.4.4;

1.491.4.4
date	2003.01.28.06.28.20;	author jmc;	state Exp;
branches;
next	1.491.4.5;

1.491.4.5
date	2003.09.10.16.55.33;	author grant;	state Exp;
branches;
next	1.491.4.6;

1.491.4.6
date	2003.10.05.11.49.20;	author tron;	state Exp;
branches;
next	1.491.4.7;

1.491.4.7
date	2004.11.11.23.29.54;	author he;	state Exp;
branches;
next	1.491.4.8;

1.491.4.8
date	2005.10.26.22.16.26;	author jmc;	state Exp;
branches;
next	;

1.432.2.1
date	2001.11.12.21.17.01;	author thorpej;	state Exp;
branches;
next	;

1.422.2.1
date	2001.09.07.00.18.27;	author fvdl;	state dead;
branches;
next	1.422.2.2;

1.422.2.2
date	2001.10.01.12.39.33;	author fvdl;	state Exp;
branches;
next	1.422.2.3;

1.422.2.3
date	2001.10.11.00.01.44;	author fvdl;	state Exp;
branches;
next	;

1.410.2.1
date	2001.08.03.04.11.39;	author lukem;	state Exp;
branches;
next	1.410.2.2;

1.410.2.2
date	2001.08.25.06.15.23;	author thorpej;	state Exp;
branches;
next	1.410.2.3;

1.410.2.3
date	2001.09.13.01.13.43;	author thorpej;	state Exp;
branches;
next	1.410.2.4;

1.410.2.4
date	2002.01.10.19.44.25;	author thorpej;	state Exp;
branches;
next	1.410.2.5;

1.410.2.5
date	2002.02.11.20.08.20;	author jdolecek;	state Exp;
branches;
next	1.410.2.6;

1.410.2.6
date	2002.03.16.15.58.11;	author jdolecek;	state Exp;
branches;
next	1.410.2.7;

1.410.2.7
date	2002.06.23.17.37.17;	author jdolecek;	state Exp;
branches;
next	1.410.2.8;

1.410.2.8
date	2002.10.10.18.33.09;	author jdolecek;	state Exp;
branches;
next	;

1.400.2.1
date	2001.04.09.01.53.26;	author nathanw;	state Exp;
branches;
next	1.400.2.2;

1.400.2.2
date	2001.06.21.19.25.12;	author nathanw;	state Exp;
branches;
next	1.400.2.3;

1.400.2.3
date	2001.08.24.00.08.26;	author nathanw;	state Exp;
branches;
next	1.400.2.4;

1.400.2.4
date	2001.09.21.22.35.00;	author nathanw;	state Exp;
branches;
next	1.400.2.5;

1.400.2.5
date	2001.09.26.19.54.43;	author nathanw;	state Exp;
branches;
next	1.400.2.6;

1.400.2.6
date	2001.10.08.20.10.44;	author nathanw;	state Exp;
branches;
next	1.400.2.7;

1.400.2.7
date	2001.10.22.20.41.11;	author nathanw;	state Exp;
branches;
next	1.400.2.8;

1.400.2.8
date	2001.11.14.19.12.42;	author nathanw;	state Exp;
branches;
next	1.400.2.9;

1.400.2.9
date	2002.01.08.00.25.10;	author nathanw;	state Exp;
branches;
next	1.400.2.10;

1.400.2.10
date	2002.01.11.23.38.27;	author nathanw;	state Exp;
branches;
next	1.400.2.11;

1.400.2.11
date	2002.02.28.04.10.12;	author nathanw;	state Exp;
branches;
next	1.400.2.12;

1.400.2.12
date	2002.04.01.07.40.36;	author nathanw;	state Exp;
branches;
next	1.400.2.13;

1.400.2.13
date	2002.04.17.00.03.14;	author nathanw;	state Exp;
branches;
next	1.400.2.14;

1.400.2.14
date	2002.06.20.03.39.02;	author nathanw;	state Exp;
branches;
next	1.400.2.15;

1.400.2.15
date	2002.08.01.02.41.53;	author nathanw;	state Exp;
branches;
next	1.400.2.16;

1.400.2.16
date	2002.08.13.02.18.17;	author nathanw;	state Exp;
branches;
next	1.400.2.17;

1.400.2.17
date	2002.09.17.21.14.57;	author nathanw;	state Exp;
branches;
next	1.400.2.18;

1.400.2.18
date	2002.10.18.02.37.27;	author nathanw;	state Exp;
branches;
next	1.400.2.19;

1.400.2.19
date	2002.11.11.21.58.50;	author nathanw;	state Exp;
branches;
next	1.400.2.20;

1.400.2.20
date	2002.12.11.06.00.49;	author thorpej;	state Exp;
branches;
next	1.400.2.21;

1.400.2.21
date	2002.12.29.19.29.08;	author thorpej;	state Exp;
branches;
next	1.400.2.22;

1.400.2.22
date	2003.01.03.16.48.18;	author thorpej;	state Exp;
branches;
next	1.400.2.23;

1.400.2.23
date	2003.01.07.21.11.35;	author thorpej;	state Exp;
branches;
next	1.400.2.24;

1.400.2.24
date	2003.01.08.16.58.22;	author thorpej;	state Exp;
branches;
next	;

1.354.2.1
date	2000.06.23.14.36.09;	author fvdl;	state Exp;
branches;
next	1.354.2.2;

1.354.2.2
date	2000.07.06.14.10.34;	author sommerfeld;	state Exp;
branches;
next	1.354.2.3;

1.354.2.3
date	2000.07.25.14.58.41;	author minoura;	state Exp;
branches;
next	1.354.2.4;

1.354.2.4
date	2000.07.27.02.10.48;	author mycroft;	state Exp;
branches;
next	1.354.2.5;

1.354.2.5
date	2000.08.01.22.35.52;	author augustss;	state Exp;
branches;
next	1.354.2.6;

1.354.2.6
date	2000.08.10.23.10.28;	author soda;	state Exp;
branches;
next	1.354.2.7;

1.354.2.7
date	2000.09.12.00.48.39;	author fvdl;	state Exp;
branches;
next	1.354.2.8;

1.354.2.8
date	2000.09.20.18.26.06;	author thorpej;	state Exp;
branches;
next	1.354.2.9;

1.354.2.9
date	2000.12.12.21.28.24;	author he;	state Exp;
branches;
next	1.354.2.10;

1.354.2.10
date	2001.04.25.08.55.50;	author he;	state Exp;
branches;
next	1.354.2.11;

1.354.2.11
date	2001.05.01.11.49.38;	author he;	state Exp;
branches;
next	1.354.2.12;

1.354.2.12
date	2001.05.01.15.49.02;	author he;	state Exp;
branches;
next	1.354.2.13;

1.354.2.13
date	2001.05.03.20.58.33;	author he;	state Exp;
branches;
next	1.354.2.14;

1.354.2.14
date	2001.05.06.14.44.50;	author he;	state Exp;
branches;
next	1.354.2.15;

1.354.2.15
date	2001.05.06.15.18.54;	author he;	state Exp;
branches;
next	1.354.2.16;

1.354.2.16
date	2001.10.25.18.05.28;	author he;	state Exp;
branches;
next	1.354.2.17;

1.354.2.17
date	2001.12.09.19.14.43;	author he;	state Exp;
branches;
next	1.354.2.18;

1.354.2.18
date	2002.01.19.21.56.32;	author he;	state Exp;
branches;
next	1.354.2.19;

1.354.2.19
date	2002.01.24.22.37.37;	author he;	state Exp;
branches;
next	;

1.342.2.1
date	2000.06.22.17.00.16;	author minoura;	state Exp;
branches;
next	;

1.300.2.1
date	2000.02.20.18.37.36;	author sommerfeld;	state Exp;
branches;
next	1.300.2.2;

1.300.2.2
date	2000.02.21.19.33.00;	author sommerfeld;	state Exp;
branches;
next	1.300.2.3;

1.300.2.3
date	2000.04.17.01.43.19;	author sommerfeld;	state Exp;
branches;
next	1.300.2.4;

1.300.2.4
date	2000.04.22.16.05.17;	author sommerfeld;	state Exp;
branches;
next	1.300.2.5;

1.300.2.5
date	2000.05.03.14.42.30;	author sommerfeld;	state Exp;
branches;
next	1.300.2.6;

1.300.2.6
date	2000.06.25.19.36.55;	author sommerfeld;	state Exp;
branches;
next	1.300.2.7;

1.300.2.7
date	2000.08.07.01.08.27;	author sommerfeld;	state Exp;
branches;
next	1.300.2.8;

1.300.2.8
date	2000.08.25.00.40.06;	author sommerfeld;	state Exp;
branches;
next	1.300.2.9;

1.300.2.9
date	2000.11.18.23.25.50;	author sommerfeld;	state Exp;
branches;
next	1.300.2.10;

1.300.2.10
date	2000.12.29.21.38.40;	author sommerfeld;	state Exp;
branches;
next	1.300.2.11;

1.300.2.11
date	2001.01.07.19.36.48;	author sommerfeld;	state Exp;
branches;
next	1.300.2.12;

1.300.2.12
date	2001.01.07.22.12.38;	author sommerfeld;	state Exp;
branches;
next	1.300.2.13;

1.300.2.13
date	2001.01.23.06.34.53;	author thorpej;	state Exp;
branches;
next	1.300.2.14;

1.300.2.14
date	2001.04.30.16.23.08;	author sommerfeld;	state Exp;
branches;
next	1.300.2.15;

1.300.2.15
date	2001.05.07.17.07.21;	author sommerfeld;	state Exp;
branches;
next	1.300.2.16;

1.300.2.16
date	2001.05.13.00.48.52;	author sommerfeld;	state Exp;
branches;
next	1.300.2.17;

1.300.2.17
date	2001.06.18.03.33.27;	author sommerfeld;	state Exp;
branches;
next	1.300.2.18;

1.300.2.18
date	2001.06.24.19.29.49;	author sommerfeld;	state Exp;
branches;
next	1.300.2.19;

1.300.2.19
date	2001.07.04.20.11.12;	author sommerfeld;	state Exp;
branches;
next	1.300.2.20;

1.300.2.20
date	2001.07.19.08.57.25;	author sommerfeld;	state Exp;
branches;
next	1.300.2.21;

1.300.2.21
date	2001.09.03.19.48.06;	author sommerfeld;	state Exp;
branches;
next	1.300.2.22;

1.300.2.22
date	2001.09.22.23.00.55;	author sommerfeld;	state Exp;
branches;
next	1.300.2.23;

1.300.2.23
date	2001.12.29.21.09.03;	author sommerfeld;	state Exp;
branches;
next	1.300.2.24;

1.300.2.24
date	2001.12.29.23.21.18;	author sommerfeld;	state Exp;
branches;
next	1.300.2.25;

1.300.2.25
date	2002.01.28.04.21.35;	author sommerfeld;	state Exp;
branches;
next	1.300.2.26;

1.300.2.26
date	2002.02.24.00.17.42;	author sommerfeld;	state Exp;
branches;
next	1.300.2.27;

1.300.2.27
date	2002.02.24.01.58.56;	author sommerfeld;	state Exp;
branches;
next	1.300.2.28;

1.300.2.28
date	2002.04.27.20.24.44;	author sommerfeld;	state Exp;
branches;
next	1.300.2.29;

1.300.2.29
date	2002.05.03.19.12.54;	author sommerfeld;	state Exp;
branches;
next	1.300.2.30;

1.300.2.30
date	2002.06.25.15.44.45;	author sommerfeld;	state Exp;
branches;
next	1.300.2.31;

1.300.2.31
date	2002.08.19.01.22.17;	author sommerfeld;	state Exp;
branches;
next	;

1.271.2.1
date	99.11.06.16.23.49;	author mycroft;	state dead;
branches;
next	1.271.2.2;

1.271.2.2
date	99.11.06.16.23.50;	author mycroft;	state Exp;
branches;
next	;

1.264.2.1
date	99.10.19.17.56.39;	author thorpej;	state Exp;
branches;
next	1.264.2.2;

1.264.2.2
date	2000.11.20.20.09.15;	author bouyer;	state Exp;
branches;
next	1.264.2.3;

1.264.2.3
date	2000.11.22.16.00.15;	author bouyer;	state Exp;
branches;
next	1.264.2.4;

1.264.2.4
date	2000.12.08.09.26.33;	author bouyer;	state Exp;
branches;
next	1.264.2.5;

1.264.2.5
date	2000.12.13.15.49.24;	author bouyer;	state Exp;
branches;
next	1.264.2.6;

1.264.2.6
date	2001.01.05.17.34.28;	author bouyer;	state Exp;
branches;
next	1.264.2.7;

1.264.2.7
date	2001.01.18.09.22.33;	author bouyer;	state Exp;
branches;
next	1.264.2.8;

1.264.2.8
date	2001.02.11.19.10.50;	author bouyer;	state Exp;
branches;
next	1.264.2.9;

1.264.2.9
date	2001.03.23.11.32.51;	author bouyer;	state Exp;
branches;
next	1.264.2.10;

1.264.2.10
date	2001.03.27.13.08.52;	author bouyer;	state Exp;
branches;
next	1.264.2.11;

1.264.2.11
date	2001.04.02.16.28.22;	author bouyer;	state Exp;
branches;
next	1.264.2.12;

1.264.2.12
date	2001.04.21.17.53.49;	author bouyer;	state Exp;
branches;
next	1.264.2.13;

1.264.2.13
date	2001.04.23.09.41.45;	author bouyer;	state Exp;
branches;
next	1.264.2.14;

1.264.2.14
date	2001.04.23.15.30.27;	author bouyer;	state Exp;
branches;
next	;

1.264.4.1
date	99.11.15.00.37.57;	author fvdl;	state Exp;
branches;
next	;

1.260.2.1
date	99.12.21.23.16.00;	author wrstuden;	state Exp;
branches;
next	1.260.2.2;

1.260.2.2
date	99.12.27.18.32.17;	author wrstuden;	state Exp;
branches;
next	;

1.231.2.1
date	99.04.28.14.25.15;	author perry;	state Exp;
branches
	1.231.2.1.2.1
	1.231.2.1.4.1;
next	1.231.2.2;

1.231.2.2
date	99.06.21.14.23.49;	author perry;	state Exp;
branches;
next	1.231.2.3;

1.231.2.3
date	99.10.09.21.49.26;	author cgd;	state Exp;
branches;
next	1.231.2.4;

1.231.2.4
date	99.10.20.23.35.15;	author he;	state Exp;
branches;
next	1.231.2.5;

1.231.2.5
date	99.10.26.20.38.00;	author he;	state Exp;
branches;
next	1.231.2.6;

1.231.2.6
date	2000.01.05.23.48.57;	author he;	state Exp;
branches;
next	1.231.2.7;

1.231.2.7
date	2000.01.17.19.17.45;	author he;	state Exp;
branches;
next	1.231.2.8;

1.231.2.8
date	2000.01.31.18.53.19;	author he;	state Exp;
branches;
next	1.231.2.9;

1.231.2.9
date	2000.05.11.09.26.57;	author he;	state Exp;
branches;
next	1.231.2.10;

1.231.2.10
date	2000.06.03.14.45.28;	author he;	state Exp;
branches;
next	1.231.2.11;

1.231.2.11
date	2000.07.05.19.16.08;	author he;	state Exp;
branches;
next	1.231.2.12;

1.231.2.12
date	2000.07.05.21.15.03;	author he;	state Exp;
branches;
next	;

1.231.2.1.2.1
date	99.06.21.00.49.55;	author thorpej;	state Exp;
branches;
next	1.231.2.1.2.2;

1.231.2.1.2.2
date	99.08.02.19.50.30;	author thorpej;	state Exp;
branches;
next	;

1.231.2.1.4.1
date	99.11.30.13.32.04;	author itojun;	state Exp;
branches;
next	;

1.152.2.1
date	98.06.04.16.53.45;	author bouyer;	state Exp;
branches;
next	1.152.2.2;

1.152.2.2
date	98.06.06.12.40.52;	author bouyer;	state Exp;
branches;
next	1.152.2.3;

1.152.2.3
date	98.06.09.13.04.22;	author bouyer;	state Exp;
branches;
next	1.152.2.4;

1.152.2.4
date	98.06.13.14.26.17;	author bouyer;	state Exp;
branches;
next	1.152.2.5;

1.152.2.5
date	98.06.13.14.34.16;	author bouyer;	state Exp;
branches;
next	1.152.2.6;

1.152.2.6
date	98.06.25.10.50.23;	author bouyer;	state Exp;
branches;
next	1.152.2.7;

1.152.2.7
date	98.07.02.08.19.35;	author bouyer;	state Exp;
branches;
next	1.152.2.8;

1.152.2.8
date	98.07.27.19.02.46;	author bouyer;	state Exp;
branches;
next	1.152.2.9;

1.152.2.9
date	98.08.13.14.37.52;	author bouyer;	state Exp;
branches;
next	1.152.2.10;

1.152.2.10
date	98.08.21.16.34.48;	author bouyer;	state Exp;
branches;
next	1.152.2.11;

1.152.2.11
date	98.09.11.16.23.14;	author bouyer;	state Exp;
branches;
next	1.152.2.12;

1.152.2.12
date	98.09.20.16.37.22;	author bouyer;	state Exp;
branches;
next	1.152.2.13;

1.152.2.13
date	98.10.02.19.51.48;	author bouyer;	state Exp;
branches;
next	1.152.2.14;

1.152.2.14
date	98.10.12.14.33.40;	author bouyer;	state Exp;
branches;
next	;

1.114.2.1
date	97.10.21.08.20.52;	author mrg;	state Exp;
branches;
next	1.114.2.2;

1.114.2.2
date	97.10.23.06.40.35;	author mellon;	state Exp;
branches;
next	1.114.2.3;

1.114.2.3
date	97.11.05.18.13.53;	author thorpej;	state Exp;
branches;
next	1.114.2.4;

1.114.2.4
date	97.11.05.19.15.53;	author thorpej;	state Exp;
branches;
next	1.114.2.5;

1.114.2.5
date	97.11.11.06.33.16;	author thorpej;	state Exp;
branches;
next	1.114.2.6;

1.114.2.6
date	97.11.17.03.44.34;	author thorpej;	state Exp;
branches;
next	1.114.2.7;

1.114.2.7
date	97.11.24.01.40.31;	author thorpej;	state Exp;
branches;
next	1.114.2.8;

1.114.2.8
date	97.11.28.08.17.59;	author mellon;	state Exp;
branches;
next	1.114.2.9;

1.114.2.9
date	98.02.07.00.45.46;	author mellon;	state Exp;
branches;
next	1.114.2.10;

1.114.2.10
date	98.05.05.08.10.38;	author mycroft;	state Exp;
branches;
next	1.114.2.11;

1.114.2.11
date	98.07.27.15.33.32;	author mellon;	state Exp;
branches;
next	;

1.86.2.1
date	97.07.30.07.36.07;	author marc;	state Exp;
branches;
next	1.86.2.2;

1.86.2.2
date	97.08.23.07.08.49;	author thorpej;	state Exp;
branches;
next	1.86.2.3;

1.86.2.3
date	97.08.27.22.24.13;	author thorpej;	state Exp;
branches;
next	1.86.2.4;

1.86.2.4
date	97.09.01.20.10.00;	author thorpej;	state Exp;
branches;
next	1.86.2.5;

1.86.2.5
date	97.09.16.03.48.30;	author thorpej;	state Exp;
branches;
next	1.86.2.6;

1.86.2.6
date	97.10.14.09.05.42;	author thorpej;	state Exp;
branches;
next	1.86.2.7;

1.86.2.7
date	97.10.14.23.35.08;	author thorpej;	state Exp;
branches;
next	1.86.2.8;

1.86.2.8
date	97.10.16.10.54.01;	author enami;	state Exp;
branches;
next	;

1.82.2.1
date	97.07.01.17.33.55;	author bouyer;	state Exp;
branches;
next	1.82.2.2;

1.82.2.2
date	97.07.17.13.42.32;	author bouyer;	state Exp;
branches;
next	1.82.2.3;

1.82.2.3
date	97.07.30.16.23.09;	author bouyer;	state Exp;
branches;
next	1.82.2.4;

1.82.2.4
date	97.08.14.11.05.59;	author bouyer;	state Exp;
branches;
next	1.82.2.5;

1.82.2.5
date	97.08.26.15.20.26;	author bouyer;	state Exp;
branches;
next	1.82.2.6;

1.82.2.6
date	97.08.27.08.10.37;	author bouyer;	state Exp;
branches;
next	;

1.71.4.1
date	97.03.12.14.34.37;	author is;	state Exp;
branches;
next	;

1.66.2.1
date	97.01.14.21.25.16;	author thorpej;	state Exp;
branches;
next	1.66.2.2;

1.66.2.2
date	97.01.18.04.14.42;	author thorpej;	state Exp;
branches;
next	1.66.2.3;

1.66.2.3
date	97.01.30.05.46.21;	author thorpej;	state Exp;
branches;
next	;

1.48.2.1
date	96.08.25.17.22.16;	author thorpej;	state Exp;
branches;
next	;

1.23.2.1
date	95.10.17.12.54.55;	author tls;	state Exp;
branches;
next	;


desc
@@


1.1262
log
@pchtemp: add a simple driver for intel pch thermal sensor

tested on PCI_PRODUCT_INTEL_2HS_THERM, which was found on HP Z4 G4.
although other variants look compatible, i have not actually tested them.
(no hardware)

dmesg:
```
[   512.596379] pchtemp0 at pci0 dev 20 function 2: Intel PCH Temperature Sensor
```

envstat:
```
[pchtemp0]
  pchtemp0 temperature:    41.500                                      degC
```

enable in kernel configs where amdtemp is enabled.

the man page is mostly copy-and-paste from amdtemp.4.
@
text
@# $NetBSD: GENERIC,v 1.1261 2025/10/06 12:27:52 riastradh Exp $
#
# GENERIC machine description file
#
# This machine description file is used to generate the default NetBSD
# kernel.  The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
#
# The machine description file can be customised for your specific
# machine to reduce the kernel size and improve its performance.
#
# For further information on compiling NetBSD kernels, see the config(8)
# man page.
#
# For further information on hardware support for this architecture, see
# the intro(4) man page.  For further information about kernel options
# for this architecture, see the options(4) man page.  For an explanation
# of each device driver in this file see the section 4 man page for the
# device.

include 	"arch/i386/conf/std.i386"

options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

#ident		"GENERIC-$Revision: 1.1261 $"

maxusers	64		# estimated number of users

# CPU-related options.
options 	USER_LDT	# user-settable LDT; used by WINE
#options 	PAE		# PAE mode (36 bits physical addressing)
makeoptions	SPECTRE_V2_GCC_MITIGATION=1	# GCC Spectre variant 2
						# migitation
options 	SPECTRE_V2_GCC_MITIGATION

# CPU features
acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
coretemp*	at cpu?		# Intel on-die thermal sensor
est0		at cpu0		# Intel Enhanced SpeedStep (non-ACPI)
hyperv0		at cpu0		# Microsoft Hyper-V
#odcm0		at cpu0		# On-demand clock modulation
#padlock0	at cpu0		# VIA PadLock
powernow0	at cpu0		# AMD PowerNow! and Cool'n'Quiet (non-ACPI)
viac7temp*	at cpu?		# VIA C7, Nano and Zhaoxin temperature sensor
vmt0		at cpu0		# VMware Tools

#Xen PV support for HVM guests
options 	XENPVHVM
options 	XEN
hypervisor*	at mainbus?		# Xen hypervisor
xenbus*	 	at hypervisor?		# Xen virtual bus
xencons*	at hypervisor?		# Xen virtual console
xennet*  	at xenbus?		# Xen virtual network interface
xbd*		at xenbus?		# Xen virtual block device

options 	MTRR		# memory-type range register syscall support

options 	MULTIBOOT	# Multiboot support (see multiboot(8))

# delay between "rebooting ..." message and hardware reset, in milliseconds
#options 	CPURESET_DELAY=2000

# This option allows you to force a serial console at the specified
# I/O address.   see console(4) for details.
#options 	CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
#	you don't want the option below ON iff you are using the
#	serial console option of the new boot strap code.
#options 	CONS_OVERRIDE	# Always use above! independent of boot info

# The following options override the memory sizes passed in from the boot
# block.  Use them *only* if the boot block is unable to determine the correct
# values.  Note that the BIOS may *correctly* report less than 640k of base
# memory if the extended BIOS data area is located at the top of base memory
# (as is the case on most recent systems).
#options 	REALBASEMEM=639		# size of base memory (in KB)
#options 	REALEXTMEM=15360	# size of extended memory (in KB)

# The following options limit the overall size of physical memory
# and/or the maximum address used by the system.
# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
# and can deal with holes in the memory layout.
#options 	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
#options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)

# Standard system options

options 	INSECURE	# disable kernel security levels - X needs this

options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
options 	NTP		# NTP phase/frequency locked loop

options 	KTRACE		# system call tracing via ktrace(1)

options 	CPU_UCODE	# cpu ucode loading support

# Note: SysV IPC parameters can be changed dynamically; see sysctl(8).
options 	SYSVMSG		# System V-like message queues
options 	SYSVSEM		# System V-like semaphores
options 	SYSVSHM		# System V-like memory sharing

options 	MODULAR		# new style module(7) framework
options 	MODULAR_DEFAULT_AUTOLOAD

options 	USERCONF	# userconf(4) support
#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel

# Beep when it is safe to power down the system (requires sysbeep)
#options 	BEEP_ONHALT
# Some tunable details of the above feature (default values used below)
#options 	BEEP_ONHALT_COUNT=3	# Times to beep
#options 	BEEP_ONHALT_PITCH=1500	# Default frequency (in Hz)
#options 	BEEP_ONHALT_PERIOD=250	# Default duration (in msecs)

# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
#options 	BUFQ_READPRIO
options 	BUFQ_PRIOCSCAN

# Diagnostic/debugging support options
options 	DIAGNOSTIC	# inexpensive kernel consistency checks
				# XXX to be commented out on release branch
#options 	DEBUG		# expensive debugging checks/support
#options 	LOCKDEBUG	# expensive locking checks/support
options 	DDB		# in-kernel debugger
#options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'
options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
#options 	DDB_VERBOSE_HELP
#options 	KGDB		# remote debugger
#options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions	DEBUG="-g"	# compile full symbol table
#options 	KUBSAN		# Kernel Undefined Behavior Sanitizer (kUBSan)
#options 	UBSAN_ALWAYS_FATAL	# (optional) Panic on all kUBSan reports
#options 	SYSCALL_STATS	# per syscall counts
#options 	SYSCALL_TIMES	# per syscall times
#options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
options 	KDTRACE_HOOKS	# kernel DTrace hooks

# Kernel Code Coverage Driver.
#makeoptions	KCOV=1
#options 	KCOV

# Heartbeat checks
options 	HEARTBEAT
options 	HEARTBEAT_MAX_PERIOD_DEFAULT=15

# Compatibility options
include 	"conf/compat_netbsd09.config"
#options 	COMPAT_386BSD_MBRPART # recognize old partition ID

# Wedge support
options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
#options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
#options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges
options 	DKWEDGE_METHOD_APPLE	# Support Apple partitions as wedges
#options 	DKWEDGE_METHOD_RDB	# Support RDB partitions as wedges
#options 	DKWEDGE_METHOD_TOS	# Support Atari "TOS" partitions as wedges

# File systems
include "conf/filesystems.config"

# File system options
options 	FFS_EI		# FFS Endian Independent support
#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
options 	QUOTA		# legacy UFS quotas
options 	QUOTA2		# new, in-filesystem UFS quotas
options 	UFS_DIRHASH	# UFS Large Directory Hashing
options 	UFS_EXTATTR	# Extended attribute support for UFS1
options 	WAPBL		# File system journaling support
options 	LFS_DIRHASH	# LFS version of UFS_DIRHASH - experimental
options 	DISKLABEL_EI	# disklabel Endian Independent support
options 	NFSSERVER	# Network File System server
#options 	V7FS_EI		# V7FS Endian Independent support

# Networking options
#options 	GATEWAY		# packet forwarding
options 	INET		# IP + ICMP + TCP + UDP
options 	INET6		# IPv6
options 	IPSEC		# IP security
#options 	IPSEC_DEBUG	# debug for IP security
#options 	MPLS		# MultiProtocol Label Switching (needs mpls)
#options 	MROUTING	# IP multicast routing
#options 	PIM		# Protocol Independent Multicast
options 	NETATALK	# AppleTalk networking protocols
#options 	CAN		# Controller Area Network protocol
#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
#options 	PPP_DEFLATE	# Deflate compression support for PPP
options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG

#options 	ALTQ		# Manipulate network interfaces' output queues
#options 	ALTQ_BLUE	# Stochastic Fair Blue
#options 	ALTQ_CBQ	# Class-Based Queueing
#options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
#options 	ALTQ_FIFOQ	# First-In First-Out Queue
#options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
#options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
#options 	ALTQ_LOCALQ	# Local queueing discipline
#options 	ALTQ_PRIQ	# Priority Queueing
#options 	ALTQ_RED	# Random Early Detection
#options 	ALTQ_RIO	# RED with IN/OUT
#options 	ALTQ_WFQ	# Weighted Fair Queueing

# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
#options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
#options 	EISAVERBOSE	# verbose EISA device autoconfig messages
#options 	MIIVERBOSE	# verbose PHY autoconfig messages
options 	PCIVERBOSE	# verbose PCI device autoconfig messages
#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
#options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
options 	SCSIVERBOSE	# human readable SCSI error messages
#options 	USBVERBOSE	# verbose USB device autoconfig messages
#options 	PNPBIOSVERBOSE	# verbose PnP BIOS messages
#options 	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
#options 	MCAVERBOSE	# verbose MCA device autoconfig messages
options 	HDAUDIOVERBOSE	# human readable HDAUDIO device names

options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM

#
# wscons options
#
# builtin terminal emulations
#options 	WSEMUL_SUN		# sun terminal emulation
options 	WSEMUL_VT100		# VT100 / VT220 emulation
# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
options 	WSDISPLAY_CUSTOM_OUTPUT	# color customization from wsconsctl(8)
#options 	WS_DEFAULT_FG=WSCOL_WHITE
#options 	WS_DEFAULT_BG=WSCOL_BLACK
#options 	WS_DEFAULT_COLATTR="(0)"
#options 	WS_DEFAULT_MONOATTR="(0)"
options 	WS_KERNEL_FG=WSCOL_GREEN
#options 	WS_KERNEL_BG=WSCOL_BLACK
#options 	WS_KERNEL_COLATTR=""
#options 	WS_KERNEL_MONOATTR=""
# customization of console border color
options 	WSDISPLAY_CUSTOM_BORDER	# custom border colors via wsconsctl(8)
#options 	WSDISPLAY_BORDER_COLOR=WSCOL_BLUE	# default color
# compatibility to other console drivers
options 	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
options 	WSDISPLAY_COMPAT_SYSCONS	# emulate some ioctls
options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
#options 	WSKBD_EVENT_AUTOREPEAT		# auto repeat in event mode
#options 	WSKBD_USONLY			# strip off non-US keymaps
# don't attach pckbd as the console if no PS/2 keyboard is found
options 	PCKBD_CNATTACH_MAY_FAIL
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver
# allocate a number of virtual screens at autoconfiguration time
#options 	WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
options 	PCDISPLAY_SOFTCURSOR
# modify the screen type of the console; defaults to "80x25"
#options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
# work around a hardware bug that loaded fonts don't work; found on ATI cards
#options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
# console scrolling support.
options 	WSDISPLAY_SCROLLSUPPORT
# enable VGA raster mode capable of displaying multilingual text on console
#options 	VGA_RASTERCONSOLE
# enable splash screen support; requires genfb or radeonfb
#options 	SPLASHSCREEN

# Keylock support
#options 	KEYLOCK
#options 	secmodel_keylock	# Requires options KEYLOCK

# Kernel root file system and dump configuration.
config		netbsd	root on ? type ?
#config		netbsd	root on sd0a type ffs
#config		netbsd	root on ? type nfs

#
# Device configuration
#

# Doesn't do anything yet.
#p64h2apic*	at pci? dev? function?	# P64H2 IOxAPIC

#apm0		at mainbus0		# Advanced power management

# Tuning for power management, see apm(4) for more details.
#options 	APM_V10_ONLY		# Use only the APM 1.0 calls
#options 	APM_NO_POWEROFF		# Don't power off on halt(8)
#options 	APM_POWER_PRINT		# Print stats on the console


# Basic Bus Support

#IPMI support
ipmi0		at mainbus?
ipmi_acpi*	at acpi?
ipmi0		at ipmi_acpi? 

# Advanced Configuration and Power Interface

# This option can be used to retrieve CPU and APIC information.
# that I/O APICs can be used if ACPI is enabled below.
#options 	MPBIOS_SCANPCI	# find PCI roots using MPBIOS
options 	ACPI_SCANPCI	# find PCI roots using ACPI

acpi0		at mainbus0

#options 	ACPI_ACTIVATE_DEV	# If set, activate inactive devices
options 	VGA_POST		# in-kernel support for VGA POST

# ACPI devices
apm*		at acpi?		# ACPI apm emulation
acpiacad*	at acpi?		# ACPI AC Adapter
acpibat*	at acpi?		# ACPI Battery
acpibut*	at acpi?		# ACPI Button
acpidalb*	at acpi?		# ACPI Direct Application Launch Button
acpiec* 	at acpi?		# ACPI Embedded Controller (late)
acpiecdt*	at acpi?		# ACPI Embedded Controller (early)
acpifan*	at acpi?		# ACPI Fan
acpihed*	at acpi?		# ACPI Hardware Error Device
acpilid*	at acpi?		# ACPI Lid Switch
#acpipmtr*	at acpi?		# ACPI Power Meter (experimental)
#acpismbus*	at acpi?		# ACPI SMBus CMI (experimental)
acpitz* 	at acpi?		# ACPI Thermal Zone
acpivga*	at acpi?		# ACPI Display Adapter
acpiout*	at acpivga?		# ACPI Display Output Device
acpivmgenid*	at acpi?		# ACPI Virtual Machine Generation ID
acpiwdrt*	at acpi?		# ACPI Watchdog Resource Table
acpiwmi*	at acpi?		# ACPI WMI Mapper
apei*		at apeibus?		# ACPI Platform Error Interfaces

# Mainboard devices
aibs*		at acpi?		# ASUSTeK AI Booster hardware monitor
asus*		at acpi?		# ASUS hotkeys
attimer*	at acpi?		# AT Timer
#com*		at acpi?		# Serial communications interface
#fdc*		at acpi?		# Floppy disk controller
fujbp*		at acpi?		# Fujitsu Brightness & Pointer
fujhk*		at acpi?		# Fujitsu Hotkeys
#hpacel* 	at acpi?		# HP 3D DriveGuard accelerometer
#hpqlb*		at acpi?		# HP Quick Launch Buttons
hpet*		at acpihpetbus?		# High Precision Event Timer (table)
hpet*		at acpinodebus?		# High Precision Event Timer (device)
joy*		at acpi?		# Joystick/Game port
#lpt*		at acpi?		# Parallel port
mpu*		at acpi?		# Roland MPU-401 MIDI UART
pckbc*		at acpi?		# PC keyboard controller
pcppi*		at acpi?		# AT-style speaker sound
qemufwcfg*	at acpi?		# QEMU Firmware Configuration device
sdhc*		at acpi?		# SD Host Controller
sony*		at acpi?		# Sony Miscellaneous Controller
thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
#tpm*		at acpi?		# ACPI TPM (Experimental)
ug*		at acpi?		# Abit uGuru Hardware monitor
vald*		at acpi?		# Toshiba Libretto hotkeys
valz*		at acpi?		# Toshiba Dynabook hotkeys
wb*		at acpi?		# Winbond W83L518D SD/MMC reader
sdmmc*		at wb?			# SD/MMC bus
wmidell*	at acpiwmibus?		# Dell WMI mappings
wmieeepc*	at acpiwmibus?		# Asus Eee PC WMI mappings
wmihp*		at acpiwmibus?		# HP WMI mappings
wmimsi* 	at acpiwmibus?		# MSI WMI mappings
wss*		at acpi?		# NeoMagic 256AV in wss mode
ym*		at acpi?		# Yamaha OPL3-SA[23] audio

# Sony Vaio jog dial
spic*		at acpi?		# Sony Programmable I/O Controller
wsmouse*	at spic?

# Plug-and-Play BIOS and attached devices

#pnpbios*	at mainbus?

# mainboard audio chips
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# Yamaha OPL3-SA[23] audio

# com port
# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
# will be no com0.  A side effect is pcmcia (and other) com? previously
# starting at com3 may attach as com1 or com2.
#com*		at pnpbios? index ?	# serial ports

# parallel port
# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
# "printer interfaces".
#lpt*		at pnpbios? index ?	# parallel ports

#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide* 	at pnpbios? index ?

# PCI bus support
pci*	at mainbus? bus ?
pci*	at pchb? bus ?
pci*	at ppb? bus ?
pci*	at elansc? bus ?

# Configure PCI using BIOS information
#options 	PCIBIOS			# PCI BIOS support
#options 	PCIBIOSVERBOSE		# PCI BIOS verbose info
#options 	PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
#options 	PCIBIOS_INTR_GUESS	# see pcibios(4)
#options 	PCIBIOS_LIBRETTO_FIXUP	# this code makes the Toshiba Libretto
					# L2/L3 work, but should not be enabled
					# on anything else.
#options 	PCIBIOS_SHARP_MM20_FIXUP # this code makes the Sharp MM 20
					# work, but should not be enabled
					# on anything else.
#options 	PCIINTR_DEBUG		# super-verbose PCI interrupt fixup

#options 	PCI_RESOURCE		# Allocate unconfigured PCI resources

# PCI fixups, for both PCIBIOS and ACPI
#options 	PCI_ADDR_FIXUP		# fixup PCI I/O addresses
#options 	PCI_BUS_FIXUP		# fixup PCI bus numbering
#options 	PCI_INTR_FIXUP		# fixup PCI interrupt routing

# System Controllers
elansc* at mainbus? bus ?		# AMD Elan SC520 System Controller

# Temperatures
amdnb_misc* at pci?			# AMD NB Misc Configuration
amdtemp* at amdnb_misc?			# AMD CPU Temperature sensors

pchtemp* at pci?			# Intel PCH Thermal Subsystem

# PCI bridges
#amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
#hpet*	at amdpcib?
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-LPC w/ timecounter,
					# watchdog, gpio, SpeedStep and HPET
fwhrng* at ichlpcib?		# Intel 82802 FWH Random Number Generator
#hpet*	at ichlpcib?
tco*	at ichlpcib?		# TCO watchdog timer
tcpcib* at pci? dev ? function ?	# Intel Atom E6xx PCI-LPC
hpet* at tcpcib?
gcscpcib* at pci? dev ? function ?	# AMD CS5535/CS5536 PCI-ISA w/
					# timecounter, watchdog and GPIO
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
gscpcib* at pci? dev ? function ?	# NS Geode SC1100 PCI-ISA w/ GPIO
viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
iic*	at viapcib?
rdcpcib* at pci? dev ? function ?	# RDC Vortex86/PMX-1000 PCI-ISA w/
					# watchdog
pchb*	at pci? dev ? function ?	# PCI-Host bridges
options 	AGP_X86
pceb*	at pci? dev ? function ?	# PCI-EISA bridges
pcib*	at pci? dev ? function ?	# PCI-ISA bridges
pcmb*	at pci? dev ? function ?	# PCI-MCA bridges
ppb*	at pci? dev ? function ?	# PCI-PCI bridges
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc*	at pci? dev ? function ?	# PCI "universal" comm. cards

pwdog*	at pci ? dev ? function ?	# QUANCOM PWDOG1

#ibmcd*	at pci ? dev ? function ?	# IBM 4810 BSP cash drawer port
#gpio*	at ibmcd?

agp*	at pchb?


# EISA bus support
eisa0	at mainbus?
eisa0	at pceb?

# ISA bus support
#isa0	at amdpcib?
isa0	at gcscpcib?
isa0	at ichlpcib?
isa0	at tcpcib?
#isa0	at piixpcib?
#isa0	at gscpcib?
isa0	at viapcib?
isa0	at rdcpcib?
isa0	at mainbus?
isa0	at pceb?
isa0	at pcib?

# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
pcmcia* at tcic? controller ? socket ?

# MCA bus support
mca0	at mainbus?

# ISA PCMCIA controllers
pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1	at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
tcic0	at isa? port 0x240 iomem 0xd0000 iosiz 0x10000

# PCI PCMCIA controllers
pcic0	at pci? dev? function ?

# ISA Plug-and-Play bus support
isapnp0 at isa?

# ISA Plug-and-Play PCMCIA controllers
pcic*	at isapnp?

# CardBus bridge support
cbb*		at pci? dev ? function ?
cardslot*	at cbb?

# CardBus bus support
cardbus*	at cardslot?
pcmcia* 	at cardslot?

# Console Devices

# wscons
pckbc0		at isa?			# PC keyboard controller
pckbd*		at pckbc?		# PC keyboard
pms*		at pckbc?		# PS/2 mouse for wsmouse
#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
options 	PMS_ELANTECH_TOUCHPAD	# Enable support for Elantech Touchpads
options 	PMS_ALPS_TOUCHPAD	# Enable support for Alps Touchpads
# vga@@isa and pcdisplay@@isa are disabled; see PR#49290
#vga0		at isa?
vga*		at pci? dev ? function ?
#pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
genfb*		at pci? dev ? function ?
options 	VCONS_DRAW_INTR
#machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
wsdisplay*	at vga? console ?
#wsdisplay*	at pcdisplay? console ?
wsdisplay*	at wsemuldisplaydev?
#wsdisplay*	at machfb? console ?
wskbd*		at pckbd? console ?
wsmouse*	at pms? mux 0
wsmouse*	at wsmousedev?

# VIA Unichrome framebuffer console
#unichromefb*	at pci? dev ? function ?
#wsdisplay*	at unichromefb?

attimer0	at isa?
pcppi0		at isa?
sysbeep0	at pcppi?

# DRI legacy drivers
#i915drm*	at drm?		# Intel i915, i945 DRM driver
#mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
#mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
#r128drm*	at drm?		# ATI Rage 128 DRM driver
#radeondrm*	at drm?		# ATI Radeon DRM driver
#savagedrm*	at drm?		# S3 Savage DRM driver
#sisdrm* 	at drm?		# SiS DRM driver
#tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver

# DRMKMS drivers
i915drmkms*	at pci? dev ? function ?
intelfb*	at intelfbbus?

radeon* 	at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?

nouveau*	at pci? dev ? function ?
nouveaufb*	at nouveaufbbus?

# DRMUMS drivers -- make them loadable, but not statically linked in
options 	DRM_LEGACY
#viadrmums*	at drm?

# Serial Devices

# PCI serial interfaces
com*	at puc? port ?			# 16x50s on "universal" comm boards
cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards

# ISA Plug-and-Play serial interfaces
com*	at isapnp?			# Modems and serial boards

# PCMCIA serial interfaces
com*	at pcmcia? function ?		# Modems and serial cards

pcmcom* at pcmcia? function ?		# PCMCIA multi-port serial cards
com*	at pcmcom? slave ?		# ...and the slave devices

# CardBus serial interfaces
com*	at cardbus? function ?	# Modems and serial cards

# ISA serial interfaces
#options 	COM_HAYESP		# adds Hayes ESP serial board support
com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
com1	at isa? port 0x2f8 irq 3
com2	at isa? port 0x3e8 irq 5
#com3	at isa? port 0x2e8 irq 9
#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
#com*	at ast? slave ?
#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
#boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
#boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
#com*	at boca? slave ?
#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
#com*	at tcom? slave ?
#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
#com*	at rtfps? slave ?
#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
#addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
#com*	at addcom? slave ?
#moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
#com*	at moxa? slave ?
#ioat*	at isa? port 0x220 irq 5	# BOCA IOAT66 6-port serial card
#com*	at ioat? slave ?

# MCA serial interfaces
com*	at mca? slot ?			# 16x50s on comm boards

# Parallel Printer Interfaces

# PCI parallel printer interfaces
lpt*	at puc? port ?			# || ports on "universal" comm boards

# ISA parallel printer interfaces
lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
lpt1	at isa? port 0x278
lpt2	at isa? port 0x3bc

# Hardware monitors

# AMD 768 and 8111 power/ACPI controllers
amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
iic*	at amdpm?

# Acer Labs M7101 SMBus controller
alipm*	at pci? dev ? function ?
iic*	at alipm?

# Intel ICH SMBus controller
ichsmb* at pci? dev ? function ?
iic*	at ichsmb?

# Intel S1200,C2000 (non-pch) SMBus controller
ismt* at pci? dev ? function ?
iic*	at ismt?

# NVIDIA nForce2/3/4 SMBus controller
nfsmbc* at pci? dev ? function ?
nfsmb*	at nfsmbc?
iic*	at nfsmb?

# Intel PIIX4 power management controllers
piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

# I2C controller as found in some Intel PCH devices.
dwiic*		at pci?			# I2C controller
iic*		at dwiic?

# dbCool Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D		# Tyan S2881
#dbcool* at iic? addr 0x2E		# Tyan S2882-D

# IBM Thinkpad Active Protection System
#aps0	at isa? port 0x1600

# Fintek Super I/O with hardware monitor
#finsio0 	at isa? port 0x4e

# iTE IT87xxF Super I/O with watchdog and sensors support
#itesio0 	at isa? port 0x2e

# Winbond LPC Super I/O
#wbsio*	at isa? port 0x2e
#wbsio*	at isa? port 0x4e

# IBM Hawk Integrated Systems Management Processor
#ibmhawk0	at iic?	addr 0x37

# LM7[89] and compatible hardware monitors
# 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
#lm*	at wbsio?

# SMSC LPC47B397 hardware monitor functions
#smsc0	at isa? port 0x02e

# SMSC LPC47M192 hardware monitor
#smscmon*	at iic? addr 0x2c
#smscmon*	at iic? addr 0x2d	# (alternate address)

# PC87366 hardware monitor
nsclpcsio*	at isa?

# Abit uGuru Hardware system monitor
#ug0	at isa? port 0xe0

# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
#viaenv* 	at pci? dev ? function ?

# Serial Presence Detect capable memory modules
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
#spdmem* at iic? addr 0x54
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
#sdtemp* at iic? addr 0x18
#sdtemp* at iic? addr 0x19
#sdtemp* at iic? addr 0x1a
#sdtemp* at iic? addr 0x1b
#sdtemp* at iic? addr 0x1c
#sdtemp* at iic? addr 0x1d
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f

# I2C HID devices
ihidev* at iic?

# I2C Mice
ims*	at ihidev? reportid ?
wsmouse* at ims? mux 0

# I2O devices
iop*	at pci? dev ? function ?	# I/O processor
iopsp*	at iop? tid ?			# SCSI/FC-AL ports
ld*	at iop? tid ?			# block devices
dpti*	at iop? tid 0			# DPT/Adaptec control interface

# GPIO devices
gpio*	at gpiobus?

# 1-Wire support
#gpioow* 	at gpio? offset ? mask ?	# 1-wire bitbanging via gpio
gpioow* 	at gpio?
onewire*	at gpioow?

# 1-Wire devices
owtemp* 	at onewire?			# Temperature sensors

# i2c support
gpioiic*	at gpio? offset ? mask ? flag 0x00	# flag 0x01 reverses
							# SCA and SCL signals
iic*		at gpioiic?

# Keylock support
gpiolock*	at gpio?

# Software pulsing GPIO pins
gpiopwm*	at gpio?

# Soekris 6501 GPIO/LED driver (provides gpiobus, needs gpio)
#soekrisgpio0	at isa? port 0x680

# Nuvoton NCT5104D SuperIO providing GPIO
nct0		at isa? port ?

# SCSI Controllers and Devices

# PCI SCSI controllers
adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
ahd*	at pci? dev ? function ?	# Adaptec 29320, 39320 (aic790x) SCSI
bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
mfii*	at pci? dev ? function ?	# LSI MegaRAID SAS (Fusion and newer)
mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
mpt*	at pci? dev ? function ?	# LSILogic 9x9 and 53c1030 (Fusion-MPT)
mpii*	at pci? dev ? function ?	# LSI Logic Fusion-MPT II
njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
esiop*	at pci? dev ? function ?	# Symbios 53c875 SCSI and newer
#options 	SIOP_SYMLED		# drive the act. LED in software
trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI

# EISA SCSI controllers
ahb*	at eisa? slot ?			# Adaptec 174[02] SCSI
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
bha*	at eisa? slot ?			# BusLogic 7xx SCSI
dpt*	at eisa? slot ?			# DPT EATA SCSI
uha*	at eisa? slot ?			# UltraStor 24f SCSI

# PCMCIA SCSI controllers
aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI
esp*	at pcmcia? function ?		# Qlogic ESP406/FAS408 SCSI
spc*	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI

# ISA Plug-and-Play SCSI controllers
aha*	at isapnp?			# Adaptec AHA-154[02
aic*	at isapnp?			# Adaptec AHA-1520B

# ISA SCSI controllers
adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02] SCSI
aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI
aha1	at isa? port 0x334 irq ? drq ?
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
bha1	at isa? port 0x334 irq ? drq ?
# The "nca" and "dpt" probes might give false hits or hang your machine.
#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
sea0	at isa? iomem 0xc8000 irq 5	# Seagate/Future Domain SCSI
uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI
uha1	at isa? port 0x340 irq ? drq ?
wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
wds1	at isa? port 0x358 irq 11 drq 5

# CardBus SCSI cards
adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc*	at cardbus? function ?	# Adaptec ADP-1480
njs*	at cardbus? function ?	# Workbit NinjaSCSI-32

# MCA SCSI cards
aha*	at mca? slot ?			# Adaptec AHA-1640

# SCSI bus support
scsibus* at scsi?

# SCSI devices
sd*	at scsibus? target ? lun ?	# SCSI disk drives
st*	at scsibus? target ? lun ?	# SCSI tape drives
cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
ch*	at scsibus? target ? lun ?	# SCSI autochangers
ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devices
ss*	at scsibus? target ? lun ?	# SCSI scanners
uk*	at scsibus? target ? lun ?	# SCSI unknown

# NVM Express controllers and devices
nvme*	at pci? dev ? function ?
ld*	at nvme? nsid ?

# RAID controllers and devices
aac*	at pci? dev ? function ?	# Adaptec AAC family
amr*	at pci? dev ? function ?	# AMI/LSI Logic MegaRAID
arcmsr* at pci? dev ? function ?	# Areca SATA RAID controllers
cac*	at eisa? slot ?			# Compaq EISA array controllers
cac*	at pci? dev ? function ?	# Compaq PCI array controllers
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
mlx*	at eisa? slot ?			# Mylex DAC960 & DEC SWXCR family
twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers

ld*	at aac? unit ?			# logical disk devices
ld*	at amr? unit ?
ld*	at cac? unit ?
ld*	at icp? unit ?
ld*	at twa? unit ?
ld*	at twe? unit ?
ld*	at mlx? unit ?

icpsp*	at icp? unit ?			# SCSI pass-through

# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
# how to set up DMA modes for this chip. This may work, or may cause
# a machine hang with some controllers.
pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
acardide*	at pci? dev ? function ?	# Acard IDE controllers
aceride*	at pci? dev ? function ?	# Acer Lab IDE controllers
ahcisata*	at pci? dev ? function ?	# AHCI SATA controllers
artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
gcscide*	at pci? dev ? function ?	# AMD CS5535 Companion IDE controllers
geodeide*	at pci? dev ? function ?	# AMD Geode IDE controllers
hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
iteide* 	at pci? dev ? function ?	# IT Express IDE controllers
ixpide* 	at pci? dev ? function ?	# ATI IXP IDE controllers
jmide*		at pci? dev ? function ?	# JMicron PCI-e PATA/SATA controllers
ahcisata*	at jmide?
mvsata* 	at pci? dev ? function ?	# Marvell Hercules-I/II
optiide*	at pci? dev ? function ?	# Opti IDE controllers
piixide*	at pci? dev ? function ?	# Intel IDE controllers
pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
pdcsata*	at pci? dev ? function ?	# Promise SATA150 controllers
rccide* 	at pci? dev ? function ?	# ServerWorks IDE controllers
rdcide* 	at pci? dev ? function ?	# RDC PMX-1000 IDE controllers
satalink*	at pci? dev ? function ?	# SiI SATALink controllers
schide* 	at pci? dev ? function ?	# Intel SCH IDE controllers
siisata*	at pci? dev ? function ?	# SiI SteelVine controllers
siside* 	at pci? dev ? function ?	# SiS IDE controllers
slide*		at pci? dev ? function ?	# Symphony Labs IDE controllers
svwsata*	at pci? dev ? function ?	# ServerWorks SATA controllers
stpcide*	at pci? dev ? function ?	# STMicro STPC IDE controllers
toshide*	at pci? dev ? function ?	# TOSHIBA PICCOLO controllers
viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers

# ISA Plug-and-Play IDE controllers
wdc*	at isapnp?

# PCMCIA IDE controllers
wdc*	at pcmcia? function ?

# CardBus IDE controllers
njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
siisata* at cardbus? function ? 		# SiI SteelVine controllers

# ISA ST506, ESDI, and IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
# fall back to 16bits I/O if 32bits I/O are not functional).
# Some controllers pass the initial 32bit test, but will fail later.
wdc0	at isa? port 0x1f0 irq 14 flags 0x00
wdc1	at isa? port 0x170 irq 15 flags 0x00

# ATA (IDE) bus support
atabus* at ata?
options 	ATADEBUG

# IDE drives
# Flags are used only with controllers that support DMA operations
# and mode settings (e.g. some pciide controllers)
# The lowest order four bits (rightmost digit) of the flags define the PIO
# mode to use, the next set of four bits the DMA mode and the third set the
# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
# to use, and the last bit must be 1 for this setting to be used.
# For DMA and UDMA, 0xf (1111) means 'disable'.
# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
# (0xc=1100, 0xa=1010, 0xf=1111)
# 0x0000 means "use whatever the drive claims to support".
wd*	at atabus? drive ? flags 0x0000

# ATA RAID configuration support, as found on some Promise controllers.
pseudo-device	ataraid
ld*	at ataraid? vendtype ? unit ?

# ATAPI bus support
atapibus* at atapi?

# ATAPI devices
# flags have the same meaning as for IDE drives.
cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown


# Miscellaneous mass storage devices

# ISA floppy
fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
#fdc1	at isa? port 0x370 irq ? drq ?
fd*	at fdc? drive ?			# the drives themselves
# some machines need you to do this instead of fd*
#fd0	at fdc0 drive 0

# ISA CD-ROM devices
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives

# ISA tape devices
# note: the wt driver conflicts unpleasantly with SMC boards at the
# same I/O address. The probe reprograms their EEPROMs. Don't
# uncomment it unless you are actually using it.
#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives

# MCA ESDI devices
edc*	at mca? slot ?			# IBM ESDI Disk Controllers
ed*	at edc?


# Network Interfaces

# PCI network interfaces
age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
alc*	at pci? dev ? function ?	# Attansic/Atheros L1C/L2C Ethernet
ale*	at pci? dev ? function ?	# Attansic/Atheros L1E Ethernet
aq*	at pci? dev ? function ?	# Aquantia AQC 10 gigabit
ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11
athn*	at pci? dev ? function ?	# Atheros AR9k (802.11a/g/n)
atw*	at pci? dev ? function ?	# ADMtek ADM8211 (802.11)
bce*	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
bwfm*	at pci? dev ? function ?	# Broadcom FullMAC
dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
ep*	at pci? dev ? function ?	# 3Com 3c59x
epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
#eqos*	at pci? dev ? function ?	# DesignWare Ethernet QoS
et*	at pci? dev ? function ?	# Agere/LSI ET1310/ET1301 Gigabit
ex*	at pci? dev ? function ?	# 3Com 3c90x[BC]
fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
iavf*	at pci? dev ? function ?	# Intel Adaptive Virtual Function
ipw*	at pci? dev ? function ?	# Intel PRO/Wireless 2100
iwi*	at pci? dev ? function ?	# Intel PRO/Wireless 2200BG
iwm*	at pci? dev ? function ?	# Intel Wireless WiFi Link 7xxx
iwn*	at pci? dev ? function ?	# Intel PRO/Wireless 4965AGN
ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
ixl*	at pci? dev ? function ?	# Intel Ethernet 700 Series
jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 Ethernet
kse*	at pci? dev ? function ?	# Micrel KSZ8841/8842 ethernet
lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
malo*	at pci? dev ? function ?	# Marvell Libertas Wireless
mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
ral*	at pci? dev ? function ?	# Ralink Technology RT25x0 802.11a/b/g
re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
rge*	at pci? dev ? function ?	# Realtek 8125
rtk*	at pci? dev ? function ?	# Realtek 8129/8139
rtw*	at pci? dev ? function ?	# Realtek 8180L (802.11)
rtwn*	at pci? dev ? function ?	# Realtek 8188CE/8192CE 802.11b/g/n
sf*	at pci? dev ? function ?	# Adaptec AIC-6915 Ethernet
sip*	at pci? dev ? function ?	# SiS 900/DP83815 Ethernet
skc*	at pci? dev ? function ?	# SysKonnect SK9821 Gigabit Ethernet
sk*	at skc?				# SysKonnect SK9821 Gigabit Ethernet
ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
txp*	at pci? dev ? function ?	# 3com 3cr990
vte*	at pci? dev ? function ?	# RDC R6040 10/100 Ethernet
vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
vmx*	at pci? dev ? function ?	# VMware VMXNET3
vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet
wi*	at pci? dev ? function ?	# Intersil Prism Mini-PCI (802.11b)
wm*	at pci? dev ? function ?	# Intel 8254x gigabit
wpi*	at pci? dev ? function ?	# Intel PRO/Wireless 3945ABG
xge*	at pci? dev ? function ?	# Neterion (S2io) Xframe-I 10GbE

# EISA network interfaces
ep*	at eisa? slot ?			# 3Com 3c579 Ethernet
tlp*	at eisa? slot ?			# DEC DE-425 Ethernet

# ISA Plug-and-Play network interfaces
an*	at isapnp?			# Aironet 802.11
ep*	at isapnp?			# 3Com 3c509 Ethernet
fmv*	at isapnp?			# Fujitsu FMV-183
le*	at isapnp?			# AMD PCnet-ISA Ethernet
ne*	at isapnp?			# NE2000-compatible Ethernet

# PCMCIA network interfaces
an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
awi*	at pcmcia? function ?		# BayStack 650/660 (802.11FH/DS)
cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer
cs*	at pcmcia? function ?		# CS89xx Ethernet
ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
malo*	at pcmcia? function ?		# Marvell Libertas
mbe*	at pcmcia? function ?		# MB8696x based Ethernet
ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
ray*	at pcmcia? function ?		# Raytheon Raylink (802.11)
sm*	at pcmcia? function ?		# Megahertz Ethernet
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLAN/IEEE (802.11)
xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet
com*	at xirc?
xi*	at xirc?
mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
com*	at mhzc?
sm*	at mhzc?

# ISA network interfaces
ate0	at isa? port 0x2a0 irq ?		# AT1700
cs0	at isa? port 0x300 iomem ? irq ? drq ?	# CS8900 Ethernet
ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3Com 3c503 Ethernet
eg0	at isa? port 0x280 irq 9		# 3c505 Ethernet cards
el0	at isa? port 0x300 irq 9		# 3c501 Ethernet cards
ep*	at isa? port ? irq ?			# 3c509 Ethernet cards
ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3c507
ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
fmv0	at isa? port 0x2a0 irq ?		# FMV-181/182
ix0	at isa? port 0x300 irq 10		# EtherExpress/16
iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
#depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
#le*	at depca?
nele0	at isa? port 0x320 irq 9 drq 7		# NE2100
le*	at nele?
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
bicc0	at isa? port 0x320 irq 10 drq 7		# BICC IsoLan
le*	at bicc?
ne0	at isa? port 0x280 irq 9		# NE[12]000 Ethernet cards
ne1	at isa? port 0x300 irq 10
sm0	at isa? port 0x300 irq 10		# SMC91C9x Ethernet
we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC Ethernet
we1	at isa? port 0x300 iomem 0xcc000 irq 10

# CardBus network cards
ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
athn*	at cardbus? function ?	# Atheros AR9k (802.11a/g/n) - UNTESTED
atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
bwi*	at cardbus? function ?	# Broadcom BCM43xx wireless
ex*	at cardbus? function ?	# 3Com 3c575TX
fxp*	at cardbus? function ?	# Intel i8255x
malo*	at cardbus? function ?	# Marvell Libertas Wireless
ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g
re*	at cardbus? function ?	# Realtek 8139C+/8169/8169S/8110S
rtk*	at cardbus? function ?	# Realtek 8129/8139
rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
tlp*	at cardbus? function ?	# DECchip 21143

# MCA network cards
elmc*	at mca? slot ?			# 3Com EtherLink/MC (3c523)
ep*	at mca? slot ?			# 3Com EtherLink III (3c529)
we*	at mca? slot ?			# WD/SMC Ethernet
ate*	at mca? slot ?			# Allied Telesis AT1720
ne*	at mca? slot ?			# Novell NE/2 and clones
tra*	at mca? slot ?			# Tiara LANCard/E and clones
le*	at mca? slot ?			# SKNET Personal/MC2+

# MII/PHY support
acphy*	at mii? phy ?			# Altima AC101 and AMD Am79c874 PHYs
amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
atphy*	at mii? phy ?			# Attansic/Atheros PHYs
bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
etphy*	at mii? phy ?			# Agere/LSI ET1011 TruePHY Gig-E PHYs
exphy*	at mii? phy ?			# 3Com internal PHYs
gentbi* at mii? phy ?			# Generic Ten-Bit 1000BASE-[CLS]X PHYs
glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
icsphy* at mii? phy ?			# Integrated Circuit Systems ICS189x
igphy*	at mii? phy ?			# Intel IGP01E1000
ihphy*	at mii? phy ?			# Intel 82577 PHYs
ikphy*	at mii? phy ?			# Intel 82563 PHYs
inphy*	at mii? phy ?			# Intel 82555 PHYs
iophy*	at mii? phy ?			# Intel 82553 PHYs
ipgphy* at mii? phy ?			# IC PLUS IP1000A/IP1001 PHYs
jmphy*	at mii? phy ?			# Jmicron JMP202/211 PHYs
lxtphy* at mii? phy ?			# Level One LXT-970 PHYs
makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
micphy* at mii? phy ?			# Micrel KSZ[89]xxx PHYs
nsphy*	at mii? phy ?			# NS83840 PHYs
nsphyter* at mii? phy ? 		# NS83843 PHYs
pnaphy* at mii? phy ?			# generic HomePNA PHYs
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
rdcphy* at mii? phy ?			# RDC R6040 10/100 PHY
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
smscphy* at mii? phy ?			# SMSC LAN87xx PHYs
sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
tlphy*	at mii? phy ?			# ThunderLAN PHYs
tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
ukphy*	at mii? phy ?			# generic unknown PHYs
urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs


# USB Controller and Devices

# PCI USB controllers
xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
gcscehci* at pci? dev ? function ?	# Enhanced Host Controller (Geode CSC)
ohci*	at pci?	dev ? function ?	# Open Host Controller
uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)

# CardBus USB controllers
ehci*	at cardbus? function ?		# Enhanced Host Controller
ohci*	at cardbus? function ?		# Open Host Controller
uhci*	at cardbus? function ?		# Universal Host Controller (Intel)

# ISA USB controllers
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS

# PCMCIA USB controllers
slhci*	at pcmcia? function ?		# ScanLogic SL811HS

# USB bus support
usb*	at xhci?
usb*	at ehci?
usb*	at gcscehci?
usb*	at ohci?
usb*	at slhci?
usb*	at uhci?

include "dev/usb/usbdevices.config"

# IrDA and Consumer Ir devices

# Toshiba Oboe
oboe*	at pci? dev ? function ?
irframe* at oboe?


# PCI IEEE1394 controllers
fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller

# CardBus IEEE1394 controllers
fwohci* at cardbus? function ?		# IEEE1394 Open Host Controller

ieee1394if* at fwohci?
fwip*	at ieee1394if?			# IP over IEEE1394
sbp*	at ieee1394if? euihi ? euilo ?	# SCSI over IEEE1394


# SD/MMC/SDIO Controller and Device support

# PCI SD/MMC controller
sdhc*	at pci?				# SD Host Controller
rtsx*	at pci?				# Realtek RTS5209/RTS5229 Card Reader

# CardBus SD/MMC controller
sdhc*	at cardbus? function ?		# SD Host Controller

sdmmc*	at sdhc?			# SD/MMC bus
sdmmc*	at rtsx?			# SD/MMC bus
ld*	at sdmmc?


# Audio Devices

# PCI audio devices
auacer* at pci? dev ? function ?	# ALi M5455 integrated AC'97 Audio
auich*	at pci? dev ? function ?	# Intel ICH integrated AC'97 Audio
auixp*	at pci? dev ? function ?	# ATI IXP AC'97 Audio
autri*	at pci? dev ? function ?	# Trident 4DWAVE based AC'97 Audio
auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
clcs*	at pci? dev ? function ?	# Cirrus Logic CS4280
clct*	at pci? dev ? function ?	# Cirrus Logic CS4281
cmpci*	at pci? dev ? function ?	# C-Media CMI8338/8738
eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
emuxki* at pci? dev ? function ?	# Creative SBLive! and PCI512
esa*	at pci? dev ? function ?	# ESS Allegro-1 / Maestro-3 PCI Audio
esm*	at pci? dev ? function ?	# ESS Maestro-1/2/2e PCI Audio Accelerator
eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
fms*	at pci? dev ? function ?	# Forte Media FM801
gcscaudio* at pci? dev ? function ?	# AMD Geode CS5536 Companion Audio
neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
sv*	at pci? dev ? function ?	# S3 SonicVibes
yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio

# ISA Plug-and-Play audio devices
ess*	at isapnp?			# ESS Tech ES1887, ES1888, ES888 audio
guspnp* at isapnp?			# Gravis Ultra Sound PnP audio
sb*	at isapnp?			# SoundBlaster-compatible audio
wss*	at isapnp?			# Windows Sound System
ym*	at isapnp?			# Yamaha OPL3-SA[23] audio

# ISA audio devices
# the "aria" probe might give false hits
#aria0	at isa? port 0x290 irq 10 		# Aria
#ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
sb0	at isa? port 0x220 irq 5 drq 1 drq2 5	# SoundBlaster
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
#cms0	at isa? port 0x220			# Creative Music System

# OPL[23] FM synthesizers
#opl0	at isa? port 0x388	# use only if not attached to sound card
opl*	at cmpci? flags 1
opl*	at eso?
opl*	at ess?
opl*	at fms?
opl*	at sb?
opl*	at sv?
opl*	at wss?
opl*	at yds?
opl*	at ym?

# High Definition Audio
hdaudio*	at pci? dev ? function ?	# High Definition Audio
hdafg*		at hdaudiobus?

# Audio support
audio*	at audiobus?

# MPU 401 UARTs
#mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
mpu*	at isapnp?
mpu*	at cmpci?
mpu*	at eso?
mpu*	at fms?
mpu*	at sb?
mpu*	at yds?
mpu*	at ym?

# MIDI support
midi*	at midibus?
midi*	at pcppi?		# MIDI interface to the PC speaker

# The spkr driver provides a simple tone interface to the built in speaker.
#spkr*	at pcppi?		# PC speaker
#spkr*	at audio?		# PC speaker (synthesized)


# FM-Radio devices
# ISA radio devices
#az0	at isa? port 0x350	# Aztech/PackardBell FM Radio Card
#az1	at isa? port 0x358
#rt0	at isa? port 0x20c	# AIMS Lab Radiotrack & compatible
#rt1	at isa? port 0x284
#rt2	at isa? port 0x30c
#rt3	at isa? port 0x384
#rtii0	at isa? port 0x20c	# AIMS Lab Radiotrack II FM Radio Card
#rtii1	at isa? port 0x30c
#sf2r0	at isa? port 0x384	# SoundForte RadioLink SF16-FMR2 FM Radio Card

# PCI radio devices
#gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card

# Radio support
#radio*	at az?
#radio*	at gtp?
#radio*	at rt?
#radio*	at rtii?
#radio*	at sf2r?


# Video capture devices
coram*	at pci? dev ? function ?	# Conexant CX23885 PCI-E TV
cxdtv*	at pci? dev ? function ?	# Conexant CX2388[0-3] PCI TV


# TV cards

# Brooktree 848/849/878/879 based TV cards
bktr*	at pci? dev ? function ?
radio*	at bktr?


# Bluetooth Controller and Device support

# Bluetooth PCMCIA Controllers
bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A
btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139

# Bluetooth SDIO Controller
sbt* at sdmmc?

# Bluetooth Device Hub
bthub* at bcsp?
bthub* at bt3c?
bthub* at btbc?
bthub* at btuart?
bthub* at sbt?

# Bluetooth HID support
bthidev* at bthub?

# Bluetooth Mouse
btms* at bthidev? reportid ?
wsmouse* at btms? mux 0

# Bluetooth Keyboard
btkbd* at bthidev? reportid ?
wskbd* at btkbd? console ? mux 1

# Bluetooth Apple Magic Mouse
btmagic* at bthub?
wsmouse* at btmagic? mux 0

# Bluetooth Audio support
btsco* at bthub?


# Mice

# ISA busmice
lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
lms1	at isa? port 0x238 irq 5
mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
mms1	at isa? port 0x238 irq 5
wsmouse*	at lms? mux 0
wsmouse*	at mms? mux 0


# Cryptographic Devices

# PCI cryptographic devices
glxsb*	at pci? dev ? function ?	# AMD Geode LX Security Block
hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x

# Trusted Platform Module
tpm*	at isa? iomem 0xfed40000 irq 7

# Joysticks

#joy*	at pnpbios? index ?		# Game port

# ISA Plug-and-Play joysticks
joy*	at isapnp?			# Game ports (usually on audio cards)

# PCI joysticks
joy*	at pci?				# Game ports (usually on audio cards)
#joy*	at eap?				# See CAVEATS in eap(4) before enabling
joy*	at eso?				# ESS Solo-1 on-board joystick

# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0	at isa? port 0x201


# Miscellaneous Devices
geodegcb*  at pci? dev ? function ?	# Geode GCB area
geodewdog* at geodegcb? 		# AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb? 		# AMD Geode SC1100 high res. counter

# Middle Digital, Inc. PCI-Weasel serial console board control
# devices (watchdog timer, etc.)
weasel* at pci?

# Virtio devices
virtio* at pci? dev ? function ?	# Virtio PCI device

include "dev/virtio/virtio.config"

# Hyper-V devices
vmbus*		at acpi?		# Hyper-V VMBus
genfb*		at vmbus?		# Hyper-V Synthetic Video Framebuffer
hvkbd*		at vmbus?		# Hyper-V Synthetic Keyboard
wskbd*		at hvkbd? console ? mux 1
hvn*		at vmbus?		# Hyper-V NetVSC
hvs*		at vmbus?		# Hyper-V StorVSC
hvheartbeat*	at vmbus?		# Hyper-V Heartbeat Service
hvshutdown*	at vmbus?		# Hyper-V Guest Shutdown Service
hvtimesync*	at vmbus?		# Hyper-V Time Synchronization Service
#hvkvp*		at vmbus?		# Hyper-V Data Exchange Service

# Pseudo-Devices

pseudo-device	crypto			# /dev/crypto device
pseudo-device	swcrypto		# software crypto implementation

# disk/mass storage pseudo-devices
pseudo-device	bio			# RAID control device driver
pseudo-device	ccd			# concatenated/striped disk devices
pseudo-device	cgd			# cryptographic disk devices
pseudo-device	raid			# RAIDframe disk driver
options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
# Options to enable various other RAIDframe RAID types.
#options 	RF_INCLUDE_EVENODD=1
#options 	RF_INCLUDE_RAID5_RS=1
#options 	RF_INCLUDE_PARITYLOGGING=1
#options 	RF_INCLUDE_CHAINDECLUSTER=1
#options 	RF_INCLUDE_INTERDECLUSTER=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
pseudo-device	fss			# file system snapshot device

pseudo-device	md			# memory disk device (ramdisk)
options 	MEMORY_DISK_HOOKS	# enable root ramdisk
options 	MEMORY_DISK_DYNAMIC	# loaded via kernel module(7)

pseudo-device	vnd			# disk-like interface to files
options 	VND_COMPRESSION		# compressed vnd(4)

# network pseudo-devices
pseudo-device	bpfilter		# Berkeley packet filter
pseudo-device	carp			# Common Address Redundancy Protocol
pseudo-device	loop			# network loopback
#pseudo-device	mpls			# MPLS pseudo-interface
pseudo-device	ppp			# Point-to-Point Protocol
pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
#options 	PPPOE_SERVER		# Enable PPPoE server via link0
pseudo-device	sl			# Serial Line IP
pseudo-device	irframetty		# IrDA frame line discipline
pseudo-device	tap			# virtual Ethernet
pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
#pseudo-device	faith			# IPv[46] TCP relay translation i/f
pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
pseudo-device	vlan			# IEEE 802.1q encapsulation
pseudo-device	bridge			# simple inter-network bridging
pseudo-device	vether			# Virtual Ethernet for bridge
pseudo-device	agr			# IEEE 802.3ad link aggregation
pseudo-device	l2tp			# L2TPv3 interface
pseudo-device	lagg			# Link Aggregation interface
pseudo-device	npf			# NPF packet filter
# srt is EXPERIMENTAL
#pseudo-device	srt			# source-address-based routing

#pseudo-device	canloop			# CAN loopback interface

#
# accept filters
pseudo-device	accf_data		# "dataready" accept filter
pseudo-device	accf_http		# "httpready" accept filter

# miscellaneous pseudo-devices
pseudo-device	pty			# pseudo-terminals
pseudo-device	sequencer		# MIDI sequencer
# rnd works; RND_COM does not on port i386 yet.
#options 	RND_COM			# use "com" randomness as well (BROKEN)
pseudo-device	clockctl		# user control of clock subsystem
pseudo-device	ksyms			# /dev/ksyms
pseudo-device	lockstat		# lock profiling
pseudo-device	bcsp			# BlueCore Serial Protocol
pseudo-device	btuart			# Bluetooth HCI UART (H4)
#pseudo-device	gpiosim		1	# GPIO simulator
pseudo-device 	swwdog			# software watchdog timer -- swwdog(4)

# wscons pseudo-devices
pseudo-device	wsmux			# mouse & keyboard multiplexor
pseudo-device	wsfont

# cmos(4) pseudo-device
pseudo-device	cmos

# userland interface to drivers, including autoconf and properties retrieval
pseudo-device	drvctl

# EFI runtime support
options 	EFI_RUNTIME
pseudo-device 	efi			# /dev/efi

include "dev/veriexec.config"

options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard
options 	PAX_MPROTECT=1		# PaX mprotect(2) restrictions
options 	PAX_MPROTECT_DEBUG=1	# PaX mprotect debug
options 	PAX_ASLR=1		# PaX Address Space Layout Randomization

# Pull in optional local configuration - always at end
cinclude	"arch/i386/conf/GENERIC.local"
@


1.1261
log
@x86: Wire up PCI resource manager if enabled.

Enable in your kernel config with `options PCI_RESOURCE'.

Adapted from a patch by mlelstv@@.

PR port-amd64/59118: Thinkpad T495s - iwm PCI BAR is zero
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1260 2025/03/27 12:22:59 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1260 $"
d431 2
@


1.1260
log
@x86: Enable vio9p(4) out of the box.

PR kern/59211: vio9p(4): missing from various GENERICs and MAKEDEVs
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1259 2025/03/27 12:22:44 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1259 $"
d417 2
@


1.1260.2.1
log
@Pull up following revision(s) (requested by riastradh in ticket #66):

	sys/arch/x86/include/mpacpi.h: revision 1.12
	sys/arch/x86/x86/mpacpi.c: revision 1.112
	sys/arch/amd64/conf/ALL: revision 1.194
	sys/arch/i386/conf/ALL: revision 1.524
	sys/arch/x86/acpi/acpi_machdep.c: revision 1.40
	sys/arch/i386/conf/GENERIC: revision 1.1261
	sys/dev/acpi/acpi_mcfg.h: revision 1.6
	sys/arch/amd64/conf/GENERIC: revision 1.618

x86: Wire up PCI resource manager if enabled.

Enable in your kernel config with `options PCI_RESOURCE'.

Adapted from a patch by mlelstv@@.
PR port-amd64/59118: Thinkpad T495s - iwm PCI BAR is zero
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1260 2025/03/27 12:22:59 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1260 $"
a416 2
#options 	PCI_RESOURCE		# Allocate unconfigured PCI resources

@


1.1260.2.2
log
@Apply patch (requested by martin in ticket #182):
Remove "options DIAGNOSTIC" and "options DEBUG" from all kernels
and _DIAGNOSTIC from libc.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1260.2.1 2025/10/20 14:09:34 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1260.2.1 $"
d121 1
a121 1
#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
@


1.1259
log
@virtio(4): Consolidate kernel configs.

No functional change intended.

Leave `# XXX ?' comments where I don't know why the driver in
question is excluded.  (Typical reason is that PAGE_SIZE is not 4096
but I didn't investigate -- if you do investigate, please either
update the comment if you determine a reason, or enable the driver if
you don't.)

PR kern/59211: vio9p(4): missing from various GENERICs and MAKEDEVs
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1258 2024/08/27 00:56:16 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1258 $"
a1412 1
no vio9p* at virtio?			# XXX ?
@


1.1258
log
@amd64, evbarm, i386: Add acpivmgenid(4) to GENERIC.

PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1257 2024/07/16 12:01:19 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1257 $"
d1411 3
a1413 7
viomb* at virtio?			# Virtio memory balloon device
ld* at virtio?				# Virtio disk device
viocon* at virtio?			# Virtio serial device
vioif* at virtio?			# Virtio network device
viornd* at virtio?			# Virtio entropy device
vioscsi* at virtio?			# Virtio SCSI device
#vio9p*	at virtio?			# Virtio 9P device
@


1.1257
log
@viocon(4): Add to various kernel configs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1256 2024/04/30 19:35:28 andvar Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1256 $"
d327 1
@


1.1256
log
@viac7temp(4): rewrite temperature sensor to read value from MSR instead of using
documented cpuid instruction and eax register.

This approach is adapted from linux via-cputemp.c, no official documentation is
currently available. However, msr value seems to work on all tested CPUs while
documented cpuid instruction typically reports 0, even for my C7-D CPU.
msr value seems to have temperature in Celsius in lower 24-bits without fraction
(thus "msr & 0xffffff;" is used).

Tested on my personal systems based on CPUs below (i386 and amd64):
C7-D 1.6GHz (i386 only), Nano X2 L4350E, Nano X2 U4300, U2300 Nano, KX-U6580.
Also got one response via email which was based on Nano X2 L4050 (VE-900).
Nano reports independent values for each core.
KX-U6580 seems to show the same value for all cores but more testing is needed.

Since it works on amd64 capable CPUs, adding driver to GENERIC kernel config.
Also moving viac7temp man page to x86 instead of i386 (with updates).
In theory the change should add support for all VIA Nano CPUs and Zhaoxin CPUs
 at least up to KX-6000(G) series.

In the future I may need to introduce amd64 kernel module as well.

Plan to pullup to at least netbsd-10.

Patch mainly reviewed by riastradh.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1255 2024/04/21 14:11:12 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1255 $"
d1412 1
@


1.1256.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1260 2025/03/27 12:22:59 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1260 $"
a326 1
acpivmgenid*	at acpi?		# ACPI Virtual Machine Generation ID
d1410 6
a1415 2

include "dev/virtio/virtio.config"
@


1.1255
log
@apei(4), acpihed(4): Enable in x86 GENERIC.

Let's just see how this works out in practice.  Might need to reduce
the overhead of each GHES on machines with thousands of them, but
we'll see.

PR kern/58046
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1254 2024/04/02 22:56:50 charlotte Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1254 $"
d44 1
a44 1
viac7temp*	at cpu?		# VIA C7 temperature sensor
@


1.1254
log
@Mention DKWEDGE_METHOD_TOS in several kernel config files
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1253 2024/01/29 18:27:13 christos Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1253 $"
d320 1
d329 1
@


1.1253
log
@PR/57889: Ricardo Branco: ext2fs does not have user immutable and append
file flags, only system ones. Restrict those to the superuser. Before
the behavior was controlled by EXT2FS_SYSTEM_FLAGS. Make that behavior the
default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1252 2023/10/23 01:43:55 msaitoh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1252 $"
d158 1
@


1.1252
log
@eqos(4): Disable eqos(4) by default because it's not stable on x86.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1251 2023/10/20 10:09:44 msaitoh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1251 $"
a170 2
#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
				# immutable) behave as system flags.
@


1.1251
log
@eqos(4): Add initial support for Intel Elkhart Lake internal Ethernet devices.

 - Only tested on PSE SGMII 1G Ethernet MAC with MaxLinear GPY115.
 - I don't know why dmat64 doesn't work. eqos_attach() have a special
   code if EQOS_HW_FEATURE_ADDR64_32BIT(sc) is true, but it seems it doesn't
   work.
 - TODO:
 	Multiqueue support.
	Detach support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1250 2023/07/16 10:20:07 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1250 $"
d985 1
a985 1
eqos*	at pci? dev ? function ?	# DesignWare Ethernet QoS
@


1.1250
log
@i386: Re-enable HEARTBEAT.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1249 2023/07/16 05:24:08 mrg Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1249 $"
d985 1
@


1.1249
log
@revert previous change to enable HEARTBEAT.

the new code has a "needs 64-bit atomic ops" trigger:

	ci->ci_heartbeat_uptime_cache = atomic_load_relaxed(&time_uptime);

but time_uptime is a 64-bit value, and this trips CTASSERT().
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1248 2023/07/15 22:14:39 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1248 $"
d143 4
@


1.1248
log
@x86: Enable HEARTBEAT by default in GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1247 2023/05/22 16:28:34 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1247 $"
a142 4
# Heartbeat checks
options 	HEARTBEAT
options 	HEARTBEAT_MAX_PERIOD_DEFAULT=15

@


1.1247
log
@i386/GENERIC: Enable EFI runtime support.

PR kern/57076

XXX pullup-10
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1246 2023/02/09 14:09:48 abs Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1246 $"
d143 4
@


1.1246
log
@Adjust _all_ cinclude of *.local files

- Ensure always at end
- Use tab rather than spaces
- Add consistent comment
  "Pull in optional local configuration - always at end"

The only functional change is that a local file which tried to
override an existing setting (eg with "no foo") would have failed
in some cases before, but now will work
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1245 2023/02/09 13:16:04 abs Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1245 $"
d1507 3
a1509 3
# EFI runtime support -- not yet tested
#options 	EFI_RUNTIME
#pseudo-device 	efi			# /dev/efi
@


1.1245
log
@Ensure GENERIC.local is always at the end of GENERIC

Where a GENERIC config had an existing inclusion of GENERIC.local,
ensure it is always at the end of the file, with a consistent
comment:

# Pull in optional local configuration
cinclude "arch/landisk/conf/GENERIC.local"

This allows GENERIC.local to correctly override all options

(This pass does not affect any GENERIC which did not already have
an include of GENERIC.local)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1244 2022/12/22 19:07:16 jakllsch Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1244 $"
d1519 2
a1520 2
# Pull in optional local configuration
cinclude "arch/i386/conf/GENERIC.local"
@


1.1244
log
@Add commented vio9p* to match amd64 GENERIC
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1243 2022/12/11 04:20:52 tsutsui Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1243 $"
a1422 5

# Pull in optional local configuration
cinclude "arch/i386/conf/GENERIC.local"


d1518 3
@


1.1243
log
@Enable options DISKLABEL_EI by default as amd64.

No particular comment no port-i386@@:
 https://mail-index.netbsd.org/port-i386/2022/12/02/msg004063.html
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1242 2022/09/29 10:10:07 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1242 $"
d1409 1
@


1.1243.2.1
log
@Pull up following revision(s) (requested by riastradh in ticket #293):

	sys/arch/i386/conf/ALL: revision 1.507
	sys/arch/i386/conf/GENERIC: revision 1.1247

i386/ALL: Enable EFI runtime support.
PR kern/57076

i386/GENERIC: Enable EFI runtime support.
PR kern/57076
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1243 2022/12/11 04:20:52 tsutsui Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1243 $"
d1511 3
a1513 3
# EFI runtime support
options 	EFI_RUNTIME
pseudo-device 	efi			# /dev/efi
@


1.1243.2.2
log
@Apply patch (requested by martin in ticket #401):
Disable DIAGNOSTIC/DEBUG.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1243.2.1 2023/08/01 16:07:19 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1243.2.1 $"
d121 1
a121 1
#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
@


1.1243.2.3
log
@Pull up following revision(s) (requested by msaitoh in ticket #446):

	sys/dev/pci/if_eqos_pci.c: revision 1.3
	sys/arch/i386/conf/GENERIC: revision 1.1251
	sys/arch/i386/conf/GENERIC: revision 1.1252
	sys/arch/amd64/conf/GENERIC: revision 1.607
	sys/arch/amd64/conf/GENERIC: revision 1.608
	sys/dev/ic/dwc_eqos.c: revision 1.20
	sys/dev/ic/dwc_eqos.c: revision 1.21
	share/man/man4/eqos.4: revision 1.2
	sys/dev/ic/dwc_eqos.c: revision 1.22
	sys/dev/ic/dwc_eqos_reg.h: revision 1.7
	sys/dev/ic/dwc_eqos.c: revision 1.23
	sys/dev/ic/dwc_eqos_reg.h: revision 1.8
	sys/dev/ic/dwc_eqos.c: revision 1.24
	sys/dev/ic/dwc_eqos.c: revision 1.25
	sys/dev/ic/dwc_eqos.c: revision 1.26
	sys/dev/ic/dwc_eqos.c: revision 1.27
	sys/dev/ic/dwc_eqos_var.h: revision 1.5
	sys/dev/ic/dwc_eqos.c: revision 1.28
	sys/dev/ic/dwc_eqos_var.h: revision 1.6
	sys/dev/ic/dwc_eqos.c: revision 1.29
	sys/dev/ic/dwc_eqos.c: revision 1.18
	sys/dev/ic/dwc_eqos.c: revision 1.19
	sys/dev/pci/files.pci: revision 1.448
	sys/dev/pci/if_eqos_pci.c: revision 1.1
	sys/dev/pci/if_eqos_pci.c: revision 1.2

eqos(4): Fix definition of GMAC_MAC_HW_FEATURE1_RXFIFOSIZE.

eqos(4): Fix a bug that the MAC address is swapped.
 Don't swap the MAC address in eqos_get_eaddr(). Other OSes except FreeBSD
(which was based on NetBSD's) don't swap it. With this change, my own
OnLogic Helix 330's MAC address becomes correct. The OUI is 84:8b:cd:4d.
It's owned by Logic Supply and they were acquired by OnLogic.

On Quartz64 with UEFI, the MAC address is wrongly set and the multicast
bit might be set. To do workaround, clear the bit if it's set.

eqos(4): Add missing clock range.

eqos(4): Accept if snpsver == 0x52. Tested with Intel Elkhart Lake.

 TODO:
	Multiqueue support.
	Add watchdog timer.
	Add detach function.

eqos(4): Add initial support for Intel Elkhart Lake internal Ethernet devices.
 - Only tested on PSE SGMII 1G Ethernet MAC with MaxLinear GPY115.
 - I don't know why dmat64 doesn't work. eqos_attach() have a special
   code if EQOS_HW_FEATURE_ADDR64_32BIT(sc) is true, but it seems it doesn't
   work.
 - TODO:
 	Multiqueue support.
	Detach support.

eqos(4): Fix compile error for arch that sizeof(bus_size_t) == 4 (i386).
Trailing whitespace

eqos(4): Disable eqos(4) by default because it's not stable on x86.

eqos(4): KNF. No functional change.

eqos(4): Add and modify some DPRINTF()s.

eqos(4): Add sysctls for debugging.

eqos(4): Use EQOS_TXLOCK() more to be stable.
 Fix a bug that sc_tx.{cur,next,queued} become inconsitent.
Use txlock when accessing TX data.

eqos(4): Set TX/RX DMA burst length to improve performance.

eqos(4): Set flow control correctly.

eqos_pci: Limit to 32bit DMA only for PSE devices.

eqos(4): Fix typo in comment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1243.2.2 2023/10/09 23:33:46 snj Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1243.2.2 $"
a980 1
#eqos*	at pci? dev ? function ?	# DesignWare Ethernet QoS
@


1.1243.2.4
log
@Pull up following revision(s) (requested by andvar in ticket #700):

	sys/arch/i386/conf/GENERIC: revision 1.1256
	share/man/man4/man4.x86/viac7temp.4: revision 1.1
	sys/arch/x86/x86/viac7temp.c: revision 1.11
	share/man/man4/man4.x86/Makefile: revision 1.24
	share/man/man4/man4.i386/viac7temp.4: file removal
	share/man/man4/man4.i386/Makefile: revision 1.81
	distrib/sets/lists/man/mi: revision 1.1773
	sys/arch/amd64/conf/GENERIC: revision 1.612
	sys/arch/amd64/conf/ALL: revision 1.188
	sys/arch/i386/conf/ALL: revision 1.519

viac7temp(4): rewrite temperature sensor to read value from MSR instead of using
documented cpuid instruction and eax register.

This approach is adapted from linux via-cputemp.c, no official documentation is
currently available. However, msr value seems to work on all tested CPUs while
documented cpuid instruction typically reports 0, even for my C7-D CPU.
msr value seems to have temperature in Celsius in lower 24-bits without fraction
(thus "msr & 0xffffff;" is used).

Tested on my personal systems based on CPUs below (i386 and amd64):
C7-D 1.6GHz (i386 only), Nano X2 L4350E, Nano X2 U4300, U2300 Nano, KX-U6580.
Also got one response via email which was based on Nano X2 L4050 (VE-900).

Nano reports independent values for each core.

KX-U6580 seems to show the same value for all cores but more testing is needed.

Since it works on amd64 capable CPUs, adding driver to GENERIC kernel config.

Also moving viac7temp man page to x86 instead of i386 (with updates).

In theory the change should add support for all VIA Nano CPUs and Zhaoxin CPUs
 at least up to KX-6000(G) series.

In the future I may need to introduce amd64 kernel module as well.

Patch mainly reviewed by riastradh.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1243.2.3 2023/11/03 08:56:36 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1243.2.3 $"
d44 1
a44 1
viac7temp*	at cpu?		# VIA C7, Nano and Zhaoxin temperature sensor
@


1.1243.2.5
log
@Pull up following revision(s) (requested by riastradh in ticket #939):

	distrib/sets/lists/debug/module.md.amd64: revision 1.18
	sys/modules/Makefile: revision 1.292
	lib/libc/gen/arc4random.c: revision 1.34
	lib/libc/gen/arc4random.c: revision 1.35
	lib/libc/gen/arc4random.c: revision 1.36
	lib/libc/gen/arc4random.c: revision 1.37
	sys/kern/kern_entropy.c: revision 1.70
	lib/libc/gen/arc4random.c: revision 1.38
	sys/kern/kern_entropy.c: revision 1.71
	lib/libc/gen/getentropy.3: revision 1.8
	distrib/sets/lists/modules/md.amd64: revision 1.103
	share/man/man4/rnd.4: revision 1.42
	share/man/man4/rnd.4: revision 1.44
	lib/libc/include/arc4random.h: revision 1.1
	distrib/sets/lists/man/mi: revision 1.1786
	sys/arch/i386/conf/GENERIC: revision 1.1258
	sys/modules/acpivmgenid/acpivmgenid.ioconf: revision 1.1
	sys/arch/amd64/conf/ALL: revision 1.190
	distrib/sets/lists/debug/mi: revision 1.446
	sys/arch/i386/conf/ALL: revision 1.521
	lib/libc/gen/Makefile.inc: revision 1.219
	distrib/sets/lists/debug/module.md.i386: revision 1.12
	sys/dev/acpi/acpi_vmgenid.c: revision 1.1
	sys/dev/acpi/acpi_vmgenid.c: revision 1.2
	lib/libc/include/reentrant.h: revision 1.22
	sys/arch/evbarm/conf/GENERIC64: revision 1.219
	share/man/man4/Makefile: revision 1.735
	distrib/sets/lists/modules/md.i386: revision 1.100
	distrib/sets/lists/tests/mi: revision 1.1334
	lib/libc/gen/arc4random.3: revision 1.22
	sys/dev/acpi/files.acpi: revision 1.133
	lib/libc/gen/arc4random.3: revision 1.23
	tests/lib/libc/gen/t_arc4random.c: revision 1.1
	sys/sys/entropy.h: revision 1.6
	sys/arch/amd64/conf/GENERIC: revision 1.614
	sys/modules/acpivmgenid/Makefile: revision 1.1
	share/man/man4/acpivmgenid.4: revision 1.1
	lib/libc/gen/Makefile.inc: revision 1.220
	tests/lib/libc/gen/Makefile: revision 1.56
	share/man/man4/acpivmgenid.4: revision 1.2
	share/man/man4/acpivmgenid.4: revision 1.3

	(all via patch)

Catch up with all the lint warnings since exit on warning was disabled.

Disable 'missing header declaration' and 'nested extern' warnings for now.
acpivmgenid(4): New driver for virtual machine generation ID.

Added to amd64/ALL and i386/ALL kernel configurations, and made
available as a loadable module acpivmgenid.kmod on x86, for now.
TBD: Add to all ACPI-supporting GENERIC kernels.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

entropy(9): Factor out subroutines to reset and gather entropy.
`Reset' means we keep the data in the pool, but assume it had zero
entropy.  `Gather' means we request samples from all on-demand
sources and wait for the synchronous ones to complete.

No functional change intended, other than to expose new symbols --
just preparation to expose these to acpivmgenid(4), so it can use
these when the VM host notifies us that we, the guest, have been
cloned.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

acpivmgenid(4): Reset and gather entropy on VM clone notification.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

arc4random(3): Reseed if system entropy epoch changes.
This can happen, for example, if the system is a VM instance, and the
VM is cloned.

This incurs the cost of a system call on every arc4random call, which
is unfortunate, but
1. we don't currently have a (machine-independent) mechanism for
   exposing a read-only page to userland shared by the kernel to
   enable a cheaper access path to the entropy epoch; and
2. the algorithm here -- a simple application of ChaCha -- is likely
   also a bottleneck and could be much cheaper by
   (a) using sys/crypto/chacha for machine-dependent vectorized
       ChaCha code, and
   (b) filling a buffer (somewhere between a cipher block and a page)
       in a batch at a time, instead of running ChaCha to generate
       only 32 bytes at a time.
So although this might be a performance hit, the security benefit is
worthwhile and we have a clear path to do better than reversing the
performance hit later.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

acpivmgenid(4): Nix BUGS that have been squashed.
Reference kern.entropy.epoch for the remaining bug (which is a
performance issue, not a security issue).
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

entropy(9): Allow unprivileged reads of sysctl kern.entropy.epoch.

Applications need this in order to know when to reseed.  (We should
also expose it through a page shared read-only with userland for
cheaper access, but until we do, let's let applications get at it
through sysctl.)
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

arc4random.c: Fix test program.

This isn't wired up anywhere, but let's reduce the bitrot.  It was
helpful in reminding me that kern.entropy.epoch was, for reasons I
can't remember, restricted to privileged access.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

amd64, evbarm, i386: Add acpivmgenid(4) to GENERIC.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

rnd(4): Document kern.entropy.epoch is unprivileged and elaborate.
Cross-reference acpivmgenid(4).
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

arc4random(3): Note that arc4random respects kern.entropy.epoch.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork
Add debug info for new acpivmgenid module

arc4random(3): Add automatic tests.

This verifies that:
- arc4random zeroes its state and reseeds itself on fork
- arc4random reseeds itself on entropy consolidation (e.g., VM clone)
- arc4random falls back to global state if it can't allocate local
  state because address space limits cause mmap to fail

NOTE: This adds a new libc symbol __arc4random_global, but it's in
the reserved namespace and only used by t_arc4random, so no libc
minor bump.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

getentropy(3): Note intent to reseed on VM clone, and caveats.

Tidy markup and pacify some mandoc -Tlint complaints while here.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

Bump dates on man pages recently updated to mention VM clones.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

arc4random(3): Pacify some of lint's complaints.
PR kern/58632: getentropy(2) and arc4random(3) do not reseed on VM
fork

arc4random: suppress another lint warning
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1243.2.4 2024/06/20 11:00:06 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1243.2.4 $"
a316 1
acpihed*	at acpi?		# ACPI Hardware Error Device
a322 1
acpivmgenid*	at acpi?		# ACPI Virtual Machine Generation ID
a324 1
apei*		at apeibus?		# ACPI Platform Error Interfaces
@


1.1242
log
@swwdog(4): Add to GENERIC kernels.

Plus a handful of others that I'm familiar with.  Lots of special-
purpose kernels should probably have this too but I'm not going
through all the arm, mips, and ppc evaluation board kernels to see
which ones are relevant.

Omitted from systems I know to be very small:
- sun2/GENERIC
- dreamcast/GENERIC
Feel free to remove it from others that need to be kept smaller.

Compile-tested a few of these just in case:
- alpha/GENERIC
- amd64/GENERIC
- evbmips/OCTEON
- i386/GENERIC
- riscv/GENERIC

PR kern/29702
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1241 2022/09/24 11:05:17 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1241 $"
d169 1
a169 1
#options 	DISKLABEL_EI	# disklabel Endian Independent support
@


1.1241
log
@x86: Support EFI runtime services.

This creates a special pmap, efi_runtime_pmap, which avoids setting
PTE_U but allows mappings to lie in what would normally be user VM --
this way we don't fall afoul of SMAP/SMEP when executing EFI runtime
services from CPL 0.  SVS does not apply to the EFI runtime pmap.

The mechanism is intended to work with either physical addressing or
virtual addressing; currently the bootloader does physical addressing
but in principle it could be modified to do virtual addressing
instead, if it allocated virtual pages, assigned them in the memory
map, and issued RT->SetVirtualAddressMap.

Not sure pmap_activate_sync and pmap_deactivate_sync are correct,
need more review from an x86 wizard.

If this causes fallout, it can be disabled temporarily without
reverting anything by just making efi_runtime_init return immediately
without doing anything, or by removing options EFI_RUNTIME.

amd64-only for now pending type fixes and testing on i386.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1240 2022/08/07 02:52:26 simonb Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1240 $"
d1499 1
@


1.1240
log
@UFS/LFS dirhash:
- Enable UFS_DIRHASH if the architecture or kernel model specific config
  file can use 128MB of RAM or more.
- Remove experimental tag from UFS_DIRHASH; it's been with RUMP kernel
  and by a number of NetBSD developers for years.
- Add LFS_DIRHASH if LFS was enabled.
- Be somewhat consistent with FS options order.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1239 2022/07/28 21:52:36 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1239 $"
d1510 4
@


1.1239
log
@drm: New option DRM_LEGACY.

This brings in the `drmums' components, which are the parts of the
current drm code base (sys/external/bsd/drm2) needed by legacy
user-mode-setting drivers (currently just viadrmums), in contrast to
the old drm code base (sys/external/bsd/drm).

This way, viadrmums.kmod can be loaded into GENERIC i386 kernels, but
platforms without any relevant legacy UMS drivers don't get the
legacy goo statically baked in.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1238 2022/04/16 11:57:46 nia Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1238 $"
d159 2
d163 2
a164 2
#options 	DISKLABEL_EI	# disklabel Endian Independent support
options 	FFS_EI		# FFS Endian Independent support
d166 1
a166 4
#options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
options 	NFSSERVER	# Network File System server
#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
options 	UFS_EXTATTR	# Extended attribute support for UFS1
d169 2
@


1.1238
log
@x86: Enable HDAUDIOVERBOSE (as on arm) in order for AUDIO_GETDEV
to return human-readable data.  Especially now that HDMI/DP audio
is enabled by default, it helps to be able to tell two devices
apart in audiocfg/aiomixer.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1237 2021/05/17 04:07:43 yamaguchi Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1237 $"
d557 2
a558 1
# DRMUMS drivers
@


1.1237
log
@Add a new link-aggregation pseudo interface named lagg(4)

 - FreeBSD's lagg(4) based implementation
 - MP-safe and MP-scalable
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1236 2021/03/10 06:38:44 msaitoh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1236 $"
d214 1
a214 1
#options 	HDAUDIOVERBOSE	# verbose HDAUDIO driver messages
@


1.1236
log
@ Add micphy(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1235 2021/03/01 18:12:58 jakllsch Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1235 $"
d1474 1
@


1.1236.4.1
log
@Sync w/ HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1237 2021/05/17 04:07:43 yamaguchi Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1237 $"
a1473 1
pseudo-device	lagg			# Link Aggregation interface
@


1.1236.6.1
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1237 2021/05/17 04:07:43 yamaguchi Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1237 $"
a1473 1
pseudo-device	lagg			# Link Aggregation interface
@


1.1235
log
@enable rge(4) on x86 and evbarm64
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1234 2021/01/20 13:22:08 nia Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1234 $"
d1129 1
@


1.1234
log
@remove compat_ossaudio from kernel modules

this is only useful with compat_linux and gets autoloaded when
compat_linux is loaded, so there's no reason to bake it into kernels
any more.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1233 2020/09/27 13:48:51 roy Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1233 $"
d1004 1
@


1.1233
log
@vether: Add to kernel configurations

It's only enabled if the kernel enabled bridge AND tap.
Otherwise it's commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1232 2020/09/08 10:05:47 yamaguchi Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1232 $"
a146 2
options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility

@


1.1233.2.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1236 2021/03/10 06:38:44 msaitoh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1236 $"
d147 2
a1005 1
rge*	at pci? dev ? function ?	# Realtek 8125
a1129 1
micphy* at mii? phy ?			# Micrel KSZ[89]xxx PHYs
@


1.1232
log
@Added iavf(4) that is based on OpenBSD's iavf(4) implementation

reviewed by msaitoh@@n.o and knakahara@@n.o
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1231 2020/08/16 10:27:47 jdolecek Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1231 $"
d1471 1
@


1.1231
log
@make COMPAT_LINUX option disabled by default

leave the option enabled only in amd64/i386 ALL kernels to make
sure it continues to be compilable also when included in kernel
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1230 2020/08/01 08:20:49 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1230 $"
d986 1
@


1.1230
log
@Remove references to BRIDGE_IPF, it is now compiled in by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1229 2020/04/25 16:10:06 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1229 $"
a147 2
options 	COMPAT_LINUX	# binary compatibility with Linux
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
@


1.1229
log
@Disable -g, which got enabled by mistake in the bouyer-xenpvh merge
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1228 2020/04/25 15:26:16 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1228 $"
a1471 1
#options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
@


1.1228
log
@Merge the bouyer-xenpvh branch, bringing in Xen PV drivers support under HVM
guests in GENERIC.
Xen support can be disabled at runtime with
boot -c
disable hypervisor
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1227.2.2 2020/04/25 15:03:18 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1227.2.2 $"
d131 1
a131 1
makeoptions	DEBUG="-g"	# compile full symbol table
@


1.1227
log
@Reduce default AUDIO_BLK_MS from 40msec to 10msec on all platform except m68k
(m68k uses 40msec default as before).  And remove the option from GENERIC.
- It's not good idea to set such parameter in individual GENERICs.
- 4msec is (probably no problem for most modern real hardware but)
  too aggressive to be default.
- 10msec is too severe for antique machines but it's hard to draw a line.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1226 2020/03/16 19:09:34 nia Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1226 $"
d47 9
d131 1
a131 1
#makeoptions	DEBUG="-g"	# compile full symbol table
@


1.1227.2.1
log
@build with -g on the branch
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1227 2020/03/28 08:35:36 isaki Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1227 $"
d122 1
a122 1
makeoptions	DEBUG="-g"	# compile full symbol table
@


1.1227.2.2
log
@Merge GENERIC_XENHVM in GENERIC.
Remove XEN3_PVHVM/XEN3PAE_PVHVM files which have been obsolete for some time
on the branch
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1227.2.1 2020/04/20 19:38:11 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1227.2.1 $"
a46 9
#Xen PV support for HVM guests
options 	XENPVHVM
options 	XEN
hypervisor*	at mainbus?		# Xen hypervisor
xenbus*	 	at hypervisor?		# Xen virtual bus
xencons*	at hypervisor?		# Xen virtual console
xennet*  	at xenbus?		# Xen virtual network interface
xbd*		at xenbus?		# Xen virtual block device

@


1.1226
log
@Lower blk_ms on more ports that are even slightly likely to play video
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1225 2020/02/17 06:32:46 nisimura Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1225 $"
a79 3
options		AUDIO_BLK_MS=4	# make software with low latency needs performant
				# no substantial CPU overhead on this platform

@


1.1225
log
@add kse(4) for i386/amd64 GENERIC
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1224 2020/02/09 16:06:18 jmcneill Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1224 $"
d80 3
@


1.1224
log
@Retire azalia(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1223 2020/01/25 18:38:36 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1223 $"
d986 1
@


1.1223
log
@Retire "le* at pci?" from the shipped kernel configs:
- If the config had both an le@@pci and a pcn, simply remove le@@pci
  (pcn would match at a higher priority anyway).
- If the config had le@@pci enabled, but no pcn, change le@@pci to pcn.
- If the config had le@@pci commented out, but no pcn, change le@@pci
  to pcn and leave it commented out.

The pcn driver supports more chips than le@@pci and does DMA directly
to/from mbufs rather than memory copies.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1222 2020/01/20 18:38:20 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1222 $"
a1205 1
#azalia* at pci? dev ? function ?	# High Definition Audio
@


1.1222
log
@Remove FDDI support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1221 2020/01/19 20:00:37 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1221 $"
a985 1
le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
@


1.1221
log
@Remove Token Ring support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1220 2020/01/19 06:55:23 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1220 $"
a975 1
fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
a1021 1
fea*	at eisa? slot ?			# DEC DEFEA FDDI
@


1.1220
log
@Remove HIPPI support and the esh(4) driver that uses it.  There have not
been any users of HIPPI for some time, and it is unlikely to be resurrected.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1219 2020/01/19 01:25:05 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1219 $"
a1031 1
tr*	at isapnp?			# IBM/3Com TROPIC Token-Ring
a1043 2
# tr at pcmcia has problems with Cardbus bridges
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
a1074 3
tr0	at isa? port 0xa20 iomem 0xd8000 irq ?	# IBM TROPIC based Token-Ring
tr1	at isa? port 0xa24 iomem 0xd0000 irq ?	# IBM TROPIC based Token-Ring
tr*	at isa? port ? irq ?			# 3Com TROPIC based Token-Ring
a1097 1
tr*	at mca? slot ?			# IBM Token Ring adapter
@


1.1219
log
@Remove the strip(4) - Starmode Radio IP - pseudo-device driver.  It is
long since obsolete.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1218 2020/01/01 10:36:43 ryo Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1218 $"
a973 1
esh*	at pci? dev ? function ?	# Essential HIPPI card
@


1.1218
log
@add aq(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1217 2019/12/10 12:08:52 yamaguchi Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1217 $"
a1464 1
pseudo-device	strip			# Starmode Radio IP (Metricom)
@


1.1218.2.1
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1223 2020/01/25 18:38:36 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1223 $"
d974 1
d977 1
d988 1
d1024 1
d1033 1
d1046 2
d1079 3
d1105 1
d1465 1
@


1.1218.2.2
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1218.2.1 2020/01/25 22:38:40 ad Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1225 $"
a985 1
kse*	at pci? dev ? function ?	# Micrel KSZ8841/8842 ethernet
d1206 1
@


1.1217
log
@Ported driver for Intel Ethernet 700 series

reviewed by msaitoh and knakahara
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1216 2019/12/05 22:05:05 sevan Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1216 $"
d962 1
@


1.1216
log
@Enable pciverbose option to make use of the pcidevs database by default.

ok ad, mrg
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1215 2019/11/01 02:53:23 msaitoh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1215 $"
d985 1
@


1.1215
log
@ Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD with some cleanup
and IFM_NONE support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1214 2019/10/30 12:06:25 msaitoh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1214 $"
d201 1
a201 1
#options 	PCIVERBOSE	# verbose PCI device autoconfig messages
@


1.1214
log
@Add jmphy(4) from OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1213 2019/10/25 17:39:57 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1213 $"
d1137 1
@


1.1213
log
@Add support for Nuvoton NCT5104D GPIO chips, as found on PC Engines APU
systems. From Andrew Doran in PR kern/54648.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1212 2019/10/08 18:50:44 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1212 $"
d1127 1
@


1.1212
log
@No I/O ports for TPM-ISA, only MMIO, so remove commented-out options.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1211 2019/10/07 11:53:40 msaitoh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1211 $"
d740 3
@


1.1211
log
@ Add support IC Plus IP1000* PHYs. PR/kern 42314 first reported by
Tomokazu HARADA and patch provided by Andrius V.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1210 2019/08/09 08:01:06 rin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1210 $"
a1369 4
#tpm*	at isa? port 0x02e
#tpm*	at isa? port 0x04e
#tpm*	at isa? port 0x07e
#tpm*	at isa? port 0x0ee
@


1.1210
log
@xhci(4) is considered stable enough. So, remove misleading comments.

XXX
pullup to netbsd-9
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1209 2019/08/08 04:25:21 msaitoh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1209 $"
d1123 1
@


1.1209
log
@ Use <SPACE>+<TAB>
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1208 2019/06/17 19:01:17 kamil Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1208 $"
a1142 1
					# xhci is at best experimental
@


1.1208
log
@Register UBSAN_ALWAYS_FATAL in kernel configs for kUBSan
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1207 2019/05/24 14:28:48 nonaka Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1207 $"
d123 2
a124 2
#options	KUBSAN		# Kernel Undefined Behavior Sanitizer (kUBSan)
#options	UBSAN_ALWAYS_FATAL	# (optional) Panic on all kUBSan reports
d132 1
a132 1
#options	KCOV
@


1.1208.2.1
log
@Pull up following revision(s) (requested by rin in ticket #35):

	sys/arch/amd64/conf/ALL: revision 1.121
	sys/arch/i386/conf/XEN3PAE_DOM0: revision 1.14
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.168
	sys/arch/i386/conf/GENERIC: revision 1.1210
	sys/arch/amd64/conf/GENERIC: revision 1.534

xhci(4) is considered stable enough. So, remove misleading comments.

XXX
pullup to netbsd-9
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1208 2019/06/17 19:01:17 kamil Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1208 $"
d1143 1
@


1.1208.2.2
log
@In preparation for the upcoming release, turn off DIAGNOSTIC in most
kernel configs, modules and libc.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1208.2.1 2019/08/09 15:59:52 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1208.2.1 $"
d112 1
a112 1
#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
d1509 1
a1509 1
#options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
d1512 1
a1512 1
#options 	PAX_MPROTECT_DEBUG=1	# PaX mprotect debug
@


1.1208.2.3
log
@Pull up following revision(s) (requested by msaitoh in ticket #476):

	sys/dev/pci/if_stgereg.h: revision 1.6
	sys/arch/amd64/conf/ALL: revision 1.124
	sys/dev/mii/files.mii: revision 1.51
	share/man/man4/vge.4: revision 1.8
	share/man/man4/vge.4: revision 1.9
	distrib/sets/lists/man/mi: revision 1.1656
	sys/arch/i386/conf/ALL: revision 1.471
	share/man/man4/mii.4: revision 1.28
	sys/dev/pci/if_stge.c: revision 1.71
	sys/dev/mii/ipgphy.c: revision 1.1
	sys/dev/mii/ipgphy.c: revision 1.2
	share/man/man4/Makefile: revision 1.684
	sys/dev/mii/ipgphy.c: revision 1.3
	sys/dev/mii/ipgphyreg.h: revision 1.1
	sys/dev/mii/ipgphy.c: revision 1.4
	sys/dev/mii/ipgphyreg.h: revision 1.2
	sys/dev/mii/ipgphy.c: revision 1.5
	sys/dev/mii/ipgphyreg.h: revision 1.3
	sys/dev/DEVNAMES: revision 1.322
	sys/arch/i386/conf/GENERIC: revision 1.1211
	sys/arch/amd64/conf/GENERIC: revision 1.537
	share/man/man4/ipgphy.4: revision 1.1
	share/man/man4/ipgphy.4: revision 1.2

 Add support IC Plus IP1000* PHYs. PR/kern 42314 first reported by

Tomokazu HARADA and patch provided by Andrius V.

New sentence, new line.
Fix date. Add RCS Id.

 KNF. No functional change.

 STGE_PhyCtrl is not PHY register but MAC register, so use ukphy_status()
for IP1000A device.

- Use auto-negotiation when forcing 1000BASE-T.
- Add XXX comment for strange pause setting code. I suspect this is wrong.
- On my environments, 1000BASE-T half duplex doesn't work, so we might remove
  IFM_1000T_HDX from this device in future.
- Define IPGPHY_SCR's address.
- Whitespace fix.

 Add missing NetBSD RCS Id. Reported by Andrius V.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1208.2.2 2019/11/21 18:17:59 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1208.2.2 $"
a1122 1
ipgphy* at mii? phy ?			# IC PLUS IP1000A/IP1001 PHYs
@


1.1208.2.4
log
@Pull up following revision(s) (requested by msaitoh in ticket #478):

	sys/dev/mii/smscphy.c: revision 1.1
	sys/arch/amd64/conf/ALL: revision 1.127
	sys/arch/amd64/conf/ALL: revision 1.128
	sys/dev/mii/files.mii: revision 1.52
	sys/dev/mii/files.mii: revision 1.53
	sys/arch/i386/conf/ALL: revision 1.473
	share/man/man4/mii.4: revision 1.29
	sys/arch/i386/conf/ALL: revision 1.474
	sys/arch/amd64/conf/GENERIC: revision 1.543
	sys/arch/amd64/conf/GENERIC: revision 1.544
	sys/dev/mii/jmphyreg.h: revision 1.1
	share/man/man4/Makefile: revision 1.687
	share/man/man4/smscphy.4: revision 1.1
	share/man/man4/Makefile: revision 1.688
	sys/dev/mii/jmphy.c: revision 1.1
	sys/dev/DEVNAMES: revision 1.324
	sys/dev/DEVNAMES: revision 1.325
	distrib/sets/lists/man/mi: revision 1.1661
	sys/arch/i386/conf/GENERIC: revision 1.1214
	distrib/sets/lists/man/mi: revision 1.1662
	sys/arch/i386/conf/GENERIC: revision 1.1215
	share/man/man4/jmphy.4: revision 1.1
	share/man/man4/jme.4: revision 1.8

Add jmphy(4) from OpenBSD.

Add jmphy.4.

 Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD with some cleanup
and IFM_NONE support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1208.2.3 2019/11/25 16:44:32 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1208.2.3 $"
a1123 1
jmphy*	at mii? phy ?			# Jmicron JMP202/211 PHYs
a1132 1
smscphy* at mii? phy ?			# SMSC LAN87xx PHYs
@


1.1208.2.5
log
@Pull up following revision(s) (requested by jmcneill in ticket #980):

	sys/dev/pci/if_aq.c: revision 1.4
	sys/dev/pci/if_aq.c: revision 1.5
	sys/arch/amd64/conf/GENERIC: revision 1.553
	sys/dev/pci/files.pci: revision 1.419
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.170
	sys/dev/pci/if_aq.c: revision 1.9
	share/man/man4/Makefile: revision 1.693
	sys/dev/pci/pcidevs: revision 1.1411
	share/man/man4/aq.4: revision 1.1
	share/man/man4/aq.4: revision 1.3
	sys/arch/i386/conf/ALL: revision 1.479
	share/man/man4/aq.4: revision 1.4
	sys/dev/pci/if_aq.c: revision 1.10
	sys/dev/pci/files.pci: revision 1.421
	sys/dev/pci/if_aq.c: revision 1.11
	sys/dev/pci/if_aq.c: revision 1.12
	sys/dev/pci/if_aq.c: revision 1.13
	sys/dev/pci/if_aq.c: revision 1.14
	sys/dev/pci/if_aq.c: revision 1.15
	sys/dev/pci/if_aq.c: revision 1.16
	sys/dev/pci/pcidevs: revision 1.1408
	sys/arch/amd64/conf/ALL: revision 1.135
	sys/net/ethertypes.h: revision 1.19
	sys/arch/i386/conf/GENERIC: revision 1.1218
	distrib/sets/lists/man/mi: revision 1.1668
	sys/dev/pci/if_aq.c: revision 1.1
	sys/dev/pci/if_aq.c: revision 1.2
	sys/dev/pci/pcidevs: revision 1.1395
	sys/dev/pci/if_aq.c: revision 1.3
	sys/arch/evbarm/conf/GENERIC64: revision 1.125

Add the ETHERTYPE_QINQ for 802.1ad VLAN stacking

add Aquantia AQC 10G network adapters
add support Aquantia AQC seriese 10G network adapters.

this driver is based on the FreeBSD version https://github.com/Aquantia/aqtion-freebsd ,
but drastically rewritten for NetBSD.

add aq(4)

 Add Aquantia AQC100, AQC100S and D100.

add support VLAN HW filter

set/clear IFF_OACTIVE flag only on txring 0

make counters per queue

support internal PHY temperature sensor

Found by kUBSan:
- Use unsigned to avoid undefined behavior in aq_hw_init().
- Cast to unsigned to avoid undefined behavior in aq_set_mac_addr().

fix descriptions of register map in comment

return the ifmedia active status correctly even while the link is not up after attach.
pointed out by msaitoh@@. thanks.

On FIBRE devices, there are times when linkstat interrupt doesn't occur?
reported from Andrius V. thanks.
- use polling instead of linkstat interrupt when FIBRE
- add AQ_FORCE_POLL_LINKSTAT options (not by default)

sort product table, and tabify

add support AQC100S and D100.
not tested, but they are probably the same as the AQC100.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1208.2.4 2019/11/25 20:47:24 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1208.2.4 $"
a958 1
aq*	at pci? dev ? function ?	# Aquantia AQC 10 gigabit
@


1.1208.2.6
log
@Pull up following revision(s) (requested by tsutsui in ticket #1589):

	sys/arch/i386/conf/GENERIC: revision 1.1243

Enable options DISKLABEL_EI by default as amd64.

No particular comment no port-i386@@:
https://mail-index.netbsd.org/port-i386/2022/12/02/msg004063.html
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1208.2.5 2020/07/07 10:29:06 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1208.2.5 $"
d156 1
a156 1
options 	DISKLABEL_EI	# disklabel Endian Independent support
@


1.1207
log
@Added drivers for Hyper-V Synthetic Keyboard and Video device.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1206 2019/05/06 02:24:37 sevan Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1206 $"
d124 1
@


1.1206
log
@Use filesystems.config to reduce duplication
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1205 2019/04/26 21:40:30 sevan Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1205 $"
d1409 3
@


1.1205
log
@Enable BUFQ_PRIOCSCAN, CARP, Veriexec by default in GENERIC kernel configs.
On ports without a GENERIC kernel config enable in individul files, e.g evbmips.
Omit on:
atari, dreamcast, emips, epoc32, evbppc/VIRTEX*, ia64, luna68x, mvme68k,
mvmeppc, playstation2, riscv, sun2, sun3, x68k, zaurus due to resource
constraints or port infancy.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1204 2019/03/01 12:23:10 nonaka Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1204 $"
d149 2
a150 24
file-system	FFS		# UFS
file-system	NFS		# Network File System client
file-system	EXT2FS		# second extended file system (linux)
file-system	LFS		# log-structured file system
file-system	MFS		# memory file system
file-system	NTFS		# Windows/NT file system (experimental)
file-system	CD9660		# ISO 9660 + Rock Ridge file system
file-system	MSDOSFS		# MS-DOS file system
file-system	FDESC		# /dev/fd
file-system	KERNFS		# /kern
file-system	NULLFS		# loopback file system
file-system	OVERLAY		# overlay file system
file-system	PROCFS		# /proc
file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
file-system	UMAPFS		# NULLFS + uid and gid remapping
file-system	UNION		# union file system
file-system	CODA		# Coda File System; also needs vcoda (below)
file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system	PTYFS		# /dev/ptm support
file-system	TMPFS		# Efficient memory file-system
#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system	HFS		# experimental - Apple HFS+ (read-only)
#file-system	NILFS		# experimental - NTT's NiLFS(2)
#file-system	V7FS		# 7th Edition(V7) File System
a1440 1
pseudo-device	putter			# for puffs and pud
a1493 6
# a pseudo device needed for Coda	# also needs CODA (above)
pseudo-device	vcoda			# coda minicache <-> venus comm.

# a pseudo device needed for SMBFS
pseudo-device	nsmb			# experimental - SMB requester

@


1.1204
log
@commented out hvkvp entry.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1203 2019/03/01 08:17:51 nonaka Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1203 $"
d1474 1
a1474 1
#pseudo-device	carp			# Common Address Redundancy Protocol
d1533 1
a1533 13
options 	FILEASSOC		# fileassoc(9) - required for Veriexec
					# and PAX_SEGVGUARD

# Veriexec
pseudo-device	veriexec
#
# Uncomment the fingerprint methods below that are desired. Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
options 	VERIFIED_EXEC_FP_SHA256
options 	VERIFIED_EXEC_FP_SHA384
options 	VERIFIED_EXEC_FP_SHA512
@


1.1203
log
@Update Hyper-V related drivers description.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1202 2019/02/23 12:28:22 kamil Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1202 $"
d1436 1
a1436 1
hvkvp*		at vmbus?		# Hyper-V Data Exchange Service
@


1.1202
log
@Register kUBSan and KCOV in kernel=GENERIC of NetBSD/i386

Both options are disabled by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1201 2019/02/15 08:54:01 nonaka Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1201 $"
d1433 4
a1436 3
hvheartbeat*	at vmbus?		# Hyper-V Heartbeat
hvshutdown*	at vmbus?		# Hyper-V Shutdown
hvtimesync*	at vmbus?		# Hyper-V Timesync
@


1.1201
log
@Added Microsoft Hyper-V support.  It ported from OpenBSD and FreeBSD.

graphical console is not work on Gen.2 VM yet. To use the serial console,
enter "consdev com,0x3f8,115200" on efiboot.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1200 2019/01/27 08:53:30 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1200 $"
d123 1
d129 4
@


1.1200
log
@Remove the satlink driver. It was disabled everywhere, had no man page and
no use either. Spotted by thorpej in PR/21345, ok christos.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1199 2018/12/25 11:56:14 mlelstv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1199 $"
d40 1
d1424 8
@


1.1199
log
@Make ipmi driver available to other platforms.
Add ACPI attachment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1198 2018/12/14 22:00:26 jakllsch Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1198 $"
a1410 3
# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1

@


1.1198
log
@add cardbus malo(4) to x86 GENERIC and ALL kernels
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1197 2018/12/12 06:29:37 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1197 $"
d302 2
@


1.1197
log
@Remove references to "lmc" in the kernel configurations.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1196 2018/12/11 16:52:49 maya Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1196 $"
d1100 1
@


1.1196
log
@revert previous, nouveau apparently works for some people.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1195 2018/12/11 11:00:18 maya Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1195 $"
a997 1
lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
@


1.1195
log
@disable nouveau. it hasn't been functional since the import of new drmkms
code.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1194 2018/11/24 18:23:29 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1194 $"
d562 2
a563 2
#nouveau*	at pci? dev ? function ?
#nouveaufb*	at nouveaufbbus?
@


1.1194
log
@Add mpii(4), a driver for LSI Megaraid Fusion controllers.
Ported from OpenBSD. This driver is MP-safe.
Note that the earlier fusion controllers (Megaraid 2208, codenamed Thunderbold)
are also supported by mfi(4). mpii will take precedence if both drivers
are enabled.
Tested on a
mfii0 at pci6 dev 0 function 0: "PERC H740P Adapter ", firmware 50.3.0-1512, 819
2MB cache
mfii0: interrupting at ioapic2 pin 2
scsibus0 at mfii0: 64 targets, 8 luns per target
scsibus0: waiting 2 seconds for devices to settle...
sd0 at scsibus0 target 0 lun 0: <DELL, PERC H740P Adp, 5.03> disk fixed
sd0: fabricating a geometry
sd0: 99 GB, 102399 cyl, 64 head, 32 sec, 512 bytes/sect x 209714688 sectors
sd0: tagged queueing
sd1 at scsibus0 target 1 lun 0: <DELL, PERC H740P Adp, 5.03> disk fixed
sd1: fabricating a geometry
sd1: 22254 GB, 22788608 cyl, 64 head, 32 sec, 512 bytes/sect x 46671069696 sectors
sd1: fabricating a geometry

It supports bioctl(8) ioctls, as well as sensors for the BBU and logical
drives.

Sponsored by LIP6.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1193 2018/11/01 13:11:11 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1193 $"
d562 2
a563 2
nouveau*	at pci? dev ? function ?
nouveaufb*	at nouveaufbbus?
@


1.1193
log
@Add bwfm at pci
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1192 2018/09/06 05:36:50 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1192 $"
d765 1
@


1.1192
log
@Retire the 'midway' driver. Discussed on tech-net@@ recently and also three
years ago, part of removing the network ATM code.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1191 2018/08/25 07:48:56 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1191 $"
d978 1
@


1.1191
log
@Retire NDIS. It appears that it has never worked, after 13 years it was
still marked as "experimental", and nowadays it may be one more obstacle
to MPification of the network stack.

Discussed on tech-net@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1190 2018/08/14 06:37:59 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1190 $"
a978 1
en*	at pci? dev ? function ?	# ENI/Adaptec ATM
@


1.1190
log
@Replace references to etherip by l2tp. Etherip was already not enabled
anyway.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1189 2018/08/14 06:04:24 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1189 $"
a133 1
#options 	COMPAT_NDIS	# NDIS network driver
a1001 1
#ndis*	at pci? dev ? function ?	# Experimental - NDIS Network Driver
@


1.1189
log
@Enable L2TP on all x86 configurations, not just native amd64.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1188 2018/08/13 18:48:53 mrg Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1188 $"
a1481 1
#pseudo-device	etherip 		# Tunnel Ethernet over IP
@


1.1188
log
@use dev/usb/usbdevices.config instead of a local list.
adds slurm(4), umcs(4), uark(4), and usmsc(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1187 2018/08/12 17:59:21 sevan Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1187 $"
d1480 1
@


1.1187
log
@Remove commented out BPFJIT & SLJIT options as they are provided as loadable
modules already.

Heads up by <leot> <christos>
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1186 2018/08/10 17:54:46 sevan Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1186 $"
d1182 1
a1182 177
# USB Hubs
uhub*	at usb?
uhub*	at uhub? port ?

# USB HID device
uhidev* at uhub? port ? configuration ? interface ?

# USB Mice
ums*	at uhidev? reportid ?
wsmouse* at ums? mux 0

# USB generic touchscreen
uts*	at uhidev? reportid ?
wsmouse* at uts? mux 0

# USB eGalax touch-panel
uep*	at uhub? port ?
wsmouse* at uep? mux 0

# USB Keyboards
ukbd*	at uhidev? reportid ?
wskbd*	at ukbd? console ? mux 1

# USB TEMPer and TEMPerHUM
uthum*	at uhidev? reportid ?

# USB serial adapter
ucycom* at uhidev? reportid ?

# USB Generic HID devices
uhid*	at uhidev? reportid ?

# USB LCDs and USB-VGA adaptors
udl*	at uhub? port ?		# DisplayLink DL-1x0/1x5
wsdisplay* at udl?

# USB Printer
ulpt*	at uhub? port ? configuration ? interface ?

# USB Modem
umodem* at uhub? port ? configuration ?
ucom*	at umodem?

# Option N.V. Wireless WAN modems
uhso*	at uhub? port ? configuration ?

# USB Mass Storage
umass*	at uhub? port ? configuration ? interface ?
wd*	at umass?

# USB audio
uaudio* at uhub? port ? configuration ?
uaudio* at usbifif?

# USB MIDI
umidi*	at uhub? port ? configuration ?

# USB IrDA
# USB-IrDA bridge spec
uirda*	at uhub? port ? configuration ? interface ?
irframe* at uirda?

stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?

# SigmaTel STIr4200 USB/IrDA Bridge
ustir*	at uhub? port ?
irframe* at ustir?

# KingSun/DonShine USB/IrDA Bridge
udsir*	at uhub? port ?
irframe* at udsir?

# Windows Media Center IR transceiver
irmce*	at uhub? port ?
cir*	at irmce?

# USB Ethernet adapters
aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
axe*	at uhub? port ?		# ASIX AX88172 based adapters
axen*	at uhub? port ?		# ASIX AX88178a/AX88179 based adapters
cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
udav*	at uhub? port ?		# Davicom DM9601 based adapters
#umb*	at uhub? port ?		# Mobile Broadband Interface Model (EXPERIMENTAL)
url*	at uhub? port ?		# Realtek RTL8150L based adapters
urndis*	at uhub? port ?		# Microsoft RNDIS specification

# USB 802.11 adapters
athn*	at uhub? port ?		# Atheros AR9002U
atu*	at uhub? port ?		# Atmel AT76C50XX based adapters
bwfm*	at uhub? port ?		# Broadcom FullMAC
otus*	at uhub? port ?		# Atheros AR9001U
rum*	at uhub? port ?		# Ralink Technology RT2501/RT2601 802.11a/b/g
run*	at uhub? port ?		# Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
upgt*	at uhub? port ?		# Intersil PrismGT
ural*	at uhub? port ?		# Ralink Technology RT2500USB 802.11a/b/g
urtw*	at uhub? port ?		# Realtek RTL8187/RTL8187B 802.11b/g
urtwn*	at uhub? port ?		# Realtek RTL8188CU/RTL8192CU 802.11b/g/n
zyd*	at uhub? port ?		# Zydas ZD1211

# Prolific PL2301/PL2302 host-to-host adapter
upl*	at uhub? port ?

# Serial adapters
ubsa*	at uhub? port ?		# Belkin serial adapter
ucom*	at ubsa? portno ?

uchcom* at uhub? port ? 	# WinChipHead CH341/CH340 serial adapter
ucom*	at uchcom? portno ?

uftdi*	at uhub? port ?		# FTDI FT8U100AX serial adapter
ucom*	at uftdi? portno ?

uipaq*	at uhub? port ?		# iPAQ PDAs
ucom*	at uipaq? portno ?

umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

uplcom* at uhub? port ? 	# I/O DATA USB-RSAQ2 serial adapter
ucom*	at uplcom? portno ?

uslsa*	at uhub? port ?		# Silicon Labs USB-RS232 serial adapter
ucom*	at uslsa? portno ?

uvscom* at uhub? port ? 	# SUNTAC Slipper U VS-10U serial adapter
ucom*	at uvscom? portno ?

# RIM BlackBerry
uberry* at uhub? port ?

# Apple iPad
uipad* at uhub? port ?

# Diamond Multimedia Rio 500
urio*	at uhub? port ?

# USB Handspring Visor
uvisor* at uhub? port ?
ucom*	at uvisor?

# Kyocera AIR-EDGE PHONE
ukyopon* at uhub? port ?
ucom*	at ukyopon? portno ?

# USB scanners
#uscanner* at uhub? port ?

# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?

# Topfield TF5000PVR range of DVB recorders
utoppy* at uhub? port ?

# Y@@P firmware loader
uyap*	at uhub? port ?

# D-Link DSB-R100 USB radio
udsbr*	at uhub? port ?
radio*	at udsbr?

# USB Generic driver
ugen*	at uhub? port ?

# USB 3G datacards
umodeswitch* at uhub? port ?
u3g*	at uhub? port ?
ucom*	at u3g?

# USB generic serial port (e.g., data over cellular)
ugensa* at uhub? port ?
ucom*	at ugensa?

# Araneus Alea I/II TRNG
#ualea* at uhub? port ? configuration ? interface ?
a1317 2

auvitek* at uhub?			# Auvitek AU0828 USB TV
a1319 7
emdtv*	at uhub?			# Empia EM28xx USB TV
cir*	at emdtv?
pseye*	at uhub?			# Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub?			# USB Video Class capture devices

video*	at videobus?			# Analog capture interface
dtv*	at dtvbus?			# Digital capture interface
a1337 4
# Bluetooth USB Controllers
ubt* at uhub? port ?
aubtfwl* at uhub? port ?

a1343 1
bthub* at ubt?
@


1.1186
log
@Add snippet for bpfjit(4) as both i386 and amd64 are listed as supported.
Ideally BPFJIT should be enabled by default for use with NPF but I haven't
raised the question (no access to email at the moment) hence both are disabled.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1185 2018/08/01 16:59:09 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1185 $"
a198 4
# JIT compiler for bpfilter
#options 	SLJIT
#options 	BPFJIT

@


1.1185
log
@Unreference IPF/PF from the x86 config files (amd64, i386, xen), and enable
NPF instead when wanted.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1184 2018/07/31 16:44:29 khorben Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1184 $"
d199 4
@


1.1184
log
@Add a port of the umb(4) driver from OpenBSD

The umb(4) driver provides support for USB MBIM (Mobile Broadband
Interface Model) devices.

MBIM devices establish connections via cellular networks such as GPRS,
UMTS, and LTE. They appear as a regular point-to-point network interface, transporting raw IP frames.

Required configuration parameters like PIN and APN have to be set with
umbctl(8), a new tool specific to this driver. The IP address is configured
automatically; the default route and DNS server information have to be set
separately.

The driver is not fully functional yet, it is therefore still marked as
experimental and disabled by default. Any help welcome to complete it!

Tested on NetBSD/amd64, with a Sierra Wireless EM7345 LTE modem on a Lenovo
ThinkPad T440s. No functional change expected otherwise.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1183 2018/07/13 09:37:32 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1183 $"
a196 4
options 	IPFILTER_LOG	# ipmon(8) log support
options 	IPFILTER_LOOKUP	# ippool(8) support
options 	IPFILTER_COMPAT # Compat for IP-Filter
#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
a1651 1
pseudo-device	ipfilter		# IP filter (firewall) and NAT
d1670 1
a1670 4
#pseudo-device	pf			# PF packet filter
#pseudo-device	pflog			# PF log if
#pseudo-device	pfsync			# PF sync if
#pseudo-device	npf			# NPF packet filter
@


1.1183
log
@Remove the X86PMC code I had written, replaced by tprof. Many defines
become unused in specialreg.h, so remove them. We don't want to add
defines all the time, there are countless PMCs on many generations, and
it's better to just inline the event/unit values.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1182 2018/07/10 19:58:13 maya Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1182 $"
d1271 1
@


1.1182
log
@Remove unused macro.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1181 2018/07/10 17:01:43 maya Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1181 $"
a46 1
options 	PMC		# performance-monitoring counters support
@


1.1181
log
@Remove viadrm(4), superseded by viadrmums.

Aside from viadrm using older drm code, it's also dysfunctional right now.
See PR port-i386/53364.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1180 2018/06/07 13:36:29 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1180 $"
a301 1
#options 	APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
@


1.1180
log
@Revert changes that pinned-down i2c parent specs.  The i2c subsystem
has been enhanced to make this unnecessary.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1179 2018/05/22 08:15:26 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1179 $"
a560 1
#viadrm* 	at drm?		# VIA DRM driver
@


1.1180.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1207 2019/05/24 14:28:48 nonaka Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1207 $"
a39 1
hyperv0		at cpu0		# Microsoft Hyper-V
d47 1
a122 1
#options	KUBSAN		# Kernel Undefined Behavior Sanitizer (kUBSan)
a127 4
# Kernel Code Coverage Driver.
#makeoptions	KCOV=1
#options	KCOV

d135 1
d145 24
a168 2
# File systems
include "conf/filesystems.config"
d198 4
d302 1
a308 2
ipmi_acpi*	at acpi?
ipmi0		at ipmi_acpi? 
d561 1
a772 1
mfii*	at pci? dev ? function ?	# LSI MegaRAID SAS (Fusion and newer)
a985 1
bwfm*	at pci? dev ? function ?	# Broadcom FullMAC
d987 1
d1005 1
d1010 1
a1108 1
malo*	at cardbus? function ?	# Marvell Libertas Wireless
d1189 176
a1364 1
include "dev/usb/usbdevices.config"
d1500 2
d1504 7
d1529 4
d1539 1
d1606 3
a1620 12
# Hyper-V devices
vmbus*		at acpi?		# Hyper-V VMBus
genfb*		at vmbus?		# Hyper-V Synthetic Video Framebuffer
hvkbd*		at vmbus?		# Hyper-V Synthetic Keyboard
wskbd*		at hvkbd? console ? mux 1
hvn*		at vmbus?		# Hyper-V NetVSC
hvs*		at vmbus?		# Hyper-V StorVSC
hvheartbeat*	at vmbus?		# Hyper-V Heartbeat Service
hvshutdown*	at vmbus?		# Hyper-V Guest Shutdown Service
hvtimesync*	at vmbus?		# Hyper-V Time Synchronization Service
#hvkvp*		at vmbus?		# Hyper-V Data Exchange Service

d1646 1
d1657 2
a1658 1
pseudo-device	carp			# Common Address Redundancy Protocol
d1677 5
a1681 2
pseudo-device	l2tp			# L2TPv3 interface
pseudo-device	npf			# NPF packet filter
d1704 6
d1720 13
a1732 1
include "dev/veriexec.config"
@


1.1180.2.2
log
@Merge changes from current as of 20200406
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident		"GENERIC-$Revision$"
d200 1
a200 1
options 	PCIVERBOSE	# verbose PCI device autoconfig messages
a957 1
aq*	at pci? dev ? function ?	# Aquantia AQC 10 gigabit
d969 1
d972 1
a980 1
ixl*	at pci? dev ? function ?	# Intel Ethernet 700 Series
d982 1
a982 1
kse*	at pci? dev ? function ?	# Micrel KSZ8841/8842 ethernet
d1018 1
d1027 1
d1040 2
d1073 3
d1099 1
d1209 1
d1461 1
@


1.1180.2.3
log
@Mostly merge changes from HEAD upto 20200411
@
text
@d123 1
a123 2
#options 	KUBSAN		# Kernel Undefined Behavior Sanitizer (kUBSan)
#options 	UBSAN_ALWAYS_FATAL	# (optional) Panic on all kUBSan reports
d131 1
a131 1
#options 	KCOV
a738 3
# Nuvoton NCT5104D SuperIO providing GPIO
nct0		at isa? port ?

a1113 2
ipgphy* at mii? phy ?			# IC PLUS IP1000A/IP1001 PHYs
jmphy*	at mii? phy ?			# Jmicron JMP202/211 PHYs
a1122 1
smscphy* at mii? phy ?			# SMSC LAN87xx PHYs
d1134 1
d1360 4
@


1.1179
log
@Clarify the parameters for the SpectreV2 mitigation.

Add:
	machdep.spectre_v2.swmitigated
Rename:
	machdep.spectre_v2.mitigated -> machdep.spectre_v2.hwmitigated

Change the method string, to combine both the hardware and software
mitigations. swmitigated is set at compile time, hwmitigated can be
set by the user.

Examples:

	spectre_v2.swmitigated = 1
	spectre_v2.hwmitigated = 0
	spectre_v2.method = [GCC retpoline]

	spectre_v2.swmitigated = 0
	spectre_v2.hwmitigated = 0
	spectre_v2.method = (none)

	spectre_v2.swmitigated = 1
	spectre_v2.hwmitigated = 1
	spectre_v2.method = [GCC retpoline] + [Intel IBRS]
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1178 2018/05/15 01:53:27 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1178 $"
d664 3
a666 3
#dbcool* at iic0 addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic0 addr 0x2D		# Tyan S2881
#dbcool* at iic0 addr 0x2E		# Tyan S2882-D
d682 1
a682 1
#ibmhawk0	at iic0	addr 0x37
d693 2
a694 2
#smscmon*	at iic0 addr 0x2c
#smscmon*	at iic0 addr 0x2d	# (alternate address)
d706 16
a721 16
#spdmem* at iic0 addr 0x50
#spdmem* at iic0 addr 0x51
#spdmem* at iic0 addr 0x52
#spdmem* at iic0 addr 0x53
#spdmem* at iic0 addr 0x54
#spdmem* at iic0 addr 0x55
#spdmem* at iic0 addr 0x56
#spdmem* at iic0 addr 0x57
#sdtemp* at iic0 addr 0x18
#sdtemp* at iic0 addr 0x19
#sdtemp* at iic0 addr 0x1a
#sdtemp* at iic0 addr 0x1b
#sdtemp* at iic0 addr 0x1c
#sdtemp* at iic0 addr 0x1d
#sdtemp* at iic0 addr 0x1e
#sdtemp* at iic0 addr 0x1f
@


1.1178
log
@Fully specifiy the location of indirectly-configured I2C devices. In
particular, the parent spec must not be wild-carded, as doing so doesn't
work well on systems where more than one I2C bus is present.

N.B. The x86 platforms are sort of a mess, here... legacy indirect
config and ACPI direct config sort of smashed together with the
same config file directives.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1177 2018/04/08 00:52:38 mrg Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1177 $"
d34 1
@


1.1177
log
@turn on GCC spectre v2 mitigation options.

XXX: amd64 ALL doesn't build for me right now
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1176 2018/04/07 19:39:19 mrg Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1176 $"
d663 3
a665 3
#dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D		# Tyan S2881
#dbcool* at iic? addr 0x2E		# Tyan S2882-D
d681 1
a681 1
#ibmhawk0	at iic?	addr 0x37
d692 2
a693 2
#smscmon*	at iic? addr 0x2c
#smscmon*	at iic? addr 0x2d	# (alternate address)
d705 16
a720 16
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
#spdmem* at iic? addr 0x54
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
#sdtemp* at iic? addr 0x18
#sdtemp* at iic? addr 0x19
#sdtemp* at iic? addr 0x1a
#sdtemp* at iic? addr 0x1b
#sdtemp* at iic? addr 0x1c
#sdtemp* at iic? addr 0x1d
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
@


1.1176
log
@actually do what the previous change said:
don't turn on the new 'SPECTRE_V2_GCC_MITIGATION' option yet.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1175 2018/04/07 19:38:06 mrg Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1175 $"
d32 1
a32 1
#makeoptions	SPECTRE_V2_GCC_MITIGATION=1	# GCC Spectre variant 2
@


1.1175
log
@add an SPECTRE_V2_GCC_MITIGATION option to x86 kernels, that turns
on the GCC spectre v2 mitigation options.

XXX: pullup-8.
XXX: turn on in all kernels.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1174 2017/12/10 17:19:48 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1174 $"
d32 1
a32 1
makeoptions	SPECTRE_V2_GCC_MITIGATION=1	# GCC Spectre variant 2
@


1.1174
log
@Add dwiic, ihidev and ims
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1173 2017/12/09 00:29:33 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1173 $"
d32 2
@


1.1174.2.1
log
@Sync with HEAD, resolve some conflicts
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1177 2018/04/08 00:52:38 mrg Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1177 $"
a31 2
makeoptions	SPECTRE_V2_GCC_MITIGATION=1	# GCC Spectre variant 2
						# migitation
@


1.1174.2.2
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1178 2018/05/15 01:53:27 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1178 $"
d663 3
a665 3
#dbcool* at iic0 addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic0 addr 0x2D		# Tyan S2881
#dbcool* at iic0 addr 0x2E		# Tyan S2882-D
d681 1
a681 1
#ibmhawk0	at iic0	addr 0x37
d692 2
a693 2
#smscmon*	at iic0 addr 0x2c
#smscmon*	at iic0 addr 0x2d	# (alternate address)
d705 16
a720 16
#spdmem* at iic0 addr 0x50
#spdmem* at iic0 addr 0x51
#spdmem* at iic0 addr 0x52
#spdmem* at iic0 addr 0x53
#spdmem* at iic0 addr 0x54
#spdmem* at iic0 addr 0x55
#spdmem* at iic0 addr 0x56
#spdmem* at iic0 addr 0x57
#sdtemp* at iic0 addr 0x18
#sdtemp* at iic0 addr 0x19
#sdtemp* at iic0 addr 0x1a
#sdtemp* at iic0 addr 0x1b
#sdtemp* at iic0 addr 0x1c
#sdtemp* at iic0 addr 0x1d
#sdtemp* at iic0 addr 0x1e
#sdtemp* at iic0 addr 0x1f
@


1.1174.2.3
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1180 2018/06/07 13:36:29 thorpej Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1180 $"
a33 1
options 	SPECTRE_V2_GCC_MITIGATION
d663 3
a665 3
#dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D		# Tyan S2881
#dbcool* at iic? addr 0x2E		# Tyan S2882-D
d681 1
a681 1
#ibmhawk0	at iic?	addr 0x37
d692 2
a693 2
#smscmon*	at iic? addr 0x2c
#smscmon*	at iic? addr 0x2d	# (alternate address)
d705 16
a720 16
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
#spdmem* at iic? addr 0x54
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
#sdtemp* at iic? addr 0x18
#sdtemp* at iic? addr 0x19
#sdtemp* at iic? addr 0x1a
#sdtemp* at iic? addr 0x1b
#sdtemp* at iic? addr 0x1c
#sdtemp* at iic? addr 0x1d
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
@


1.1174.2.4
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1183 2018/07/13 09:37:32 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1183 $"
d47 1
d302 1
d561 1
@


1.1174.2.5
log
@Sync with HEAD

Resolve a couple of conflicts (result of the uimin/uimax changes)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1191 2018/08/25 07:48:56 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1191 $"
d134 1
d197 4
d1007 1
d1186 176
a1361 1
include "dev/usb/usbdevices.config"
d1497 2
d1501 7
d1526 4
d1536 1
d1655 1
d1674 5
a1678 2
pseudo-device	l2tp			# L2TPv3 interface
pseudo-device	npf			# NPF packet filter
@


1.1174.2.6
log
@Ssync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1192 2018/09/06 05:36:50 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1192 $"
d979 1
@


1.1174.2.7
log
@Sync with HEAD, resolve a couple of conflicts
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1194 2018/11/24 18:23:29 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1194 $"
a764 1
mfii*	at pci? dev ? function ?	# LSI MegaRAID SAS (Fusion and newer)
a977 1
bwfm*	at pci? dev ? function ?	# Broadcom FullMAC
@


1.1174.2.8
log
@Sync with HEAD, resolve a few conflicts
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident		"GENERIC-$Revision$"
a301 2
ipmi_acpi*	at acpi?
ipmi0		at ipmi_acpi? 
d998 1
a1100 1
malo*	at cardbus? function ?	# Marvell Libertas Wireless
@


1.1173
log
@Attach wsmouse at wsmousedev on x86 so modular mice have a hope.

As noted on tech-kern:

https://mail-index.NetBSD.org/tech-kern/2017/12/08/msg022708.html
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1172 2017/11/30 11:56:45 jmcneill Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1172 $"
d656 4
d720 7
@


1.1172
log
@add qemufwcfg(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1171 2017/11/29 16:10:01 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1171 $"
d539 1
@


1.1171
log
@PR port-i386/52774: vioscsi missing in i386 kernel
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1170 2017/11/06 02:57:18 rin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1170 $"
d354 1
@


1.1170
log
@Revive commented out DISKLABEL_EI option to kernel configuration files
that contain FFS_EI option.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1169 2017/10/23 08:08:53 skrll Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1169 $"
d1598 6
a1603 4
virtio*	at pci? dev ? function ?	# Virtio PCI device
viomb*	at virtio?			# Virtio memory balloon device
ld*	at virtio?			# Virtio disk device
vioif*	at virtio?			# Virtio network device
@


1.1169
log
@Add bwfm (and sort other 802.11 usb wifi drivers)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1168 2017/09/14 07:58:41 mrg Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1168 $"
d170 1
@


1.1168
log
@clean up COMPAT_* options for native netbsd code:
- new series of files that are useful for saying "i want everything
  since netbsd 1.4", etc.
- use the fact COMPAT_* options have future dependancies to remove
  many redundant options.

removes about 3000 lines total across kernel configuration files.
tested about 30 random kernels in the changed list.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1167 2017/09/13 22:24:44 sevan Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1167 $"
d1263 1
a1264 1
ural*	at uhub? port ?		# Ralink Technology RT2500USB 802.11a/b/g
d1268 1
@


1.1167
log
@Remove support for VERIFIED_EXEC_FP_RMD160, VERIFIED_EXEC_FP_SHA1, and VERIFIED_EXEC_FP_MD5 options.
These algorithms are either broken or on their way to being broken.

Discussed on tech-security
http://mail-index.netbsd.org/tech-security/2017/08/21/msg000936.html

ok riastradh
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1166 2017/08/13 08:48:30 christos Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1166 $"
d126 1
a126 16
options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
options 	COMPAT_09	# NetBSD 0.9,
options 	COMPAT_10	# NetBSD 1.0,
options 	COMPAT_11	# NetBSD 1.1,
options 	COMPAT_12	# NetBSD 1.2 (and 386BSD and BSDI),
options 	COMPAT_13	# NetBSD 1.3 (and 386BSD and BSDI),
options 	COMPAT_14	# NetBSD 1.4,
options 	COMPAT_15	# NetBSD 1.5,
options 	COMPAT_16	# NetBSD 1.6,
options 	COMPAT_20	# NetBSD 2.0,
options 	COMPAT_30	# NetBSD 3.0,
options 	COMPAT_40	# NetBSD 4.0,
options 	COMPAT_50	# NetBSD 5.0,
options 	COMPAT_60	# NetBSD 6.0, and
options 	COMPAT_70	# NetBSD 7.0 binary compatibility.
options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
a132 1
options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
@


1.1166
log
@Add ALPS pms support
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1165 2017/08/12 06:46:13 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1165 $"
a1725 1
options 	VERIFIED_EXEC_FP_RMD160
a1728 2
options 	VERIFIED_EXEC_FP_SHA1
options 	VERIFIED_EXEC_FP_MD5
@


1.1165
log
@Remove support for vm86 on i386. It is bug-friendly, and there is no point
in having kernel support for this: the instruction set of the CPU is small,
and it can easily be emulated in userland entirely. There are also several
assumptions in the code that are not respected, and the slightest confusion
in the trap frame can lead to ring0 exploits.

vm86 has received zero maintenance. As far as I can tell, it was added
20 years ago in order to make doscmd work. But doscmd has not been
maintained either, and was removed from pkgsrc in 2011. dosbox can be used
instead: it does not require kernel support, and will produce better
results than our flimsy implementation.

Pass 1. (many pieces still in the tree)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1164 2017/08/09 18:45:30 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1164 $"
d539 1
@


1.1164
log
@Remove compat_ibcs2 from i386. After a discussion on port-vax, it turns
out that compat_ibcs2 does not implement the iBCS2 standard - which is
x86-specific - but rather SVR3. Our real iBCS2 implementation was a
mixture of compat_ibcs2 and compat_svr4, and was only partial. Keeping
support for this in i386 is totally irrelevant today. I also asked on
port-i386 but didn't wait long.

The main issue is that compat_ibcs2 should have been called compat_svr3.
But CVS does not support renaming files, and moving things around is both
painful and tiring, even more so when no one seems to be interested in
doing this work or in the feature at all. For now compat_ibcs2 is available
on Vax and will stay, until someone (not me) cleans it up.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1163 2017/08/04 09:30:19 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1163 $"
a29 1
#options 	VM86		# virtual 8086 emulation
@


1.1163
log
@Revert my changes, and re-enable COMPAT_NOMID, COMPAT_09 and COMPAT_43.
Several compat options happen to be dependent on the compat_43_* functions,
the availability of which is (wrongfully) controlled with COMPAT_43. Same
for COMPAT_09.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1162 2017/07/31 15:43:33 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1162 $"
a145 1
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1162
log
@Disable all the compat options until COMPAT_10. NetBSD 1.0 was released on
October 26 1994; 23 years of compatibility is enough. Discussed with
christos quickly.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1161 2017/07/29 18:08:58 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1161 $"
d127 2
a128 2
#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
#options 	COMPAT_09	# NetBSD 0.9,
d142 1
a142 1
#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
@


1.1161
log
@Remove TCP_COMPAT_42 from the config files. Pass 3.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1160 2017/07/29 12:00:56 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1160 $"
d127 2
a128 2
options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
options 	COMPAT_09	# NetBSD 0.9,
d142 1
a142 1
options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
@


1.1160
log
@Remove svr4 from the config files.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1159 2017/07/28 14:13:13 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1159 $"
a143 1
#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
@


1.1159
log
@Disable svr4 and ibcs2 by default.

These options are not well-tested, of a limited use case, and the potential
for damage is too high. Vulnerabilities were presented at DEFCON 25 - I see
that at least one of them can be exploited to get ring0 privileges.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1158 2017/07/28 13:59:07 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1158 $"
a146 1
#options 	COMPAT_SVR4	# binary compatibility with SVR4
@


1.1158
log
@Disable vm86 by default. The use case is limited, and the potential for
damage is too high.

This code is fragile, and relies on a certain number of assumptions, some
of which are not be totally true. For example, it relies on the fact that
a 16bit process cannot perform a syscall, but verily it can. The slighest
confusion in the trap frame can lead to ring0 exploits. Also, I'm not
convinced that it interacts well with the compatibility layers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1157 2017/07/12 17:40:34 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1157 $"
d147 2
a148 2
options 	COMPAT_SVR4	# binary compatibility with SVR4
options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1157
log
@Enable PMCs by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156 2017/05/27 22:53:29 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156 $"
d30 1
a30 1
options 	VM86		# virtual 8086 emulation
@


1.1156
log
@Add options CAN and pseudo-device canloop to ALL kernel configs.
Add the same commented out to i386/amd64 GENERIC and OLIMEXLIME2 (A20-based).
Also add commented out awincan0 in OLIMEXLIME2.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1155 2017/05/24 20:23:04 christos Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1155 $"
d45 1
a45 1
#options 	PMC		# performance-monitoring counters support
@


1.1156.2.1
log
@Remove options DIAGNOSTIC/DEBUG and PAX debug options.
Requested by snj in #60.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156 2017/05/27 22:53:29 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156 $"
d110 1
a110 1
#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
d1736 1
a1736 1
#options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
d1739 1
a1739 1
#options 	PAX_MPROTECT_DEBUG=1	# PaX mprotect debug
@


1.1156.2.2
log
@Pull up following revision(s) (requested by maxv in ticket #164):
	distrib/sets/lists/base/md.amd64: revision 1.269
	distrib/sets/lists/debug/md.amd64: revision 1.97
	sys/arch/amd64/conf/GENERIC: revision 1.460
	sys/arch/amd64/conf/files.amd64: revision 1.89
	sys/arch/i386/conf/GENERIC: revision 1.1157
	sys/arch/i386/conf/files.i386: revision 1.379
	sys/arch/i386/i386/i386_trap.S: revision 1.7-1.8
	sys/arch/i386/include/frameasm.h: revision 1.16
	sys/arch/x86/include/sysarch.h: revision 1.12
	sys/arch/x86/x86/pmc.c: revision 1.8-1.10
	sys/arch/x86/x86/sys_machdep.c: revision 1.36
	sys/arch/xen/conf/files.compat: revision 1.26
	sys/secmodel/suser/secmodel_suser.c: revision 1.43
	sys/sys/kauth.h: revision 1.74
	usr.bin/pmc/Makefile: revision 1.5
	usr.bin/pmc/pmc.1: revision 1.12-1.13
	usr.bin/pmc/pmc.c: revision 1.24-1.25
style
--
style
--
Disable interrupts for T_NMI (inline calltrap). Note that there's still a
way to evade the NMI mode here, if a segment register faults in
INTRFASTEXIT; but we don't care. I didn't test this change, but it seems
fine enough.
--
Make the PMC syscalls privileged.
--
Check argc, and add a message.
--
include opt_pmc.h
--
Build the pmc tool on amd64.
--
Properly handle overflows, and take them into account in userland.
--
Update.
--
Enable PMCs by default.
--
Sort sections. Fix macro usage.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.1 2017/07/05 13:58:48 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.1 $"
d45 1
a45 1
options 	PMC		# performance-monitoring counters support
@


1.1156.2.3
log
@Pull up following revision(s) (requested by maxv in ticket #230):
	sys/arch/i386/conf/GENERIC: revision 1.1158
Disable vm86 by default. The use case is limited, and the potential for
damage is too high.
This code is fragile, and relies on a certain number of assumptions, some
of which are not be totally true. For example, it relies on the fact that
a 16bit process cannot perform a syscall, but verily it can. The slighest
confusion in the trap frame can lead to ring0 exploits. Also, I'm not
convinced that it interacts well with the compatibility layers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.2 2017/08/01 23:18:30 snj Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.2 $"
d30 1
a30 1
#options 	VM86		# virtual 8086 emulation
@


1.1156.2.4
log
@Requested by skrll in ticket #60:
	sys/arch/amd64/conf/GENERIC
	sys/arch/amd64/conf/XEN3_DOM0
	sys/arch/amd64/conf/XEN3_DOMU
	sys/arch/cobalt/conf/GENERIC
	sys/arch/evbarm/conf/BEAGLEBONE
	sys/arch/evbarm/conf/BEAGLEBOARD
	sys/arch/evbarm/conf/BEAGLEBOARDXM
	sys/arch/evbarm/conf/GENERIC.common
	sys/arch/i386/conf/GENERIC
	sys/arch/i386/conf/XEN3_DOM0
	sys/arch/i386/conf/XEN3_DOMU
	sys/arch/mvmeppc/conf/GENERIC
	sys/arch/shark/conf/GENERIC
	sys/arch/sparc64/conf/GENERIC
	sys/arch/zaurus/conf/GENERIC


Re-enable option DIAGNOSTIC for now, will remove it again later.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.3 2017/08/25 05:53:12 snj Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.3 $"
d110 1
a110 1
options 	DIAGNOSTIC	# inexpensive kernel consistency checks
@


1.1156.2.5
log
@apply paych, requested by maxv in ticket #237:
	sys/arch/amiga/conf/DRACO		patch
	sys/arch/amiga/conf/GENERIC		patch
	sys/arch/amiga/conf/GENERIC.in		patch
	sys/arch/i386/conf/ALL			patch
	sys/arch/i386/conf/GENERIC		patch
	sys/arch/i386/conf/XEN3_DOM0		patch
	sys/arch/i386/conf/XEN3_DOMU		patch
	sys/arch/sparc/conf/GENERIC		patch
	sys/arch/sparc/conf/KRUPS		patch
	sys/arch/sparc/conf/MRCOFFEE		patch
	sys/arch/sparc/conf/TADPOLE3GX		patch
	sys/arch/sparc64/conf/GENERIC		patch
	sys/arch/sparc64/conf/NONPLUS64		patch
	sys/kern/kern_exec.c			patch

Disables compat_svr4 and compat_svr4_32 on each architecture,
and removes the associated module autoload entries.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.4 2017/08/29 09:42:19 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.4 $"
d147 1
a147 1
#options 	COMPAT_SVR4	# binary compatibility with SVR4
@


1.1156.2.6
log
@Pull up following revision(s) (requested by maxv in ticket #256):
	sys/arch/i386/conf/GENERIC: revision 1.1159 via patch
	sys/arch/i386/conf/XEN3_DOMU: revision 1.78 via patch
	sys/arch/i386/conf/XEN3_DOM0: revision 1.114 via patch
	sys/kern/kern_exec.c: 1.443-1.444 via patch
Disable svr4 and ibcs2 by default.
These options are not well-tested, of a limited use case, and the potential
for damage is too high. Vulnerabilities were presented at DEFCON 25 - I see
that at least one of them can be exploited to get ring0 privileges.
--
Remove compat_freebsd from the list of autoloaded modules. Interested users
will now have to type 'modload' to use it, or uncomment the entry in
GENERIC. I should have removed it when I disabled COMPAT_FREEBSD by
default, sorry about that.
--
Remove compat_svr4, compat_svr4_32 and compat_ibcs2 from the list of
autoloaded modules. These options are disabled everywhere (except ibcs2
on Vax, but Vax does not support kernel modules, so doesn't matter),
therefore there is no issue in removing them from the list. Interested
users will now have to do a 'modload' first, or uncomment the entries in
GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.5 2017/08/31 08:41:33 bouyer Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.5 $"
d148 1
a148 1
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1156.2.7
log
@Pull up following revision(s) (requested by martin in ticket #413):
	sys/arch/i386/conf/GENERIC: revision 1.1171
PR port-i386/52774: vioscsi missing in i386 kernel
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.6 2017/09/11 05:13:45 snj Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.6 $"
d1615 4
a1618 6
virtio* at pci? dev ? function ?	# Virtio PCI device
viomb* at virtio?			# Virtio memory balloon device
ld* at virtio?				# Virtio disk device
vioif* at virtio?			# Virtio network device
viornd* at virtio?			# Virtio entropy device
vioscsi* at virtio?			# Virtio SCSI device
@


1.1156.2.8
log
@Pull up following revision(s) (requested by mrg in ticket #731):
	sys/arch/i386/conf/files.i386: revision 1.392
	sys/arch/i386/conf/GENERIC: revision 1.1175
	sys/arch/i386/conf/GENERIC: revision 1.1176
	sys/arch/amd64/conf/files.amd64: revision 1.102
	sys/arch/i386/conf/GENERIC: revision 1.1177
	share/man/man4/options.4: revision 1.485 (patch)
	sys/arch/i386/conf/Makefile.i386: revision 1.190
	sys/arch/amd64/conf/GENERIC: revision 1.487
	sys/arch/amd64/conf/ALL: revision 1.85
	sys/arch/amd64/conf/GENERIC: revision 1.488
	sys/arch/amd64/conf/GENERIC: revision 1.489
	sys/arch/amd64/conf/Makefile.amd64: revision 1.67
	sys/arch/i386/conf/ALL: revision 1.437

add an SPECTRE_V2_GCC_MITIGATION option to x86 kernels, that turns
on the GCC spectre v2 mitigation options.
XXX: pullup-8.
XXX: turn on in all kernels.

actually do what the previous change said:
don't turn on the new 'SPECTRE_V2_GCC_MITIGATION' option yet.

turn on GCC spectre v2 mitigation options.
XXX: amd64 ALL doesn't build for me right now
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.7 2017/12/04 19:47:05 snj Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.7 $"
a32 2
makeoptions	SPECTRE_V2_GCC_MITIGATION=1	# GCC Spectre variant 2
						# migitation
@


1.1156.2.9
log
@Requested by skrll in ticket #60:
        sys/arch/amd64/conf/GENERIC
        sys/arch/amd64/conf/XEN3_DOM0
        sys/arch/amd64/conf/XEN3_DOMU
        sys/arch/cobalt/conf/GENERIC
        sys/arch/evbarm/conf/BEAGLEBONE
        sys/arch/evbarm/conf/BEAGLEBOARD
        sys/arch/evbarm/conf/BEAGLEBOARDXM
        sys/arch/evbarm/conf/GENERIC.common
        sys/arch/i386/conf/GENERIC
        sys/arch/i386/conf/XEN3_DOM0
        sys/arch/i386/conf/XEN3_DOMU
        sys/arch/mvmeppc/conf/GENERIC
        sys/arch/shark/conf/GENERIC
        sys/arch/sparc64/conf/GENERIC
        sys/arch/zaurus/conf/GENERIC

Remove option DIAGNOSTIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.8 2018/04/11 14:23:30 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.8 $"
d112 1
a112 1
#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
@


1.1156.2.10
log
@Pullup the following revisions, requested by maxv in ticket #865:

	sys/arch/amd64/amd64/machdep.c		1.303 (patch)
	sys/arch/amd64/conf/GENERIC		1.492 (patch)
	sys/arch/amd64/conf/files.amd64		1.103 (patch)
	sys/arch/i386/i386/machdep.c		1.806 (patch)
	sys/arch/i386/conf/GENERIC		1.1179 (patch)
	sys/arch/i386/conf/files.i386		1.393 (patch)
	sys/arch/x86/include/cpu.h		1.91 (patch)
	sys/arch/x86/include/specialreg.h	upto 1.126 (patch)
	sys/arch/x86/x86/x86_machdep.c		upto 1.115 (patch, adapted)
	sys/arch/x86/x86/spectre.c		upto 1.19 (patch, adapted,
						no IBRS,
						SpectreV2 mitigations not
						enabled	by default)

Backport the hardware SpectreV2 and SpectreV4 mitigations.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.9 2018/04/18 14:45:08 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.9 $"
a34 1
options 	SPECTRE_V2_GCC_MITIGATION
@


1.1156.2.11
log
@Pull up following revision(s) (requested by mrg in ticket #1011):

	sys/dev/usb/usbdevices.config: revision 1.32 (patch)
	sys/arch/amd64/conf/GENERIC: revision 1.502 (patch)
	sys/arch/i386/conf/GENERIC: revision 1.1188 (patch)

- add commented entries that exist in amd64 GENERIC: oboe, mos, umb.
  (XXX: mos might be deleteable now?).
- comment uscanner(4) -- usb scanners use ugen(4) interface.
- minor sort.

 -

use dev/usb/usbdevices.config, gaining these missing drivers:
slurm(4), uthum(4), umcs(4), uark(4), upgt(4), and usmsc(4).

 -

use dev/usb/usbdevices.config instead of a local list.
adds slurm(4), umcs(4), uark(4), and usmsc(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.10 2018/06/09 15:12:21 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.10 $"
d1194 175
a1368 1
include "dev/usb/usbdevices.config"
d1504 2
d1508 7
d1533 4
d1543 1
@


1.1156.2.12
log
@Add bwfm config glue, requested by maya in ticket #1072.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.11 2018/09/07 12:27:26 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.11 $"
a990 1
bwfm*	at pci? dev ? function ?	# Broadcom FullMAC
@


1.1156.2.13
log
@Pull up following revision(s) (requested by bouyer in ticket #1129):

	sys/arch/amd64/conf/XEN3_DOM0: revision 1.159
	sys/arch/amd64/conf/GENERIC: revision 1.508
	sys/arch/i386/conf/ALL: revision 1.458
	sys/dev/ic/mfi.c: revision 1.60
	sys/dev/pci/mpiireg.h: revision 1.1
	distrib/sets/lists/man/mi: revision 1.1628
	sys/dev/pci/mfii.c: revision 1.1,1.2 (adapted)
	sys/arch/i386/conf/GENERIC: revision 1.1194
	sys/dev/pci/mpii.c: revision 1.13
	sys/dev/ic/mfireg.h: revision 1.9
	share/man/man4/mfii.4: revision 1.1
	share/man/man4/Makefile: revision 1.673 (patch)
	sys/dev/pci/files.pci: revision 1.410
	share/man/man4/mfii.4: revision 1.2
	sys/arch/amd64/conf/ALL: revision 1.108
	sys/arch/i386/conf/XEN3PAE_DOM0: revision 1.8 (patch, in XEN3_DOM0)

Add some definitions from OpenBSD, needed by the upcoming mfii driver.
No functionnal change.

 -

Move registers definitions to a separate file, needed for the upcomning mpii
driver. No functionnal change.

 -

Add mpii(4), a driver for LSI Megaraid Fusion controllers.
Ported from OpenBSD. This driver is MP-safe.

Note that the earlier fusion controllers (Megaraid 2208, codenamed Thunderbold)
are also supported by mfi(4). mpii will take precedence if both drivers
are enabled.

Tested on a
mfii0 at pci6 dev 0 function 0: "PERC H740P Adapter ", firmware 50.3.0-1512, 819
2MB cache
mfii0: interrupting at ioapic2 pin 2
scsibus0 at mfii0: 64 targets, 8 luns per target
scsibus0: waiting 2 seconds for devices to settle...
sd0 at scsibus0 target 0 lun 0: <DELL, PERC H740P Adp, 5.03> disk fixed
sd0: fabricating a geometry
sd0: 99 GB, 102399 cyl, 64 head, 32 sec, 512 bytes/sect x 209714688 sectors
sd0: tagged queueing
sd1 at scsibus0 target 1 lun 0: <DELL, PERC H740P Adp, 5.03> disk fixed
sd1: fabricating a geometry
sd1: 22254 GB, 22788608 cyl, 64 head, 32 sec, 512 bytes/sect x 46671069696 sectors
sd1: fabricating a geometry

It supports bioctl(8) ioctls, as well as sensors for the BBU and logical
drives.

Sponsored by LIP6.

 -

Add my name in copyright list

 -

add a man page for the new mpii, mostly from OpenBSD.

 -

Sort SEE ALSO. Fix date. Whitespace fixes.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.12 2018/10/31 09:30:10 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.12 $"
a777 1
mfii*	at pci? dev ? function ?	# LSI MegaRAID SAS (Fusion and newer)
@


1.1156.2.14
log
@Pull up following revision(s) via patch (requested by nonaka in ticket #1210):

	sys/dev/hyperv/vmbusvar.h: revision 1.1
	sys/dev/hyperv/hvs.c: revision 1.1
	sys/dev/hyperv/if_hvn.c: revision 1.1
	sys/dev/hyperv/vmbusic.c: revision 1.1
	sys/arch/x86/x86/lapic.c: revision 1.69
	sys/arch/x86/isa/clock.c: revision 1.34
	sys/arch/x86/include/intrdefs.h: revision 1.22
	sys/arch/i386/conf/GENERIC: revision 1.1201
	sys/arch/x86/x86/hyperv.c: revision 1.1
	sys/arch/x86/include/cpu.h: revision 1.105
	sys/arch/x86/x86/x86_machdep.c: revision 1.124
	sys/arch/i386/conf/GENERIC: revision 1.1203
	sys/arch/amd64/amd64/genassym.cf: revision 1.74
	sys/arch/i386/conf/GENERIC: revision 1.1204
	sys/arch/amd64/conf/GENERIC: revision 1.520
	sys/arch/x86/x86/hypervreg.h: revision 1.1
	sys/arch/amd64/amd64/vector.S: revision 1.69
	sys/dev/hyperv/hvshutdown.c: revision 1.1
	sys/dev/hyperv/hvshutdown.c: revision 1.2
	sys/dev/usb/if_urndisreg.h: file removal
	sys/arch/x86/x86/cpu.c: revision 1.167
	sys/arch/x86/conf/files.x86: revision 1.107
	sys/dev/usb/if_urndis.c: revision 1.20
	sys/dev/hyperv/vmbusicreg.h: revision 1.1
	sys/dev/hyperv/hvheartbeat.c: revision 1.1
	sys/dev/hyperv/vmbusicreg.h: revision 1.2
	sys/dev/hyperv/hvheartbeat.c: revision 1.2
	sys/dev/hyperv/files.hyperv: revision 1.1
	sys/dev/ic/rndisreg.h: revision 1.1
	sys/arch/i386/i386/genassym.cf: revision 1.111
	sys/dev/ic/rndisreg.h: revision 1.2
	sys/dev/hyperv/hyperv_common.c: revision 1.1
	sys/dev/hyperv/hvtimesync.c: revision 1.1
	sys/dev/hyperv/hypervreg.h: revision 1.1
	sys/dev/hyperv/hvtimesync.c: revision 1.2
	sys/dev/hyperv/vmbusicvar.h: revision 1.1
	sys/dev/hyperv/if_hvnreg.h: revision 1.1
	sys/arch/x86/x86/lapic.c: revision 1.70
	sys/arch/amd64/amd64/vector.S: revision 1.70
	sys/dev/ic/ndisreg.h: revision 1.1
	sys/arch/amd64/conf/GENERIC: revision 1.516
	sys/dev/hyperv/hypervvar.h: revision 1.1
	sys/arch/amd64/conf/GENERIC: revision 1.518
	sys/arch/amd64/conf/GENERIC: revision 1.519
	sys/arch/i386/conf/files.i386: revision 1.400
	sys/dev/acpi/vmbus_acpi.c: revision 1.1
	sys/dev/hyperv/vmbus.c: revision 1.1
	sys/dev/hyperv/vmbus.c: revision 1.2
	sys/arch/x86/x86/intr.c: revision 1.144
	sys/arch/i386/i386/vector.S: revision 1.83
	sys/arch/amd64/conf/files.amd64: revision 1.112

separate RNDIS definitions from urndis(4) for use with Hyper-V NetVSC.

 -

Added Microsoft Hyper-V support.  It ported from OpenBSD and FreeBSD.
graphical console is not work on Gen.2 VM yet. To use the serial console,
enter "consdev com,0x3f8,115200" on efiboot.

 -

Add __diagused.

 -

PR/53984: Partial revert of modify lapic_calibrate_timer() in lapic.c r1.69.

 -

Update Hyper-V related drivers description.

 -

Remove unused definition.

 -

Rename the MODULE_*_HOOK() macros to MODULE_HOOK_*() as briefly
discussed on irc.
NFCI intended.

 -

commented out hvkvp entry.

 -

fix typo. pointed out by pgoyette@@n.o.

 -

Use IDTVEC instead of NENTRY for handle_hyperv_hypercall.

 -

Rename the MODULE_*_HOOK() macros to MODULE_HOOK_*() as briefly
discussed on irc.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.13 2018/12/07 17:11:37 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.13 $"
a40 1
hyperv0		at cpu0		# Microsoft Hyper-V
a1438 9
# Hyper-V devices
vmbus*		at acpi?		# Hyper-V VMBus
hvn*		at vmbus?		# Hyper-V NetVSC
hvs*		at vmbus?		# Hyper-V StorVSC
hvheartbeat*	at vmbus?		# Hyper-V Heartbeat Service
hvshutdown*	at vmbus?		# Hyper-V Guest Shutdown Service
hvtimesync*	at vmbus?		# Hyper-V Time Synchronization Service
#hvkvp*		at vmbus?		# Hyper-V Data Exchange Service

@


1.1156.2.15
log
@Pull up following revision(s) (requested by nonaka in ticket #1280):

	sys/arch/x86/x86/consinit.c: revision 1.29
	sys/dev/hyperv/vmbusvar.h: revision 1.2
	sys/dev/hyperv/genfb_vmbusvar.h: revision 1.1
	sys/arch/x86/x86/x86_autoconf.c: revision 1.78
	sys/arch/x86/x86/identcpu.c: revision 1.91
	sys/arch/x86/x86/hyperv.c: revision 1.2
	sys/arch/x86/x86/hyperv.c: revision 1.3
	sys/arch/x86/x86/hyperv.c: revision 1.4
	sys/arch/i386/conf/GENERIC: revision 1.1207
	sys/dev/wscons/wsconsio.h: revision 1.123
	sys/arch/x86/x86/hypervvar.h: revision 1.1
	sys/arch/amd64/conf/GENERIC: revision 1.528
	sys/dev/hyperv/files.hyperv: revision 1.2
	sys/arch/x86/include/autoconf.h: revision 1.6
	sys/dev/hyperv/hyperv_common.c: revision 1.2
	sys/arch/xen/x86/autoconf.c: revision 1.23
	sys/arch/x86/pci/pci_machdep.c: revision 1.86
	sys/dev/hyperv/hvkbd.c: revision 1.1
	sys/dev/hyperv/hypervvar.h: revision 1.2
	sys/dev/acpi/vmbus_acpi.c: revision 1.2
	sys/dev/hyperv/vmbus.c: revision 1.3
	sys/dev/hyperv/hvkbdvar.h: revision 1.1
	sys/dev/hyperv/genfb_vmbus.c: revision 1.1

Added drivers for Hyper-V Synthetic Keyboard and Video device.

Avoid undefined reference to `hyperv_guid_video' without vmbus(4).

Avoid undefined reference to `hyperv_is_gen1' without hyperv(4).

Use efi_probe().
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1156.2.14 2019/03/09 17:10:20 martin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1156.2.14 $"
a1441 3
genfb*		at vmbus?		# Hyper-V Synthetic Video Framebuffer
hvkbd*		at vmbus?		# Hyper-V Synthetic Keyboard
wskbd*		at hvkbd? console ? mux 1
@


1.1155
log
@rename u3ginit driver to umodeswitch
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1154 2017/04/18 19:09:12 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1154 $"
d210 1
d1684 2
@


1.1154
log
@gson@@ informs me the Alea I and II have the same USB product id.

Thus, ualea(4) should work for both of them.  Rename USB product id
ARANEUS ALEA_II to ARANEUS ALEA to reflect this.

No functional change intended, except perhaps via usbdevs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1153 2017/04/17 08:59:37 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1153 $"
d1355 1
a1355 1
u3ginit* at uhub? port ?
@


1.1153
log
@New rndsource driver for Araneus Alea II TRNG USB devices.

Disabled by default in x86/GENERIC and usbdevices.config pending
review and testing without rump ugenhc in the way, but enabled in
x86/ALL for compile-testing.

(Hi gson!  Finally found a round tuit in my pocket, next to a certain
rectangular one.)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1152 2017/02/26 12:41:50 rin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1152 $"
d1363 1
a1363 1
# Araneus Alea II TRNG
@


1.1152
log
@Comment out DISKLABEL_RDB as it is too specific for general usage.
(Also add commented out that entry for GENERIC on amd64; I forgot it)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1151 2017/02/26 12:21:15 maya Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1151 $"
d1363 3
@


1.1151
log
@Remove commented DISKLABEL_EI for strictly little endian architectures

It will never be useful.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1150 2017/02/26 12:03:14 rin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1150 $"
d160 1
a160 1
options 	DKWEDGE_METHOD_RDB	# Support RDB partitions as wedges
@


1.1150
log
@Add DKWEDGE_METHOD_RDB option, which is enabled for x86, commented out for
other platforms by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1149 2017/02/19 07:47:00 rin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1149 $"
a189 1
#options 	DISKLABEL_EI	# disklabel Endian Independent support
@


1.1149
log
@PR kern/51208
Add DISKLABEL_EI option (and also FFS_EI if missing), commented out except for
ALL on amd64 and i386.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1148 2017/02/18 14:36:32 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1148 $"
d160 1
@


1.1148
log
@There is currently an ugly mix between the PERFCTRS subsystem (MI), and
i386's own PMC interface (MD). Stop using PERFCTRS and use PMC instead.
While here remove some unused flags, which are wrong on the latest CPUs
anyway.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1147 2017/02/17 12:10:40 maxv Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1147 $"
d189 1
@


1.1147
log
@Support PMCs on multi-processor systems. Still several things to fix, but
at least it works a little. Will be improved and moved into x86/ soon.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1146 2017/01/12 05:24:36 ryo Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1146 $"
d45 1
a45 1
#options 	PERFCTRS	# performance-monitoring counters support
@


1.1146
log
@white space police
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1145 2016/12/13 20:42:18 christos Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1145 $"
a44 1
# doesn't work with MP just yet..
@


1.1146.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1154 2017/04/18 19:09:12 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1154 $"
d45 2
a46 1
#options 	PMC		# performance-monitoring counters support
a160 1
#options 	DKWEDGE_METHOD_RDB	# Support RDB partitions as wedges
a1362 3
# Araneus Alea I/II TRNG
#ualea* at uhub? port ? configuration ? interface ?

@


1.1145
log
@wildcard speaker attachments, now that we can handle many of them.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1144 2016/12/10 23:03:24 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1144 $"
d160 1
a160 1
options		DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
d363 1
a363 1
#hpacel*	at acpi?		# HP 3D DriveGuard accelerometer
d576 2
a577 2
i915drmkms* 	at pci? dev ? function ?
intelfb* 	at intelfbbus?
d586 1
a586 1
#viadrmums* 	at drm?
d839 2
a840 2
nvme*   at pci? dev ? function ?
ld*     at nvme? nsid ?
d1576 5
a1580 5
tpm*   at isa? iomem 0xfed40000 irq 7
#tpm*  at isa? port 0x02e
#tpm*  at isa? port 0x04e
#tpm*  at isa? port 0x07e
#tpm*  at isa? port 0x0ee
d1623 1
a1623 1
pseudo-device 	crypto			# /dev/crypto device
d1676 1
a1676 1
#pseudo-device 	etherip 		# Tunnel Ethernet over IP
@


1.1144
log
@remove VAUDIOSPEAKER for now, will be done differently.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1143 2016/12/09 02:24:17 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1143 $"
d1469 2
a1470 3
#spkr0	at pcppi?		# PC speaker

#spkr0	at audio0		# PC speaker (synthesized)
@


1.1143
log
@PCPPISPEAKER
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1142 2016/12/08 11:31:10 nat Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1142 $"
a1470 1
#options VAUDIOSPEAKER
@


1.1142
log
@Add a synthesized pc beeper and keyboard bell for platforms with an audio
device.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1141 2016/11/26 13:59:45 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1141 $"
a1468 1
#options PCPPISPEAKER
@


1.1141
log
@mention PAX_SEGVGUARD dependency on FILEASSOC
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1140 2016/09/17 18:37:46 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1140 $"
d1469 1
d1472 3
@


1.1140
log
@add nvme(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1139 2016/08/07 10:44:05 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1139 $"
d1713 1
@


1.1139
log
@rename ifmpls to mpls, so we don't have if_ifmpls...
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1138 2016/07/27 07:04:56 msaitoh Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1138 $"
d838 3
@


1.1138
log
@Add sdtemp(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1137 2016/06/21 11:37:25 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1137 $"
d206 1
a206 1
#options 	MPLS		# MultiProtocol Label Switching (needs ifmpls)
d1651 1
a1651 1
#pseudo-device	ifmpls			# MPLS pseudo-interface
@


1.1137
log
@add sdhc(4) at acpi to i386 and amd64 GENERIC kernel config.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1136 2016/05/20 01:37:47 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1136 $"
d722 8
@


1.1137.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1138 2016/07/27 07:04:56 msaitoh Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1138 $"
a721 8
#sdtemp* at iic? addr 0x18
#sdtemp* at iic? addr 0x19
#sdtemp* at iic? addr 0x1a
#sdtemp* at iic? addr 0x1b
#sdtemp* at iic? addr 0x1c
#sdtemp* at iic? addr 0x1d
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
@


1.1137.2.2
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1140 2016/09/17 18:37:46 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1140 $"
a837 3
# NVM Express controllers and devices
nvme*   at pci? dev ? function ?
ld*     at nvme? nsid ?
@


1.1137.2.3
log
@Sync with HEAD.  (Note that most of these changes are simply $NetBSD$
tag issues.)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1145 2016/12/13 20:42:18 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1145 $"
d1469 1
a1469 2
#spkr*	at pcppi?		# PC speaker
#spkr*	at audio?		# PC speaker (synthesized)
a1712 1
					# and PAX_SEGVGUARD
@


1.1137.2.4
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1152 2017/02/26 12:41:50 rin Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1152 $"
d45 2
a46 1
#options 	PMC		# performance-monitoring counters support
d160 1
a160 2
options 	DKWEDGE_METHOD_APPLE	# Support Apple partitions as wedges
#options 	DKWEDGE_METHOD_RDB	# Support RDB partitions as wedges
d363 1
a363 1
#hpacel* 	at acpi?		# HP 3D DriveGuard accelerometer
d576 2
a577 2
i915drmkms*	at pci? dev ? function ?
intelfb*	at intelfbbus?
d586 1
a586 1
#viadrmums*	at drm?
d839 2
a840 2
nvme*	at pci? dev ? function ?
ld*	at nvme? nsid ?
d1576 5
a1580 5
tpm*	at isa? iomem 0xfed40000 irq 7
#tpm*	at isa? port 0x02e
#tpm*	at isa? port 0x04e
#tpm*	at isa? port 0x07e
#tpm*	at isa? port 0x0ee
d1623 1
a1623 1
pseudo-device	crypto			# /dev/crypto device
d1676 1
a1676 1
#pseudo-device	etherip 		# Tunnel Ethernet over IP
@


1.1137.2.5
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1154 2017/04/18 19:09:12 riastradh Exp $
d25 1
a25 1
#ident		"GENERIC-$Revision: 1.1154 $"
a1362 3
# Araneus Alea I/II TRNG
#ualea* at uhub? port ? configuration ? interface ?

@


1.1136
log
@Turn on PaX ASLR/MPROTECT
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1135 2016/04/23 10:15:29 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1135 $"
d372 1
@


1.1135
log
@Merge nick-nhusb

- API / infrastructure changes to support memory management changes.
- Memory management improvements and bug fixes.
- HCDs should now be MP safe
- conversion to KERNHIST based debug
- FS/LS isoc support on ehci(4).
- conversion to kmem(9)
- Some USB 3 support - mostly from Takahiro HAYASHI (t-hash).
- interrupt transfers now get proper DMA operations
- general bug fixes
    - kern/48308
    - uhub status notification improvements
    - umass(4) probe fix (applied to HEAD already)
    - ohci(4) short transfer fix
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1134 2016/04/13 15:26:27 riastradh Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1134 $"
d1716 5
a1720 2
options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
options 	PAX_ASLR=0		# PaX Address Space Layout Randomization
@


1.1134
log
@Enable nouveau by default again in x86 GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1133 2016/03/19 23:21:02 gdt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1133 $"
d1152 1
a1152 1
# xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
d1171 1
a1171 1
# usb*	at xhci?
@


1.1133
log
@Disable uscanner in all kernel configs

As discussed on current-users@@, SANE uses ugen via libusb and not
uscanner, so users are not well served by having uscanner.  Consensus
is that addressing how to adjust permissions for scanners should not
block restoring basic functionionality.

(Compile-tested only, but there are multiple reports of this being the
right approach.)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1132 2016/03/05 17:08:48 riastradh Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1132 $"
d581 2
a582 2
#nouveau*	at pci? dev ? function ?
#nouveaufb*	at nouveaufbbus?
@


1.1132
log
@Revert to disabling nouveau by default in x86 GENERIC.

Haven't had time to debug the issues that seem to affect pretty much
everyone.  Maybe soon!
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1131 2016/02/13 19:53:23 riastradh Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1131 $"
d1324 1
a1324 1
uscanner* at uhub? port ?
@


1.1131
log
@Add nouveau to x86 GENERIC kernels.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1130 2016/01/22 21:56:56 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1130 $"
d581 2
a582 2
nouveau*	at pci? dev ? function ?
nouveaufb*	at nouveaufbbus?
@


1.1130
log
@Enable KDTRACE_HOOKS on i386 and amd64 GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1129 2016/01/05 11:33:18 msaitoh Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1129 $"
d581 2
a582 2
#nouveau*	at pci? dev ? function ?
#nouveaufb*	at nouveaufbbus?
@


1.1129
log
@Add ismt(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1128 2015/09/26 11:16:12 maxv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1128 $"
d125 1
a125 1
#options 	KDTRACE_HOOKS	# kernel DTrace hooks
@


1.1128
log
@Remove KMEMSTATS. Normally it's ok now.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1127 2015/09/21 12:32:06 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1127 $"
d657 4
@


1.1127
log
@PR/50261: Added newer Toshiba hotkeys support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1126 2015/08/27 14:04:07 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1126 $"
a114 1
#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
@


1.1126
log
@Added rtwn(4) for Realtek RTL8188CE/RTL8192CE PCIe 802.11b/g/n wireless network
devices.  Ported from OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1125 2015/05/23 18:13:31 maxv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1125 $"
d378 1
@


1.1125
log
@Disable COMPAT_FREEBSD. The implementation is poor, not well tested and
almost irrelevant. People who need it (for tw_cli for example) can still
recompile their kernels with this option.

Discussed on tech-kern@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1124 2015/05/04 07:08:10 pgoyette Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1124 $"
d1004 1
@


1.1124
log
@One more typo.

Message to self: when making multi-architecture changes, build on more
than one arch.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1123 2015/05/03 02:52:50 pgoyette Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1123 $"
d152 1
a152 1
options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
@


1.1123
log
@Update to include the tco driver (it was previously included as part of
ichlpcib).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1122 2015/04/29 17:43:06 riastradh Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1122 $"
d457 1
a457 1
tco*	at ichlpbib?		# TCO watchdog timer
@


1.1122
log
@Add commented viadrmums to i386/GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1121 2015/03/18 02:05:05 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1121 $"
d454 1
a454 1
					# watchdog, SpeedStep and HPET
d457 1
@


1.1121
log
@fix commented out nouveaufb
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1120 2015/03/07 07:28:37 mrg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1120 $"
d573 1
d583 3
@


1.1120
log
@remove vga@@isa and pcdisplay@@isa from i386 GENERIC, and create a new
LEGACY kernel that includes them instead.  now radeon@@pci is able to
properly claim wsdisplay0 on i386 systems, and radeondrmkms has a good
chance of working.

this "fixes" PR#49290.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1119 2015/02/13 18:57:47 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1119 $"
d580 1
a580 1
#nouveaufb*	at nouveaufbbus
@


1.1119
log
@iwm(4) works now, but 2.4GHz only.

> iwm0 at pci2 dev 0 function 0: Intel Dual Band Wireless AC 3160 (rev. 0x83)
> iwm0: interrupting at ioapic0 pin 18
> iwm0: hw rev: 0x160, fw ver 25.228 (API ver 9), address XX:XX:XX:XX:XX:XX
> iwm0: 11b rates: 1Mbps 2Mbps 5.5Mbps 11Mbps
> iwm0: 11g rates: 1Mbps 2Mbps 5.5Mbps 11Mbps 6Mbps 9Mbps 12Mbps 18Mbps 24Mbps 36Mbps 48Mbps 54Mbps
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118 2014/11/16 16:01:41 manu Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118 $"
d540 2
a541 1
vga0		at isa?
d543 1
a543 1
pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
d548 1
a548 1
wsdisplay*	at pcdisplay? console ?
@


1.1118
log
@Remove unused extended attributes kernel options

As Masao Uebayashi pointed to me, UFS_EXTATTR_AUTOSTART, LFS_EXTATTR_AUTOSTART
and UFS_EXTATTR_AUTOCREATE are not used anywhere in the code. Remove them
as they have been obsolete for a long time:
UFS_EXTATTR_AUTOSTART was replaced by mount -o extattr
LFS_EXTATTR_AUTOSTART was created to match obsolete UFS_EXTATTR_AUTOSTART
UFS_EXTATTR_AUTOCREATE was replaced by sysctl vfs.ffs.extattr_autocreate
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1117 2014/11/12 10:47:22 manu Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1117 $"
d978 1
@


1.1118.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1121 2015/03/18 02:05:05 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1121 $"
d540 1
a540 2
# vga@@isa and pcdisplay@@isa are disabled; see PR#49290
#vga0		at isa?
d542 1
a542 1
#pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
d547 1
a547 1
#wsdisplay*	at pcdisplay? console ?
d579 1
a579 1
#nouveaufb*	at nouveaufbbus?
a977 1
iwm*	at pci? dev ? function ?	# Intel Wireless WiFi Link 7xxx
@


1.1118.2.2
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.1 2015/04/06 15:17:57 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.1 $"
d152 1
a152 1
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
d454 1
a454 1
					# watchdog, gpio, SpeedStep and HPET
a456 1
tco*	at ichlpcib?		# TCO watchdog timer
a572 1
# DRMKMS drivers
a581 3
# DRMUMS drivers
#viadrmums* 	at drm?

@


1.1118.2.3
log
@Enable xhci(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.2 2015/06/06 14:40:00 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.2 $"
d1147 1
a1147 1
xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
d1166 1
a1166 1
usb*	at xhci?
@


1.1118.2.4
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.3 2015/09/21 07:14:16 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.3 $"
a377 1
valz*		at acpi?		# Toshiba Dynabook hotkeys
a1003 1
rtwn*	at pci? dev ? function ?	# Realtek 8188CE/8192CE 802.11b/g/n
@


1.1118.2.5
log
@Sync with HEAD (as of 26th Dec)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.4 2015/09/22 12:05:44 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.4 $"
d115 1
@


1.1118.2.6
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.5 2015/12/27 12:09:36 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.5 $"
d125 1
a125 1
options 	KDTRACE_HOOKS	# kernel DTrace hooks
a656 4
# Intel S1200,C2000 (non-pch) SMBus controller
ismt* at pci? dev ? function ?
iic*	at ismt?

@


1.1118.2.7
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.6 2016/03/19 11:30:00 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.6 $"
d581 2
a582 2
nouveau*	at pci? dev ? function ?
nouveaufb*	at nouveaufbbus?
d1324 1
a1324 1
#uscanner* at uhub? port ?
@


1.1118.2.8
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.7 2016/04/22 15:44:10 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.7 $"
d1716 2
a1717 5
options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard
options 	PAX_MPROTECT=1		# PaX mprotect(2) restrictions
options 	PAX_MPROTECT_DEBUG=1	# PaX mprotect debug
options 	PAX_ASLR=1		# PaX Address Space Layout Randomization
@


1.1118.2.9
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.8 2016/05/29 08:44:17 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.8 $"
a371 1
sdhc*		at acpi?		# SD Host Controller
@


1.1118.2.10
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.9 2016/07/09 20:24:52 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.9 $"
d206 1
a206 1
#options 	MPLS		# MultiProtocol Label Switching (needs mpls)
a721 8
#sdtemp* at iic? addr 0x18
#sdtemp* at iic? addr 0x19
#sdtemp* at iic? addr 0x1a
#sdtemp* at iic? addr 0x1b
#sdtemp* at iic? addr 0x1c
#sdtemp* at iic? addr 0x1d
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
a829 3
# NVM Express controllers and devices
nvme*   at pci? dev ? function ?
ld*     at nvme? nsid ?
d1643 1
a1643 1
#pseudo-device	mpls			# MPLS pseudo-interface
@


1.1118.2.11
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.10 2016/10/05 20:55:28 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.10 $"
a1712 1
					# and PAX_SEGVGUARD
@


1.1118.2.12
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.11 2016/12/05 10:54:53 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.11 $"
d160 1
a160 1
options 	DKWEDGE_METHOD_APPLE	# Support Apple partitions as wedges
d363 1
a363 1
#hpacel* 	at acpi?		# HP 3D DriveGuard accelerometer
d576 2
a577 2
i915drmkms*	at pci? dev ? function ?
intelfb*	at intelfbbus?
d586 1
a586 1
#viadrmums*	at drm?
d839 2
a840 2
nvme*	at pci? dev ? function ?
ld*	at nvme? nsid ?
d1469 1
a1469 2
#spkr*	at pcppi?		# PC speaker
#spkr*	at audio?		# PC speaker (synthesized)
d1575 5
a1579 5
tpm*	at isa? iomem 0xfed40000 irq 7
#tpm*	at isa? port 0x02e
#tpm*	at isa? port 0x04e
#tpm*	at isa? port 0x07e
#tpm*	at isa? port 0x0ee
d1622 1
a1622 1
pseudo-device	crypto			# /dev/crypto device
d1675 1
a1675 1
#pseudo-device	etherip 		# Tunnel Ethernet over IP
@


1.1118.2.13
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1118.2.12 2017/02/05 13:40:12 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1118.2.12 $"
d30 1
d45 2
a46 1
options 	PMC		# performance-monitoring counters support
d145 1
d148 2
a160 1
#options 	DKWEDGE_METHOD_RDB	# Support RDB partitions as wedges
a209 1
#options 	CAN		# Controller Area Network protocol
a541 1
options 	PMS_ALPS_TOUCHPAD	# Enable support for Alps Touchpads
d1355 1
a1355 1
umodeswitch* at uhub? port ?
a1362 3
# Araneus Alea I/II TRNG
#ualea* at uhub? port ? configuration ? interface ?

a1679 2
#pseudo-device	canloop			# CAN loopback interface

@


1.1117
log
@Support for UFS1 extended attributes in GENERIC and GENERIC-like kernels

This change just brings UFS1 extended attribute *support* in the kernel,
extended attributes are not enabled unless three conditions are met:
1) filesystem is UFS1 (newfs -O1)
2) .attribute/system and .attribute/user directories are created at fs root
3) filesystem is mounted with -o extattr

Some GENERIC kernels are obviously memory constrained, the extended
attributes options were not enabled for them, but just added commented out.
(kernel were considered memory constrained if QUOTA option was disabled)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1116 2014/11/02 23:14:20 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1116 $"
a196 2
options 	UFS_EXTATTR_AUTOSTART
options 	UFS_EXTATTR_AUTOCREATE=1024
@


1.1116
log
@switch to DRMKMS drivers
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1115 2014/10/18 16:56:51 uebayasi Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1115 $"
d196 3
@


1.1115
log
@Install agp_* drivers where pchb(4) is installed except INSTALL_FLOPPY.

XXX
Config around agp(4) is done in quite wrong direction.
	"pchb <- (agpbus) <- agp <- agp_*"
should be:
	"pchb <- (pcibus) <- agp_* <- (agpbus) <- agp"
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d560 19
a578 10
# DRI driver
i915drm*	at drm?		# Intel i915, i945 DRM driver
mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at drm?		# ATI Rage 128 DRM driver
radeondrm*	at drm?		# ATI Radeon DRM driver
savagedrm*	at drm?		# S3 Savage DRM driver
sisdrm* 	at drm?		# SiS DRM driver
tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
viadrm* 	at drm?		# VIA DRM driver
@


1.1114
log
@Add HDAUDIOVERBOSE
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1113 2014/09/19 15:24:24 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1113 $"
d467 1
@


1.1113
log
@Disable BSDLABEL and MBR DKWEDGE methods again since sysinst does not work
with wedges.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1112 2014/09/18 14:58:21 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1112 $"
d245 1
@


1.1112
log
@Add commented out KDTRACE_HOOKS line.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1111 2014/08/24 07:59:22 jnemeth Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1111 $"
d159 2
a160 2
options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges
@


1.1111
log
@Create an "options MODULAR_DEFAULT_AUTOLOAD" config option and add
it to all kernel configs that contain "options MODULAR".  This
option turns on module autoloading by default (which is the current
default).  This allows people who don't want module autoloading on
by default to disable it by simply removing/commentting this line.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1110 2014/08/23 20:26:58 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1110 $"
d126 1
@


1.1110
log
@Systematize (and in many cases, fix) the comments on options COMPAT_NN.

There are quite a few configs that are missing some COMPAT_NN options
in ways that don't make sense; this should probably get cleaned up
too, but for the time being I've not added or removed anything.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1109 2014/08/18 06:31:24 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1109 $"
d92 1
@


1.1109
log
@- Enable Wedge support for MBR/BSDLABEL where it was commented out.
- Add apple partition support where it was missing
- Add comments where missing
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1108 2014/08/16 17:56:32 apb Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1108 $"
d128 14
a141 14
options 	COMPAT_09	# NetBSD 0.9
options 	COMPAT_10	# NetBSD 1.0
options 	COMPAT_11	# NetBSD 1.1
options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
options 	COMPAT_14	# NetBSD 1.4
options 	COMPAT_15	# NetBSD 1.5
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
options 	COMPAT_30	# NetBSD 3.0
options 	COMPAT_40	# NetBSD 4.0
options 	COMPAT_50	# NetBSD 5.0
options 	COMPAT_60	# NetBSD 6.0 compatibility.
options 	COMPAT_70	# NetBSD 7.0 compatibility.
@


1.1108
log
@Add "options COMPAT_70" to all kernel configuration files that
already had "options COMPAT_60".
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107 2014/07/25 15:01:14 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107 $"
d157 3
a159 4
# The following three options can break /etc/fstab, so handle with care
#options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
#options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges
#options	DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
@


1.1107
log
@Fix description of DIAGNOSTIC in x86 kernels.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1106 2014/06/16 19:08:17 dsl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1106 $"
d141 1
@


1.1107.2.1
log
@Apply patch (requested by bouyer/martin in ticket #116):
Disable DIAGNOSTIC and/or DEBUG.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107 2014/07/25 15:01:14 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107 $"
d110 1
a110 1
#options 	DIAGNOSTIC	# inexpensive kernel consistency checks
@


1.1107.2.2
log
@Pull up following revision(s) (requested by manu in ticket #232):
	sys/arch/next68k/conf/GENERIC: revision 1.138
	sys/arch/cobalt/conf/GENERIC: revision 1.146
	sys/arch/mvme68k/conf/GENERIC: revision 1.93
	sys/arch/vax/conf/VAX780: revision 1.18
	sys/arch/newsmips/conf/GENERIC: revision 1.128
	sys/arch/luna68k/conf/GENERIC: revision 1.118
	sys/arch/sbmips/conf/GENERIC: revision 1.100
	sys/arch/pmax/conf/GENERIC: revision 1.184
	sys/arch/alpha/conf/GENERIC: revision 1.361
	sys/arch/sparc64/conf/GENERIC: revision 1.176
	sys/arch/sun3/conf/GENERIC: revision 1.170
	sys/arch/shark/conf/GENERIC: revision 1.120
	sys/arch/landisk/conf/GENERIC: revision 1.44
	sys/arch/bebox/conf/GENERIC: revision 1.144
	sys/arch/sparc64/conf/NONPLUS64: revision 1.43
	sys/arch/sandpoint/conf/GENERIC: revision 1.87
	sys/arch/emips/conf/GENERIC: revision 1.14
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.111
	sys/arch/dreamcast/conf/GENERIC: revision 1.120
	sys/arch/cesfic/conf/GENERIC: revision 1.64
	sys/arch/mmeye/conf/GENERIC: revision 1.119
	sys/arch/epoc32/conf/GENERIC: revision 1.7
	sys/arch/x68k/conf/GENERIC: revision 1.178
	sys/arch/iyonix/conf/GENERIC: revision 1.87
	sys/arch/sun2/conf/GENERIC: revision 1.93
	sys/arch/ews4800mips/conf/GENERIC: revision 1.50
	sys/arch/amd64/conf/XEN3_DOMU: revision 1.59
	sys/arch/acorn26/conf/GENERIC: revision 1.80
	sys/arch/acorn32/conf/GENERIC: revision 1.115
	sys/arch/macppc/conf/POWERMAC_G5: revision 1.24
	sys/arch/i386/conf/GENERIC: revision 1.1117
	sys/arch/arc/conf/GENERIC: revision 1.183
	sys/arch/cats/conf/GENERIC: revision 1.154
	sys/arch/amiga/conf/GENERIC.in: revision 1.128
	sys/arch/zaurus/conf/GENERIC: revision 1.64
	sys/arch/netwinder/conf/GENERIC: revision 1.125
	sys/arch/hppa/conf/GENERIC: revision 1.5
	sys/arch/mvmeppc/conf/GENERIC: revision 1.23
	sys/arch/macppc/conf/GENERIC: revision 1.319
	sys/arch/amiga/conf/GENERIC: revision 1.310
	sys/arch/pmax/conf/GENERIC64: revision 1.20
	sys/arch/macppc/conf/MAMBO: revision 1.23
	sys/arch/sgimips/conf/GENERIC32_IP12: revision 1.27
	sys/arch/amigappc/conf/GENERIC: revision 1.23
	sys/arch/amd64/conf/GENERIC: revision 1.403
	sys/arch/ofppc/conf/GENERIC: revision 1.156
	sys/arch/mac68k/conf/GENERIC: revision 1.219
	sys/arch/i386/conf/XEN3_DOMU: revision 1.64
	sys/arch/mipsco/conf/GENERIC: revision 1.87
	sys/arch/hp300/conf/GENERIC: revision 1.189
	sys/arch/vax/conf/GENERIC: revision 1.192
	sys/arch/news68k/conf/GENERIC: revision 1.124
	sys/arch/ibmnws/conf/GENERIC: revision 1.45
	sys/arch/hpcsh/conf/GENERIC: revision 1.105
	sys/arch/sparc/conf/TADPOLE3GX: revision 1.64
	sys/arch/i386/conf/XEN3_DOM0: revision 1.92
	sys/arch/sparc/conf/GENERIC: revision 1.247
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.105
	sys/arch/prep/conf/GENERIC: revision 1.173
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.103
	sys/arch/rs6000/conf/GENERIC: revision 1.32
	sys/arch/hpcmips/conf/GENERIC: revision 1.228
Support for UFS1 extended attributes in GENERIC and GENERIC-like kernels
This change just brings UFS1 extended attribute *support* in the kernel,
extended attributes are not enabled unless three conditions are met:
1) filesystem is UFS1 (newfs -O1)
2) .attribute/system and .attribute/user directories are created at fs root
3) filesystem is mounted with -o extattr
Some GENERIC kernels are obviously memory constrained, the extended
attributes options were not enabled for them, but just added commented out.
(kernel were considered memory constrained if QUOTA option was disabled)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.1 2014/10/10 18:16:37 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.1 $"
a193 3
options 	UFS_EXTATTR	# Extended attribute support for UFS1
options 	UFS_EXTATTR_AUTOSTART
options 	UFS_EXTATTR_AUTOCREATE=1024
@


1.1107.2.3
log
@Pull up following revision(s) (requested by manu in ticket #251):
	sys/arch/acorn26/conf/GENERIC: revision 1.81
	sys/arch/acorn32/conf/GENERIC: revision 1.116
	sys/arch/alpha/conf/GENERIC: revision 1.362
	sys/arch/amd64/conf/ALL: revision 1.23
	sys/arch/amd64/conf/GENERIC: revision 1.404
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.112
	sys/arch/amd64/conf/XEN3_DOMU: revision 1.60
	sys/arch/amiga/conf/GENERIC.in: revision 1.129
	sys/arch/amiga/conf/GENERIC: revision 1.311
	sys/arch/amigappc/conf/GENERIC: revision 1.24
	sys/arch/arc/conf/GENERIC: revision 1.184
	sys/arch/bebox/conf/GENERIC: revision 1.145
	sys/arch/cats/conf/GENERIC: revision 1.155
	sys/arch/cesfic/conf/GENERIC: revision 1.65
	sys/arch/cobalt/conf/GENERIC: revision 1.147
	sys/arch/dreamcast/conf/GENERIC: revision 1.121
	sys/arch/emips/conf/GENERIC: revision 1.15
	sys/arch/epoc32/conf/GENERIC: revision 1.8
	sys/arch/ews4800mips/conf/GENERIC: revision 1.51
	sys/arch/hp300/conf/GENERIC: revision 1.190
	sys/arch/hpcmips/conf/GENERIC: revision 1.229
	sys/arch/hpcsh/conf/GENERIC: revision 1.106
	sys/arch/hppa/conf/GENERIC: revision 1.6
	sys/arch/i386/conf/ALL: revision 1.389
	sys/arch/i386/conf/GENERIC: revision 1.1118
	sys/arch/i386/conf/XEN3_DOM0: revision 1.93
	sys/arch/i386/conf/XEN3_DOMU: revision 1.65
	sys/arch/ibmnws/conf/GENERIC: revision 1.46
	sys/arch/iyonix/conf/GENERIC: revision 1.88
	sys/arch/landisk/conf/GENERIC: revision 1.45
	sys/arch/luna68k/conf/GENERIC: revision 1.119
	sys/arch/mac68k/conf/GENERIC: revision 1.220
	sys/arch/macppc/conf/GENERIC: revision 1.320
	sys/arch/macppc/conf/MAMBO: revision 1.24
	sys/arch/macppc/conf/POWERMAC_G5: revision 1.25
	sys/arch/mipsco/conf/GENERIC: revision 1.88
	sys/arch/mmeye/conf/GENERIC: revision 1.120
	sys/arch/mvme68k/conf/GENERIC: revision 1.94
	sys/arch/mvmeppc/conf/GENERIC: revision 1.24
	sys/arch/netwinder/conf/GENERIC: revision 1.126
	sys/arch/news68k/conf/GENERIC: revision 1.125
	sys/arch/newsmips/conf/GENERIC: revision 1.129
	sys/arch/next68k/conf/GENERIC: revision 1.139
	sys/arch/ofppc/conf/GENERIC: revision 1.157
	sys/arch/pmax/conf/GENERIC64: revision 1.21
	sys/arch/pmax/conf/GENERIC: revision 1.185
	sys/arch/prep/conf/GENERIC: revision 1.174
	sys/arch/rs6000/conf/GENERIC: revision 1.33
	sys/arch/sandpoint/conf/GENERIC: revision 1.88
	sys/arch/sbmips/conf/GENERIC: revision 1.101
	sys/arch/sgimips/conf/GENERIC32_IP12: revision 1.28
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.104
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.106
	sys/arch/shark/conf/GENERIC: revision 1.121
	sys/arch/sparc/conf/GENERIC: revision 1.248
	sys/arch/sparc/conf/TADPOLE3GX: revision 1.65
	sys/arch/sparc64/conf/GENERIC: revision 1.177
	sys/arch/sparc64/conf/NONPLUS64: revision 1.44
	sys/arch/sun2/conf/GENERIC: revision 1.94
	sys/arch/sun3/conf/GENERIC: revision 1.171
	sys/arch/vax/conf/GENERIC: revision 1.193
	sys/arch/vax/conf/VAX780: revision 1.19
	sys/arch/x68k/conf/GENERIC: revision 1.179
	sys/arch/zaurus/conf/GENERIC: revision 1.65
	sys/ufs/files.ufs: revision 1.38
Remove unused extended attributes kernel options

As Masao Uebayashi pointed to me, UFS_EXTATTR_AUTOSTART, LFS_EXTATTR_AUTOSTART
and UFS_EXTATTR_AUTOCREATE are not used anywhere in the code. Remove them
as they have been obsolete for a long time:
UFS_EXTATTR_AUTOSTART was replaced by mount -o extattr
LFS_EXTATTR_AUTOSTART was created to match obsolete UFS_EXTATTR_AUTOSTART
UFS_EXTATTR_AUTOCREATE was replaced by sysctl vfs.ffs.extattr_autocreate
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.2 2014/11/14 15:16:17 martin Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.2 $"
d195 2
@


1.1107.2.4
log
@Change the following, requested by snj in ticket #438:

sys/arch/i386/conf/GENERIC	patch
sys/arch/amd64/conf/GENERIC 	patch

Remove the i915drm driver since the version we use doesn't support UMS
anymore, so X will fail to start. Without it, at least the vesa driver
will work.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.3 2014/11/18 19:05:30 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.3 $"
d558 1
a558 1
#i915drm*	at drm?		# Intel i915, i945 DRM driver
@


1.1107.2.5
log
@Pull up following revision(s) (requested by mrg in ticket #578):
	distrib/notes/i386/contents: revision 1.28
	etc/etc.i386/Makefile.inc: revision 1.68
	sys/arch/i386/conf/GENERIC: revision 1.1120
	sys/arch/i386/conf/LEGACY: revision 1.1
remove vga@@isa and pcdisplay@@isa from i386 GENERIC, and create a new
LEGACY kernel that includes them instead.  now radeon@@pci is able to
properly claim wsdisplay0 on i386 systems, and radeondrmkms has a good
chance of working.
this "fixes" PR#49290.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.4 2015/01/20 20:40:50 martin Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.4 $"
d536 1
a536 2
# vga@@isa and pcdisplay@@isa are disabled; see PR#49290
#vga0		at isa?
d538 1
a538 1
#pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
d543 1
a543 1
#wsdisplay*	at pcdisplay? console ?
@


1.1107.2.6
log
@Apply patch (requested by christos in ticket #542):
- Enable intel and radeon DRM/KMS drivers in GENERIC
- Disable all of the old DRM drivers in GENERIC
- Remove the separate DRMKMS kernel
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.5 2015/03/09 09:06:04 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.5 $"
d558 1
a558 1
# DRI legacy drivers
d560 8
a567 17
#mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
#mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
#r128drm*	at drm?		# ATI Rage 128 DRM driver
#radeondrm*	at drm?		# ATI Radeon DRM driver
#savagedrm*	at drm?		# S3 Savage DRM driver
#sisdrm* 	at drm?		# SiS DRM driver
#tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
#viadrm* 	at drm?		# VIA DRM driver

i915drmkms* 	at pci? dev ? function ?
intelfb* 	at intelfbbus?

radeon* 	at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?

#nouveau*	at pci? dev ? function ?
#nouveaufb*	at nouveaufbbus?
@


1.1107.2.7
log
@Pull up following revision(s) (requested by jnemeth in ticket #762):
	share/man/man4/options.4: revision 1.442
	sys/arch/amd64/conf/ALL: revision 1.18
	sys/arch/amd64/conf/GENERIC: revision 1.396
	sys/arch/dreamcast/conf/GENERIC: revision 1.119
	sys/arch/epoc32/conf/GENERIC: revision 1.6
	sys/arch/evbarm/conf/BCM5301X: revision 1.24
	sys/arch/evbarm/conf/BCM56340: revision 1.9
	sys/arch/evbarm/conf/IMX23_OLINUXINO: revision 1.9
	sys/arch/evbarm/conf/std.beagle: revision 1.13
	sys/arch/evbarm/conf/std.kobo: revision 1.2
	sys/arch/evbarm/conf/std.netwalker: revision 1.10
	sys/arch/evbppc/conf/P2020DS: revision 1.25
	sys/arch/evbppc/conf/RB800: revision 1.30
	sys/arch/evbppc/conf/TWRP1025: revision 1.18
	sys/arch/hp300/conf/GENERIC: revision 1.187
	sys/arch/hpcsh/conf/GENERIC: revision 1.104
	sys/arch/i386/conf/GENERIC: revision 1.1111
	sys/arch/i386/conf/MONOLITHIC: revision 1.17
	sys/arch/landisk/conf/GENERIC: revision 1.43
	sys/arch/luna68k/conf/GENERIC: revision 1.117
	sys/arch/macppc/conf/GENERIC: revision 1.316
	sys/arch/macppc/conf/GENERIC_601: revision 1.5
	sys/arch/mmeye/conf/MMEYE_WLF: revision 1.16
	sys/arch/news68k/conf/GENERIC: revision 1.123
	sys/arch/sandpoint/conf/GENERIC: revision 1.85
	sys/arch/shark/conf/GENERIC: revision 1.119
	sys/arch/sparc/conf/GENERIC: revision 1.246
	sys/arch/sparc64/conf/GENERIC: revision 1.174
	sys/arch/sun3/conf/GENERIC3X: revision 1.125
	sys/arch/sun3/conf/GENERIC: revision 1.169
	sys/arch/x68k/conf/GENERIC: revision 1.177
	sys/arch/zaurus/conf/GENERIC: revision 1.62
	sys/conf/files: revision 1.1099
	sys/kern/kern_module.c: revisions 1.98, 1.99
Create an "options MODULAR_DEFAULT_AUTOLOAD" config option and add
it to all kernel configs that contain "options MODULAR".  This
option turns on module autoloading by default (which is the current
default).  This allows people who don't want module autoloading on
by default to disable it by simply removing/commentting this line.
--
fix typo. (s/MODULE_DEFAULT_AUTOLOAD/MODULAR_DEFAULT_AUTOLOAD/)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.6 2015/03/18 03:57:15 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.6 $"
a91 1
options 	MODULAR_DEFAULT_AUTOLOAD
@


1.1107.2.8
log
@Pull up following revision(s) (requested by maxv in ticket #814):
	sys/arch/i386/conf/GENERIC: revision 1.1125
	sys/arch/i386/conf/XEN3_DOM0: revision 1.95
	sys/arch/i386/conf/XEN3_DOMU: revision 1.67
Disable COMPAT_FREEBSD. The implementation is poor, not well tested and
almost irrelevant. People who need it (for tw_cli for example) can still
recompile their kernels with this option.
Discussed on tech-kern@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.7 2015/05/15 03:44:18 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.7 $"
d150 1
a150 1
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
@


1.1107.2.8.2.1
log
@Apply patch (requested by maxv in ticket #1463):
i386 GENERIC: disable VM86 by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.8 2015/06/05 16:52:39 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.8 $"
d30 1
a30 1
#options 	VM86		# virtual 8086 emulation
@


1.1107.2.8.2.2
log
@Apply patch (requested by maxv in ticket #1499):
- disable compat_svr4 and compat_svr4_32 everywhere
- disable compat_ibcs2 everywhere but on Vax
- remove svr4/svr4_32/ibcs2/freebsd from the module autoload list
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.8.2.1 2017/08/24 06:50:16 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.8.2.1 $"
d147 2
a148 2
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1107.2.9
log
@Pull up following revision(s) (requested by msaitoh in ticket #1297):
	sys/arch/amd64/conf/ALL: revision 1.37
	sys/arch/amd64/conf/GENERIC: revision 1.436
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.120
	sys/arch/i386/conf/ALL: revision 1.400
	sys/arch/i386/conf/GENERIC: revision 1.1138
	sys/arch/i386/conf/XEN3_DOM0: revision 1.99
Add sdtemp(4)
--
Add ichsmb(4), spdmem(4) and sdtemp(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.8 2015/06/05 16:52:39 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.8 $"
a708 8
#sdtemp* at iic? addr 0x18
#sdtemp* at iic? addr 0x19
#sdtemp* at iic? addr 0x1a
#sdtemp* at iic? addr 0x1b
#sdtemp* at iic? addr 0x1c
#sdtemp* at iic? addr 0x1d
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
@


1.1107.2.9.2.1
log
@Apply patch (requested by maxv in ticket #1463):
i386 GENERIC: disable VM86 by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.9 2016/12/09 05:10:45 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.9 $"
d30 1
a30 1
#options 	VM86		# virtual 8086 emulation
@


1.1107.2.9.2.2
log
@Apply patch (requested by maxv in ticket #1499):
- disable compat_svr4 and compat_svr4_32 everywhere
- disable compat_ibcs2 everywhere but on Vax
- remove svr4/svr4_32/ibcs2/freebsd from the module autoload list
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.9.2.1 2017/08/24 06:51:17 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.9.2.1 $"
d147 2
a148 2
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1107.2.10
log
@Pull up following revision(s) (requested by skrll in ticket #1395):
	share/man/man4/axe.4: netbsd-7-nhusb
	share/man/man4/axen.4: netbsd-7-nhusb
	share/man/man4/cdce.4: netbsd-7-nhusb
	share/man/man4/uaudio.4: netbsd-7-nhusb
	share/man/man4/ucom.4: netbsd-7-nhusb
	share/man/man4/uep.4: netbsd-7-nhusb
	share/man/man4/urtw.4: netbsd-7-nhusb
	share/man/man4/usb.4: netbsd-7-nhusb
	share/man/man4/uyap.4: netbsd-7-nhusb
	share/man/man4/xhci.4: netbsd-7-nhusb
	share/man/man9/usbdi.9: netbsd-7-nhusb
	sys/arch/amd64/conf/ALL: netbsd-7-nhusb
	sys/arch/amd64/conf/GENERIC: netbsd-7-nhusb
	sys/arch/amiga/dev/slhci_zbus.c: netbsd-7-nhusb
	sys/arch/arm/allwinner/awin_otg.c: netbsd-7-nhusb
	sys/arch/arm/allwinner/awin_usb.c: netbsd-7-nhusb
	sys/arch/arm/amlogic/amlogic_dwctwo.c: netbsd-7-nhusb
	sys/arch/arm/at91/at91ohci.c: netbsd-7-nhusb
	sys/arch/arm/broadcom/bcm2835_dwctwo.c: netbsd-7-nhusb
	sys/arch/arm/broadcom/bcm53xx_usb.c: netbsd-7-nhusb
	sys/arch/arm/ep93xx/epohci.c: netbsd-7-nhusb
	sys/arch/arm/gemini/obio_ehci.c: netbsd-7-nhusb
	sys/arch/arm/imx/files.imx23: netbsd-7-nhusb
	sys/arch/arm/imx/imxusb.c: netbsd-7-nhusb
	sys/arch/arm/imx/imxusbreg.h: netbsd-7-nhusb
	sys/arch/arm/omap/obio_ohci.c: netbsd-7-nhusb
	sys/arch/arm/omap/omap3_ehci.c: netbsd-7-nhusb
	sys/arch/arm/omap/omapl1x_ohci.c: netbsd-7-nhusb
	sys/arch/arm/omap/tiotg.c: netbsd-7-nhusb
	sys/arch/arm/s3c2xx0/ohci_s3c24x0.c: netbsd-7-nhusb
	sys/arch/arm/samsung/exynos_usb.c: netbsd-7-nhusb
	sys/arch/arm/xscale/pxa2x0_ohci.c: netbsd-7-nhusb
	sys/arch/arm/zynq/zynq_usb.c: netbsd-7-nhusb
	sys/arch/hpcarm/dev/nbp_slhci.c: netbsd-7-nhusb
	sys/arch/hpcmips/dev/plumohci.c: netbsd-7-nhusb
	sys/arch/i386/conf/ALL: netbsd-7-nhusb
	sys/arch/i386/conf/GENERIC: netbsd-7-nhusb
	sys/arch/i386/pci/gcscehci.c: netbsd-7-nhusb
	sys/arch/luna68k/conf/GENERIC: netbsd-7-nhusb
	sys/arch/mips/adm5120/dev/ahci.c: netbsd-7-nhusb
	sys/arch/mips/adm5120/dev/ahcivar.h: netbsd-7-nhusb
	sys/arch/mips/alchemy/dev/ohci_aubus.c: netbsd-7-nhusb
	sys/arch/mips/atheros/dev/ehci_arbus.c: netbsd-7-nhusb
	sys/arch/mips/atheros/dev/ohci_arbus.c: netbsd-7-nhusb
	sys/arch/mips/conf/files.adm5120: netbsd-7-nhusb
	sys/arch/mips/ralink/ralink_ehci.c: netbsd-7-nhusb
	sys/arch/mips/ralink/ralink_ohci.c: netbsd-7-nhusb
	sys/arch/mips/rmi/rmixl_ehci.c: netbsd-7-nhusb
	sys/arch/mips/rmi/rmixl_ohci.c: netbsd-7-nhusb
	sys/arch/playstation2/dev/ohci_sbus.c: netbsd-7-nhusb
	sys/arch/powerpc/booke/dev/pq3ehci.c: netbsd-7-nhusb
	sys/arch/powerpc/ibm4xx/dev/dwctwo_plb.c: netbsd-7-nhusb
	sys/arch/x68k/dev/slhci_intio.c: netbsd-7-nhusb
	sys/conf/files: netbsd-7-nhusb
	sys/dev/cardbus/ehci_cardbus.c: netbsd-7-nhusb
	sys/dev/cardbus/ohci_cardbus.c: netbsd-7-nhusb
	sys/dev/cardbus/uhci_cardbus.c: netbsd-7-nhusb
	sys/dev/ic/sl811hs.c: netbsd-7-nhusb
	sys/dev/ic/sl811hsvar.h: netbsd-7-nhusb
	sys/dev/isa/slhci_isa.c: netbsd-7-nhusb
	sys/dev/marvell/ehci_mv.c: netbsd-7-nhusb
	sys/dev/pci/ehci_pci.c: netbsd-7-nhusb
	sys/dev/pci/ohci_pci.c: netbsd-7-nhusb
	sys/dev/pci/uhci_pci.c: netbsd-7-nhusb
	sys/dev/pci/xhci_pci.c: netbsd-7-nhusb
	sys/dev/pcmcia/slhci_pcmcia.c: netbsd-7-nhusb
	sys/dev/usb/Makefile.usbdevs: netbsd-7-nhusb
	sys/dev/usb/TODO: netbsd-7-nhusb
	sys/dev/usb/TODO.usbmp: netbsd-7-nhusb
	sys/dev/usb/aubtfwl.c: netbsd-7-nhusb
	sys/dev/usb/auvitek.c: netbsd-7-nhusb
	sys/dev/usb/auvitek_audio.c: netbsd-7-nhusb
	sys/dev/usb/auvitek_dtv.c: netbsd-7-nhusb
	sys/dev/usb/auvitek_i2c.c: netbsd-7-nhusb
	sys/dev/usb/auvitek_video.c: netbsd-7-nhusb
	sys/dev/usb/auvitekvar.h: netbsd-7-nhusb
	sys/dev/usb/ehci.c: netbsd-7-nhusb
	sys/dev/usb/ehcireg.h: netbsd-7-nhusb
	sys/dev/usb/ehcivar.h: netbsd-7-nhusb
	sys/dev/usb/emdtv.c: netbsd-7-nhusb
	sys/dev/usb/emdtv_dtv.c: netbsd-7-nhusb
	sys/dev/usb/emdtv_ir.c: netbsd-7-nhusb
	sys/dev/usb/emdtvvar.h: netbsd-7-nhusb
	sys/dev/usb/ezload.c: netbsd-7-nhusb
	sys/dev/usb/ezload.h: netbsd-7-nhusb
	sys/dev/usb/files.usb: netbsd-7-nhusb
	sys/dev/usb/hid.c: netbsd-7-nhusb
	sys/dev/usb/hid.h: netbsd-7-nhusb
	sys/dev/usb/if_athn_usb.c: netbsd-7-nhusb
	sys/dev/usb/if_athn_usb.h: netbsd-7-nhusb
	sys/dev/usb/if_atu.c: netbsd-7-nhusb
	sys/dev/usb/if_atureg.h: netbsd-7-nhusb
	sys/dev/usb/if_aue.c: netbsd-7-nhusb
	sys/dev/usb/if_auereg.h: netbsd-7-nhusb
	sys/dev/usb/if_axe.c: netbsd-7-nhusb
	sys/dev/usb/if_axen.c: netbsd-7-nhusb
	sys/dev/usb/if_axenreg.h: netbsd-7-nhusb
	sys/dev/usb/if_axereg.h: netbsd-7-nhusb
	sys/dev/usb/if_cdce.c: netbsd-7-nhusb
	sys/dev/usb/if_cdcereg.h: netbsd-7-nhusb
	sys/dev/usb/if_cue.c: netbsd-7-nhusb
	sys/dev/usb/if_cuereg.h: netbsd-7-nhusb
	sys/dev/usb/if_kue.c: netbsd-7-nhusb
	sys/dev/usb/if_kuereg.h: netbsd-7-nhusb
	sys/dev/usb/if_otus.c: netbsd-7-nhusb
	sys/dev/usb/if_otusvar.h: netbsd-7-nhusb
	sys/dev/usb/if_rum.c: netbsd-7-nhusb
	sys/dev/usb/if_rumreg.h: netbsd-7-nhusb
	sys/dev/usb/if_rumvar.h: netbsd-7-nhusb
	sys/dev/usb/if_run.c: netbsd-7-nhusb
	sys/dev/usb/if_runvar.h: netbsd-7-nhusb
	sys/dev/usb/if_smsc.c: netbsd-7-nhusb
	sys/dev/usb/if_smscreg.h: netbsd-7-nhusb
	sys/dev/usb/if_smscvar.h: netbsd-7-nhusb
	sys/dev/usb/if_udav.c: netbsd-7-nhusb
	sys/dev/usb/if_udavreg.h: netbsd-7-nhusb
	sys/dev/usb/if_upgt.c: netbsd-7-nhusb
	sys/dev/usb/if_upgtvar.h: netbsd-7-nhusb
	sys/dev/usb/if_upl.c: netbsd-7-nhusb
	sys/dev/usb/if_ural.c: netbsd-7-nhusb
	sys/dev/usb/if_uralreg.h: netbsd-7-nhusb
	sys/dev/usb/if_uralvar.h: netbsd-7-nhusb
	sys/dev/usb/if_url.c: netbsd-7-nhusb
	sys/dev/usb/if_urlreg.h: netbsd-7-nhusb
	sys/dev/usb/if_urndis.c: netbsd-7-nhusb
	sys/dev/usb/if_urndisreg.h: netbsd-7-nhusb
	sys/dev/usb/if_urtw.c: netbsd-7-nhusb
	sys/dev/usb/if_urtwn.c: netbsd-7-nhusb
	sys/dev/usb/if_urtwn_data.h: netbsd-7-nhusb
	sys/dev/usb/if_urtwnreg.h: netbsd-7-nhusb
	sys/dev/usb/if_urtwnvar.h: netbsd-7-nhusb
	sys/dev/usb/if_urtwreg.h: netbsd-7-nhusb
	sys/dev/usb/if_zyd.c: netbsd-7-nhusb
	sys/dev/usb/if_zydreg.h: netbsd-7-nhusb
	sys/dev/usb/irmce.c: netbsd-7-nhusb
	sys/dev/usb/moscom.c: netbsd-7-nhusb
	sys/dev/usb/motg.c: netbsd-7-nhusb
	sys/dev/usb/motgvar.h: netbsd-7-nhusb
	sys/dev/usb/ohci.c: netbsd-7-nhusb
	sys/dev/usb/ohcireg.h: netbsd-7-nhusb
	sys/dev/usb/ohcivar.h: netbsd-7-nhusb
	sys/dev/usb/pseye.c: netbsd-7-nhusb
	sys/dev/usb/slurm.c: netbsd-7-nhusb
	sys/dev/usb/stuirda.c: netbsd-7-nhusb
	sys/dev/usb/u3g.c: netbsd-7-nhusb
	sys/dev/usb/uark.c: netbsd-7-nhusb
	sys/dev/usb/uatp.c: netbsd-7-nhusb
	sys/dev/usb/uaudio.c: netbsd-7-nhusb
	sys/dev/usb/uberry.c: netbsd-7-nhusb
	sys/dev/usb/ubsa.c: netbsd-7-nhusb
	sys/dev/usb/ubsa_common.c: netbsd-7-nhusb
	sys/dev/usb/ubsavar.h: netbsd-7-nhusb
	sys/dev/usb/ubt.c: netbsd-7-nhusb
	sys/dev/usb/uchcom.c: netbsd-7-nhusb
	sys/dev/usb/ucom.c: netbsd-7-nhusb
	sys/dev/usb/ucomvar.h: netbsd-7-nhusb
	sys/dev/usb/ucycom.c: netbsd-7-nhusb
	sys/dev/usb/udl.c: netbsd-7-nhusb
	sys/dev/usb/udl.h: netbsd-7-nhusb
	sys/dev/usb/udsbr.c: netbsd-7-nhusb
	sys/dev/usb/udsir.c: netbsd-7-nhusb
	sys/dev/usb/uep.c: netbsd-7-nhusb
	sys/dev/usb/uftdi.c: netbsd-7-nhusb
	sys/dev/usb/uftdireg.h: netbsd-7-nhusb
	sys/dev/usb/ugen.c: netbsd-7-nhusb
	sys/dev/usb/ugensa.c: netbsd-7-nhusb
	sys/dev/usb/uhci.c: netbsd-7-nhusb
	sys/dev/usb/uhcireg.h: netbsd-7-nhusb
	sys/dev/usb/uhcivar.h: netbsd-7-nhusb
	sys/dev/usb/uhid.c: netbsd-7-nhusb
	sys/dev/usb/uhidev.c: netbsd-7-nhusb
	sys/dev/usb/uhidev.h: netbsd-7-nhusb
	sys/dev/usb/uhmodem.c: netbsd-7-nhusb
	sys/dev/usb/uhso.c: netbsd-7-nhusb
	sys/dev/usb/uhub.c: netbsd-7-nhusb
	sys/dev/usb/uipad.c: netbsd-7-nhusb
	sys/dev/usb/uipaq.c: netbsd-7-nhusb
	sys/dev/usb/uirda.c: netbsd-7-nhusb
	sys/dev/usb/uirdavar.h: netbsd-7-nhusb
	sys/dev/usb/ukbd.c: netbsd-7-nhusb
	sys/dev/usb/ukbdmap.c: netbsd-7-nhusb
	sys/dev/usb/ukyopon.c: netbsd-7-nhusb
	sys/dev/usb/ukyopon.h: netbsd-7-nhusb
	sys/dev/usb/ulpt.c: netbsd-7-nhusb
	sys/dev/usb/umass.c: netbsd-7-nhusb
	sys/dev/usb/umass_isdata.c: netbsd-7-nhusb
	sys/dev/usb/umass_isdata.h: netbsd-7-nhusb
	sys/dev/usb/umass_quirks.c: netbsd-7-nhusb
	sys/dev/usb/umass_quirks.h: netbsd-7-nhusb
	sys/dev/usb/umass_scsipi.c: netbsd-7-nhusb
	sys/dev/usb/umass_scsipi.h: netbsd-7-nhusb
	sys/dev/usb/umassvar.h: netbsd-7-nhusb
	sys/dev/usb/umcs.c: netbsd-7-nhusb
	sys/dev/usb/umct.c: netbsd-7-nhusb
	sys/dev/usb/umidi.c: netbsd-7-nhusb
	sys/dev/usb/umidi_quirks.c: netbsd-7-nhusb
	sys/dev/usb/umidi_quirks.h: netbsd-7-nhusb
	sys/dev/usb/umodem.c: netbsd-7-nhusb
	sys/dev/usb/umodem_common.c: netbsd-7-nhusb
	sys/dev/usb/umodemvar.h: netbsd-7-nhusb
	sys/dev/usb/ums.c: netbsd-7-nhusb
	sys/dev/usb/uplcom.c: netbsd-7-nhusb
	sys/dev/usb/urio.c: netbsd-7-nhusb
	sys/dev/usb/urio.h: netbsd-7-nhusb
	sys/dev/usb/usb.c: netbsd-7-nhusb
	sys/dev/usb/usb.h: netbsd-7-nhusb
	sys/dev/usb/usb_mem.c: netbsd-7-nhusb
	sys/dev/usb/usb_mem.h: netbsd-7-nhusb
	sys/dev/usb/usb_quirks.c: netbsd-7-nhusb
	sys/dev/usb/usb_quirks.h: netbsd-7-nhusb
	sys/dev/usb/usb_subr.c: netbsd-7-nhusb
	sys/dev/usb/usbdevices.config: netbsd-7-nhusb
	sys/dev/usb/usbdevs: netbsd-7-nhusb
	sys/dev/usb/usbdevs.h: netbsd-7-nhusb
	sys/dev/usb/usbdevs_data.h: netbsd-7-nhusb
	sys/dev/usb/usbdi.c: netbsd-7-nhusb
	sys/dev/usb/usbdi.h: netbsd-7-nhusb
	sys/dev/usb/usbdi_util.c: netbsd-7-nhusb
	sys/dev/usb/usbdi_util.h: netbsd-7-nhusb
	sys/dev/usb/usbdivar.h: netbsd-7-nhusb
	sys/dev/usb/usbhid.h: netbsd-7-nhusb
	sys/dev/usb/usbhist.h: netbsd-7-nhusb
	sys/dev/usb/usbroothub.c: netbsd-7-nhusb
	sys/dev/usb/usbroothub.h: netbsd-7-nhusb
	sys/dev/usb/usbroothub_subr.c: delete
	sys/dev/usb/usbroothub_subr.h: delete
	sys/dev/usb/uscanner.c: netbsd-7-nhusb
	sys/dev/usb/uslsa.c: netbsd-7-nhusb
	sys/dev/usb/usscanner.c: netbsd-7-nhusb
	sys/dev/usb/ustir.c: netbsd-7-nhusb
	sys/dev/usb/uthum.c: netbsd-7-nhusb
	sys/dev/usb/utoppy.c: netbsd-7-nhusb
	sys/dev/usb/uts.c: netbsd-7-nhusb
	sys/dev/usb/uvideo.c: netbsd-7-nhusb
	sys/dev/usb/uvisor.c: netbsd-7-nhusb
	sys/dev/usb/uvscom.c: netbsd-7-nhusb
	sys/dev/usb/uyap.c: netbsd-7-nhusb
	sys/dev/usb/uyap_firmware.h: netbsd-7-nhusb
	sys/dev/usb/uyurex.c: netbsd-7-nhusb
	sys/dev/usb/x1input_rdesc.h: netbsd-7-nhusb
	sys/dev/usb/xhci.c: netbsd-7-nhusb
	sys/dev/usb/xhcireg.h: netbsd-7-nhusb
	sys/dev/usb/xhcivar.h: netbsd-7-nhusb
	sys/dev/usb/xinput_rdesc.h: netbsd-7-nhusb
	sys/external/bsd/common/conf/files.linux: netbsd-7-nhusb
	sys/external/bsd/common/include/linux/err.h: netbsd-7-nhusb
	sys/external/bsd/common/include/linux/kernel.h: netbsd-7-nhusb
	sys/external/bsd/common/include/linux/workqueue.h: netbsd-7-nhusb
	sys/external/bsd/common/linux/linux_work.c: netbsd-7-nhusb
	sys/external/bsd/drm2/dist/drm/radeon/atombios_encoders.c: netbsd-7-nhusb
	sys/external/bsd/drm2/dist/drm/radeon/radeon_legacy_encoders.c: netbsd-7-nhusb
	sys/external/bsd/drm2/drm/files.drmkms: netbsd-7-nhusb
	sys/external/bsd/drm2/i915drm/files.i915drmkms: netbsd-7-nhusb
	sys/external/bsd/drm2/include/linux/err.h: delete
	sys/external/bsd/drm2/include/linux/workqueue.h: delete
	sys/external/bsd/drm2/linux/files.drmkms_linux: netbsd-7-nhusb
	sys/external/bsd/drm2/linux/linux_work.c: delete
	sys/external/bsd/dwc2/dwc2.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dwc2.h: netbsd-7-nhusb
	sys/external/bsd/dwc2/dwc2var.h: netbsd-7-nhusb
	sys/external/bsd/dwc2/dwctwo2netbsd: netbsd-7-nhusb
	sys/external/bsd/dwc2/conf/files.dwc2: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_core.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_core.h: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_coreintr.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcd.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcd.h: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcdddma.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcdintr.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hcdqueue.c: netbsd-7-nhusb
	sys/external/bsd/dwc2/dist/dwc2_hw.h: netbsd-7-nhusb
	sys/modules/drmkms_linux/Makefile: netbsd-7-nhusb
	sys/modules/i915drmkms/Makefile: netbsd-7-nhusb
	sys/rump/dev/lib/libugenhc/ugenhc.c: netbsd-7-nhusb
	sys/rump/dev/lib/libusb/Makefile: netbsd-7-nhusb
	sys/rump/dev/lib/libusb/USB.ioconf: netbsd-7-nhusb
	sys/rump/dev/lib/libusb/usb_at_ugenhc.c: delete
	sys/rump/dev/lib/libusb/opt/opt_usb.h: delete
	sys/rump/dev/lib/libusb/opt/opt_usbverbose.h: delete
	sys/sys/mbuf.h: netbsd-7-nhusb
	usr.sbin/usbdevs/usbdevs.8: netbsd-7-nhusb
	usr.sbin/usbdevs/usbdevs.c: netbsd-7-nhusb
Merge netbsd-7-nhusb:
- API / infrastructure changes to support memory management changes.
- Memory management improvements and bug fixes.
- HCDs should now be MP safe
- conversion to KERNHIST based debug
- FS/LS isoc support on ehci(4).
- conversion to kmem(9)
- Some USB 3 support - mostly from Takahiro HAYASHI (t-hash).
- interrupt transfers now get proper DMA operations
- general bug fixes
     - kern/48308
     - uhub status notification improvements
     - umass(4) probe fix (applied to HEAD already)
     - ohci(4) short transfer fix
- Change the SOFTINT level from NET to SERIAL for the USB softint handler.
  This gives the callback a chance of running when another softint handler
  at SOFTINT_NET has blocked holding a lock, e.g. softnet_lock and most of
  the network stack.
     - kern/49065 - ifconfig tun0 ... sequence locks up system / lockup:
       softnet_lock held across usb xfr
     - kern/50491 - unkillable wait in usbd_transfer while using usmsc0
       on raspberry pi 2
     - kern/51395 - USB Ethernet makes xhci hang
- Various improvements to slhci(4)
- Various improvements to dwc2(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.9 2016/12/09 05:10:45 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.8.4.2 $"
d1146 2
a1147 1
xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
d1165 1
a1165 1
usb*	at xhci?
@


1.1107.2.11
log
@Apply patch (requested by nonaka in ticket #1413):
iwm(4): Add a driver for Intel Wireless 726x, 316x, 826x and 416x series.
Ported from OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.10 2017/04/05 19:54:17 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.10 $"
a983 1
iwm*	at pci? dev ? function ?	# Intel Wireless 726x/316x/826x
@


1.1107.2.12
log
@Apply patch (requested by maxv in ticket #1463):
i386 GENERIC: disable VM86 by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.11 2017/07/25 19:43:03 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.11 $"
d30 1
a30 1
#options 	VM86		# virtual 8086 emulation
@


1.1107.2.13
log
@Apply patch (requested by maxv in ticket #1499):
- disable compat_svr4 and compat_svr4_32 everywhere
- disable compat_ibcs2 everywhere but on Vax
- remove svr4/svr4_32/ibcs2/freebsd from the module autoload list
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.12 2017/08/24 06:52:06 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.12 $"
d147 2
a148 2
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1107.2.8.4.1
log
@First pass at netbsd-7 updated with USB code from HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.8 2015/06/05 16:52:39 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.8 $"
d1138 2
a1139 1
xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
d1157 1
a1157 1
usb*	at xhci?
@


1.1107.2.8.4.2
log
@Sync with netbsd-5
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107.2.8.4.1 2016/09/06 20:33:06 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107.2.8.4.1 $"
a708 8
#sdtemp* at iic? addr 0x18
#sdtemp* at iic? addr 0x19
#sdtemp* at iic? addr 0x1a
#sdtemp* at iic? addr 0x1b
#sdtemp* at iic? addr 0x1c
#sdtemp* at iic? addr 0x1d
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
@


1.1106
log
@Comment out the xhci entries.
The driver really doesn't work well enough to be generally useful.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1105 2014/06/10 01:42:39 hikaru Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1105 $"
d110 1
a110 1
options 	DIAGNOSTIC	# expensive kernel consistency checks
@


1.1105
log
@Add VMware VMXNET3 ethernet driver from OpenBSD, vmx(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1104 2014/05/29 14:48:40 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1104 $"
d1126 2
a1127 1
xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
d1145 1
a1145 1
usb*	at xhci?
@


1.1104
log
@enable IPSEC
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1103 2014/04/21 16:35:38 chs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1103 $"
d995 1
@


1.1103
log
@add malo at pcmcia.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1102 2014/04/08 19:40:57 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1102 $"
d202 1
a202 1
#options 	IPSEC		# IP security
@


1.1102
log
@add ixg
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1101 2014/03/24 14:15:38 szptvlfn Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1101 $"
d1020 1
@


1.1101
log
@fix manual section numbering of sysctl.
  thanks wiz@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1100 2014/03/19 15:26:42 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1100 $"
d965 1
@


1.1101.2.1
log
@Rebase.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1107 2014/07/25 15:01:14 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1107 $"
d110 1
a110 1
options 	DIAGNOSTIC	# inexpensive kernel consistency checks
d202 1
a202 1
options 	IPSEC		# IP security
a964 1
ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
a993 1
vmx*	at pci? dev ? function ?	# VMware VMXNET3
a1018 1
malo*	at pcmcia? function ?		# Marvell Libertas
d1123 1
a1123 2
# xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
					# xhci is at best experimental
d1141 1
a1141 1
# usb*	at xhci?
@


1.1100
log
@Add a driver for Realtek RTS5209/RTS5229 Card Reader.
Ported from OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1099 2014/01/26 19:16:16 dsl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1099 $"
d116 1
a116 1
#options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
@


1.1099
log
@Remove support for 'external' floating point units and the MS-DOS
  compatible method of handling floating point exceptions.
Make kernel support for teh fpu non-optional (486SX should still work).
Only 386 cpus support external fpu, and i386 support was removed years ago.
This means that the npx code no longer uses port 0xf0 or interupt 13.
All the "npx at isa" lines go from the configs, arch/i386/isa/npx.c
  is now mandatory for all i386 kernels.
I've renamed npxinit() to fpuinit() and npxinit_cpu() to fpuinit_cpu()
  to match the very similar amd64 functions.
The fpu of the boot cpu is now initialised by a direct call from
  cpu_configure(), this enables FP emulation for a 486SX.
  (for amd64 the cr0 values are set in locore.S and similar).
This fixes a long-standing bug in linux_setregs() - which did not
  save the fpu regsiters if they were active.
I've test booted a single cpu i386 kernel (using anita).
amd64 builds - none of teh changes should affect it.
The i386 XEN kernels build, but I'm not sure where they set cr0, and
  it might have got lost!
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1098 2013/10/26 09:16:20 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1098 $"
d1343 1
d1349 1
@


1.1098
log
@Add driver for ASIX AX88178a and AX88179 Ethernet interface.
Ported from OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1097 2013/10/23 17:26:08 matt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1097 $"
a366 1
npx*		at acpi?		# Math coprocessor
a410 1
#npx*		at pnpbios? index ?	# Math coprocessor
a525 6
# Coprocessor Support

# Math Coprocessor support
npx0	at isa? port 0xf0 irq 13	# x86 math coprocessor


@


1.1097
log
@Add xhci device
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1096 2013/06/30 21:38:57 rmind Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1096 $"
d1236 1
@


1.1096
log
@G/C PFIL_HOOKS from the kernel configs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1095 2013/06/10 07:14:01 kardel Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1095 $"
d1131 1
d1149 1
@


1.1095
log
@adjust soekrisgpio driver to NetBSD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1094 2013/06/05 23:08:01 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1094 $"
a210 1
options 	PFIL_HOOKS	# pfil(9) packet filter hooks
@


1.1095.2.1
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d211 1
@


1.1095.2.2
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1095.2.1 2013/08/28 23:59:17 rmind Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1095.2.1 $"
d116 1
a116 1
#options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'
d367 1
d412 1
d528 6
a972 1
ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
a1026 1
malo*	at pcmcia? function ?		# Marvell Libertas
a1130 1
xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
a1147 1
usb*	at xhci?
a1233 1
axen*	at uhub? port ?		# ASIX AX88178a/AX88179 based adapters
a1347 1
rtsx*	at pci?				# Realtek RTS5209/RTS5229 Card Reader
a1352 1
sdmmc*	at rtsx?			# SD/MMC bus
@


1.1094
log
@remove obsolete networking options
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1093 2013/05/28 12:13:55 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1093 $"
d735 3
@


1.1093
log
@Add udsir.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1092 2013/04/27 22:21:14 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1092 $"
a202 1
#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
@


1.1092
log
@more bogus number removal
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1091 2013/04/27 21:43:29 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1091 $"
d1222 4
@


1.1091
log
@the bogus number police
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1090 2013/04/27 18:19:38 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1090 $"
d1642 1
a1642 1
pseudo-device	sequencer	1	# MIDI sequencer
@


1.1090
log
@remove confusing numeric locators where they are unused.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1089 2013/04/06 16:59:59 martin Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1089 $"
d1585 1
a1585 1
pseudo-device	raid		8	# RAIDframe disk driver
d1653 1
a1653 1
pseudo-device	vcoda		4	# coda minicache <-> venus comm.
@


1.1089
log
@Add athn
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1088 2013/03/02 02:42:15 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1088 $"
d1583 2
a1584 2
pseudo-device	ccd		4	# concatenated/striped disk devices
pseudo-device	cgd		4	# cryptographic disk devices
@


1.1088
log
@Under FAST_IPSEC, IPSEC_ESP is mandatory; GC it.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1087 2013/03/01 18:25:44 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1087 $"
d952 1
d1071 1
d1237 1
@


1.1087
log
@Retire OSI network stack. OK core@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1086 2012/12/25 10:51:03 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1086 $"
a202 1
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
@


1.1086
log
@Whitespace fixes.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1085 2012/12/17 20:38:00 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1085 $"
a208 2
#options 	ISO,TPIP	# OSI
#options 	EON		# OSI tunneling over IP
@


1.1085
log
@Adding ibmcd(4), a device driver for the IBM 4810 BSP cash drawer port as
found e.g. in SurePOS 300 series point of sale terminals.  The driver
provides a gpio(4) device with three pins:  pin 0 to open drawer, pin 1
to read the status and pin 2 to read whether a cash drawer is connected or
not.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1084 2012/12/10 02:03:45 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1084 $"
d1533 2
a1534 2
#tpm*  at isa? port 0x04e 
#tpm*  at isa? port 0x07e 
@


1.1084
log
@whitespace
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1083 2012/12/05 16:19:46 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1083 $"
d480 3
@


1.1083
log
@Intel Atom E600 PCI-LPC bridge, adds a watchdog + HPET support. Tested
on a Soekris net6501. (jmcneill)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1082 2012/10/17 14:48:13 apb Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1082 $"
d975 1
a975 1
malo*   at pci? dev ? function ?    # Marvell Libertas Wireless
@


1.1082
log
@Add "options COMPAT_60" to all kernel configuration files
that already had "options COMPAT_50".
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1081 2012/09/30 21:36:18 dsl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1081 $"
d460 2
d491 1
@


1.1081
log
@Remove code from dev/apm/apm.c for setting global variables to parameterise
  the i386 bios apm code (now removed).
Remove the same code from the clone dev/hpc/apm/apmdev.c
Remove some not-used options from dev/apm/files.apm and the commented out
  lines in ALL and GENERIC.
Maybe the APM_V10_ONLY and APM_NO_V12 could also be shot, but they are
  further entwined in the code.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1080 2012/09/23 01:05:21 chs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1080 $"
d140 1
@


1.1080
log
@add vmt entry to GENERIC.
standardize commented pfsync and npf entries.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1079 2012/09/01 18:17:50 jakllsch Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1079 $"
a314 1
#options 	APM_NO_IDLE		# Don't call BIOS CPU idle function
@


1.1079
log
@Rename RT2500USB driver to ural(4) as it was originally in OpenBSD,
as ural(4) and ral(4) do not actually share any code.

Enable ural(4) in hpcarm WZERO3 kernel too, as it will now build.

Fixes PR#43520.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1078 2012/08/10 11:32:32 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1078 $"
d42 1
d1565 1
a1598 3
# NPF
#pseudo-device	npf

d1623 2
@


1.1079.2.1
log
@Resync to 2012-11-19 00:00:00 UTC
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1082 2012/10/17 14:48:13 apb Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1082 $"
a41 1
vmt0		at cpu0		# VMware Tools
a138 1
options 	COMPAT_60	# NetBSD 6.0 compatibility.
d314 1
a1563 1

d1597 3
a1623 2
#pseudo-device	pfsync			# PF sync if
#pseudo-device	npf			# NPF packet filter
@


1.1079.2.2
log
@resync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1079.2.1 2012/11/20 03:01:25 tls Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1079.2.1 $"
a459 2
tcpcib* at pci? dev ? function ?	# Intel Atom E6xx PCI-LPC
hpet* at tcpcib?
a477 3
#ibmcd*	at pci ? dev ? function ?	# IBM 4810 BSP cash drawer port
#gpio*	at ibmcd?

a488 1
isa0	at tcpcib?
d972 1
a972 1
malo*	at pci? dev ? function ?	# Marvell Libertas Wireless
d1527 2
a1528 2
#tpm*  at isa? port 0x04e
#tpm*  at isa? port 0x07e
@


1.1079.2.3
log
@resync from head
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d203 2
d209 2
a738 3
# Soekris 6501 GPIO/LED driver (provides gpiobus, needs gpio)
#soekrisgpio0	at isa? port 0x680

a954 1
athn*	at pci? dev ? function ?	# Atheros AR9k (802.11a/g/n)
a1072 1
athn*	at cardbus? function ?	# Atheros AR9k (802.11a/g/n) - UNTESTED
a1222 4
# KingSun/DonShine USB/IrDA Bridge
udsir*	at uhub? port ?
irframe* at udsir?

a1237 1
athn*	at uhub? port ?		# Atheros AR9002U
d1583 3
a1585 3
pseudo-device	ccd			# concatenated/striped disk devices
pseudo-device	cgd			# cryptographic disk devices
pseudo-device	raid			# RAIDframe disk driver
d1642 1
a1642 1
pseudo-device	sequencer		# MIDI sequencer
d1653 1
a1653 1
pseudo-device	vcoda			# coda minicache <-> venus comm.
@


1.1079.2.4
log
@Rebase to HEAD as of a few days ago.
@
text
@d110 1
a110 1
options 	DIAGNOSTIC	# inexpensive kernel consistency checks
d116 1
a116 1
#options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'
d202 1
a202 1
options 	IPSEC		# IP security
d211 1
d368 1
d413 1
d529 6
a973 1
ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
a1002 1
vmx*	at pci? dev ? function ?	# VMware VMXNET3
a1027 1
malo*	at pcmcia? function ?		# Marvell Libertas
a1131 2
# xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
					# xhci is at best experimental
a1148 1
# usb*	at xhci?
a1234 1
axen*	at uhub? port ?		# ASIX AX88178a/AX88179 based adapters
a1348 1
rtsx*	at pci?				# Realtek RTS5209/RTS5229 Card Reader
a1353 1
sdmmc*	at rtsx?			# SD/MMC bus
@


1.1079.2.5
log
@update from HEAD
@
text
@d25 1
a25 1
#ident		"GENERIC-$Revision$"
d30 1
d45 2
a46 1
options 	PMC		# performance-monitoring counters support
a91 1
options 	MODULAR_DEFAULT_AUTOLOAD
d114 1
a124 1
options 	KDTRACE_HOOKS	# kernel DTrace hooks
d127 15
a141 1
include 	"conf/compat_netbsd09.config"
d143 1
d146 2
d149 1
a149 1
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
d151 1
d156 1
d159 1
a159 2
options 	DKWEDGE_METHOD_APPLE	# Support Apple partitions as wedges
#options 	DKWEDGE_METHOD_RDB	# Support RDB partitions as wedges
a188 1
#options 	DISKLABEL_EI	# disklabel Endian Independent support
a193 1
options 	UFS_EXTATTR	# Extended attribute support for UFS1
d204 1
a204 1
#options 	MPLS		# MultiProtocol Label Switching (needs mpls)
a207 1
#options 	CAN		# Controller Area Network protocol
a242 1
#options 	HDAUDIOVERBOSE	# verbose HDAUDIO driver messages
d360 1
a360 1
#hpacel* 	at acpi?		# HP 3D DriveGuard accelerometer
a368 2
qemufwcfg*	at acpi?		# QEMU Firmware Configuration device
sdhc*		at acpi?		# SD Host Controller
a373 1
valz*		at acpi?		# Toshiba Dynabook hotkeys
d450 1
a450 1
					# watchdog, gpio, SpeedStep and HPET
a452 1
tco*	at ichlpcib?		# TCO watchdog timer
a463 1
options 	AGP_X86
d535 1
a535 3
options 	PMS_ALPS_TOUCHPAD	# Enable support for Alps Touchpads
# vga@@isa and pcdisplay@@isa are disabled; see PR#49290
#vga0		at isa?
d537 1
a537 1
#pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
d542 1
a542 1
#wsdisplay*	at pcdisplay? console ?
d556 10
a565 23
# DRI legacy drivers
#i915drm*	at drm?		# Intel i915, i945 DRM driver
#mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
#mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
#r128drm*	at drm?		# ATI Rage 128 DRM driver
#radeondrm*	at drm?		# ATI Radeon DRM driver
#savagedrm*	at drm?		# S3 Savage DRM driver
#sisdrm* 	at drm?		# SiS DRM driver
#tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
#viadrm* 	at drm?		# VIA DRM driver

# DRMKMS drivers
i915drmkms*	at pci? dev ? function ?
intelfb*	at intelfbbus?

radeon* 	at pci? dev ? function ?
radeondrmkmsfb* at radeonfbbus?

nouveau*	at pci? dev ? function ?
nouveaufb*	at nouveaufbbus?

# DRMUMS drivers
#viadrmums*	at drm?
a636 4
# Intel S1200,C2000 (non-pch) SMBus controller
ismt* at pci? dev ? function ?
iic*	at ismt?

a696 8
#sdtemp* at iic? addr 0x18
#sdtemp* at iic? addr 0x19
#sdtemp* at iic? addr 0x1a
#sdtemp* at iic? addr 0x1b
#sdtemp* at iic? addr 0x1c
#sdtemp* at iic? addr 0x1d
#sdtemp* at iic? addr 0x1e
#sdtemp* at iic? addr 0x1f
a804 3
# NVM Express controllers and devices
nvme*	at pci? dev ? function ?
ld*	at nvme? nsid ?
a963 1
iwm*	at pci? dev ? function ?	# Intel Wireless WiFi Link 7xxx
a982 1
rtwn*	at pci? dev ? function ?	# Realtek 8188CE/8192CE 802.11b/g/n
d1126 1
a1126 1
xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
d1145 1
a1145 1
usb*	at xhci?
a1242 1
bwfm*	at uhub? port ?		# Broadcom FullMAC
d1244 1
a1247 1
ural*	at uhub? port ?		# Ralink Technology RT2500USB 802.11a/b/g
d1298 1
a1298 1
#uscanner* at uhub? port ?
d1317 1
a1317 1
umodeswitch* at uhub? port ?
a1324 3
# Araneus Alea I/II TRNG
#ualea* at uhub? port ? configuration ? interface ?

d1431 1
a1431 2
#spkr*	at pcppi?		# PC speaker
#spkr*	at audio?		# PC speaker (synthesized)
d1537 5
a1541 5
tpm*	at isa? iomem 0xfed40000 irq 7
#tpm*	at isa? port 0x02e
#tpm*	at isa? port 0x04e
#tpm*	at isa? port 0x07e
#tpm*	at isa? port 0x0ee
d1572 4
a1575 6
virtio* at pci? dev ? function ?	# Virtio PCI device
viomb* at virtio?			# Virtio memory balloon device
ld* at virtio?				# Virtio disk device
vioif* at virtio?			# Virtio network device
viornd* at virtio?			# Virtio entropy device
vioscsi* at virtio?			# Virtio SCSI device
d1584 1
a1584 1
pseudo-device	crypto			# /dev/crypto device
d1616 1
a1616 1
#pseudo-device	mpls			# MPLS pseudo-interface
d1637 1
a1637 1
#pseudo-device	etherip 		# Tunnel Ethernet over IP
a1640 2
#pseudo-device	canloop			# CAN loopback interface

a1674 1
					# and PAX_SEGVGUARD
d1683 1
d1687 2
d1690 2
a1691 5
options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard
options 	PAX_MPROTECT=1		# PaX mprotect(2) restrictions
options 	PAX_MPROTECT_DEBUG=1	# PaX mprotect debug
options 	PAX_ASLR=1		# PaX Address Space Layout Randomization
@


1.1078
log
@Add uts(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1077 2012/08/01 04:20:05 matt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1077 $"
d1233 1
a1233 1
ral*	at uhub? port ?		# Ralink Technology RT25x0 802.11a/b/g
@


1.1077
log
@Enable FFS_EI (let's be more endian tolerant).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1076 2012/07/30 19:40:52 degroote Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1076 $"
d1158 4
@


1.1076
log
@Add malo(4) entry in various kernel configuration
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1075 2012/06/14 04:23:49 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1075 $"
d187 1
a187 1
#options 	FFS_EI		# FFS Endian Independent support
@


1.1075
log
@Add urtw(4) to i386/amd64 GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1074 2012/06/05 08:44:12 abs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1074 $"
d971 1
@


1.1074
log
@Adjust the WSDISPLAY_COMPAT_USL comment to mention wsconscfg, to at least
give a hint that its not just for third party compat. No functional change.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1073 2012/05/30 14:30:34 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1073 $"
d1232 1
@


1.1073
log
@Add a driver for Ralink Technology RT2700U/RT2800U/RT3000U USB IEEE
802.11a/b/g/n wireless network devices, ported from OpenBSD by FUKAUMI Naoki,
arranged by me.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1072 2012/04/19 17:50:51 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1072 $"
d271 1
a271 1
options 	WSDISPLAY_COMPAT_USL		# VT handling
@


1.1072
log
@Add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing Interface II
SAS controllers. Ported from OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1071 2012/04/13 13:11:16 cegger Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1071 $"
d1230 1
@


1.1071
log
@Replace amdtempbus with amdnb_miscbus.
This allows us to have independent drivers on the same device (northbridge f3)
each coming with a certain functionality/feature.
This way we do not need to mess with amdtemp(4) to utilize other features.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1070 2012/04/08 20:49:29 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1070 $"
d745 2
a746 1
mpt*	at pci? dev ? function ?	# LSI Fusion SCSI/FC
@


1.1070
log
@PR/46310: Ryo ONODERA: Add support for cardbus bwi(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1069 2012/04/07 05:40:41 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1069 $"
d449 2
a450 1
amdtemp* at pchb?			# AMD CPU Temperature sensors
@


1.1069
log
@add apple autodiscovery
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1068 2012/03/25 00:11:16 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1068 $"
d1064 1
@


1.1068
log
@Added urtwn(4), a driver for Realtek RTL8188CU/RTL8192CU USB IEEE 802.11b/g/n wireless network devices.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1067 2012/03/10 21:51:53 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1067 $"
d154 1
a154 1
# The following two options can break /etc/fstab, so handle with care
d157 1
@


1.1067
log
@P1003_1B_SEMAPHORE is no longer optional.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066 2012/01/22 06:44:29 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066 $"
d1227 1
@


1.1066
log
@add a tpm driver from bsssd.sourceforge.net
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1065 2012/01/16 14:43:09 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1065 $"
a88 1
options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
@


1.1066.2.1
log
@Pull up following revision(s) (requested by bouyer in ticket #193):
	sys/arch/i386/conf/GENERIC: revision 1.1072
	sys/dev/pci/mpii.c: revision 1.1
	sys/arch/i386/conf/XEN3_DOM0: revision 1.66
	sys/dev/pci/files.pci: revision 1.357
	share/man/man4/Makefile: revision 1.584
	distrib/sets/lists/man/mi: revision 1.1387
	share/man/man4/mpii.4: revision 1.1
	sys/arch/amd64/conf/GENERIC: revision 1.354
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.83
	sys/arch/i386/conf/ALL: revision 1.337
Add mpii(4), a driver for LSI Logic Fusion-MPT Message Passing Interface II
SAS controllers. Ported from OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d744 1
a744 2
mpt*	at pci? dev ? function ?	# LSILogic 9x9 and 53c1030 (Fusion-MPT)
mpii*	at pci? dev ? function ?	# LSI Logic Fusion-MPT II
@


1.1066.2.2
log
@Pull up following revision(s) (requested by abs in ticket #311):
	sys/arch/netwinder/conf/GENERIC: revision 1.112
	sys/arch/i386/conf/GENERIC: revision 1.1074
	sys/arch/atari/conf/MILAN.in: revision 1.26
	sys/arch/zaurus/conf/GENERIC: revision 1.54
	sys/arch/shark/conf/GENERIC: revision 1.101
	sys/arch/hpcmips/conf/MPC303: revision 1.60
	sys/arch/i386/conf/XEN3_DOM0: revision 1.67
	sys/arch/evbarm/conf/MPCSA_GENERIC: revision 1.29
	sys/arch/vax/conf/GENERIC: revision 1.181
	sys/arch/sparc/conf/KRUPS: revision 1.59
	sys/arch/evbarm/conf/BEAGLEBOARD: revision 1.27
	sys/arch/i386/conf/INSTALL_FLOPPY: revision 1.16
	sys/arch/prep/conf/GENERIC: revision 1.163
	sys/arch/hpcmips/conf/GENERIC: revision 1.216
	sys/arch/sparc/conf/TADPOLE3GX: revision 1.56
	sys/arch/shark/conf/INSTALL: revision 1.50
	sys/arch/next68k/conf/GENERIC: revision 1.127
	sys/arch/evbppc/conf/VIRTEX_GSRD2: revision 1.16
	sys/arch/evbppc/conf/VIRTEX_DFC: revision 1.17
	sys/arch/evbppc/conf/EXPLORA451: revision 1.48
	sys/arch/bebox/conf/INSTALL: revision 1.54
	sys/arch/next68k/conf/SLAB: revision 1.46
	sys/arch/i386/conf/GENERIC_TINY: revision 1.132
	sys/arch/bebox/conf/GENERIC: revision 1.131
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.84
	sys/arch/amd64/conf/GENERIC: revision 1.356
	sys/arch/evbarm/conf/MMNET_GENERIC: revision 1.6
	share/man/man4/wscons.4: revision 1.31
	sys/arch/hpcmips/conf/TX3912: revision 1.79
	sys/arch/evbarm/conf/ARMADILLO9: revision 1.35
	sys/arch/hpcsh/conf/GENERIC: revision 1.97
	sys/arch/i386/conf/ALL: revision 1.339
	sys/arch/hpcmips/conf/TX3922: revision 1.93
	sys/arch/cats/conf/INSTALL: revision 1.82
	sys/arch/sparc64/conf/GENERIC: revision 1.151
	sys/arch/i386/conf/INSTALL_TINY: revision 1.135
	sys/arch/evbppc/conf/VIRTEX_GSRD1: revision 1.15
	sys/arch/evbarm/conf/TS7200: revision 1.49
	sys/arch/hpcmips/conf/VR41XX: revision 1.55
	sys/arch/hp700/conf/GENERIC: revision 1.115
	sys/arch/cats/conf/GENERIC: revision 1.140
Mention wsconscfg(8) needs WSDISPLAY_COMPAT_USL
If a port is going to have wscons for virtual terminals then it really make=
s
sense to enable WSDISPLAY_COMPAT_USL so the system can switch between the
virtual terminals...
Adjust the WSDISPLAY_COMPAT_USL comment to mention wsconscfg, to at least
give a hint that its not just for third party compat. No functional change.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.1 2012/04/23 16:31:35 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.1 $"
d271 1
a271 1
options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
a1228 1
urtwn*	at uhub? port ?		# Realtek RTL8188CU/RTL8192CU 802.11b/g/n
@


1.1066.2.3
log
@Remove test changes which accidentally snuck in on the netbsd-6 branch.
Oops.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d1229 1
@


1.1066.2.4
log
@Pull up the following revisions(s) (requested by riz in ticket #326):
	distrib/sets/lists/base/mi:		1.989
	distrib/sets/lists/man/mi:		1.1385
	etc/mtree/NetBSD.dist.base:		1.99
	share/man/man4/Makefile:		1.583
	share/man/man4/urtwn.4:			1.1
	share/man/man4/usb.4:			1.97
	sys/arch/amd64/conf/GENERIC:		1.351
	sys/arch/i386/conf/GENERIC:		1.1068
	sys/dev/usb/files.usb:			1.121
	sys/dev/usb/if_urtwn.c:			1.1-1.4
	sys/dev/usb/if_urtwn_data.h:		1.1
	sys/dev/usb/if_urtwnreg.h:		1.1
	sys/dev/usb/if_urtwnvar.h:		1.1
	sys/dev/usb/usbdevices.config:		1.13
	sys/dev/usb/usbdevs:			1.621 via patch
	sys/dev/usb/usbdevs.h:			regen
	sys/dev/usb/usbdevs_data.h:		regen
	sys/modules/if_urtwn/Makefile:		1.1
	sys/modules/if_urtwn/if_urtwn.ioconf:	1.1

Add support for urtwn(4) wireless. Ported from OpenBSD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.1 2012/04/23 16:31:35 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.3 $"
a1228 1
urtwn*	at uhub? port ?		# Realtek RTL8188CU/RTL8192CU 802.11b/g/n
@


1.1066.2.5
log
@Pull up the following revisions(s) (requested by riz in ticket #343):
	sys/dev/usb/files.usb:		revision 1.122
	sys/dev/usb/if_urtw.c:		revision 1.1
	sys/dev/usb/if_urtwreg.h:	revision 1.1
	share/man/man4/Makefile:	revision 1.586
	share/man/man4/urtw.4:		revision 1.1
	distrib/sets/lists/man/mi:	revision 1.1393
	sys/dev/usb/usbdevs:		revision 1.617
	sys/arch/i386/conf/GENERIC:	revision 1.357
	sys/arch/amd64/conf/GENERIC:	revision 1.1075 via patch

Add urtw(4) driver for Realtek RTL8187/RTL8187B 802.11b/g USB wireless
adapter. From OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.4 2012/06/14 09:48:46 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.4 $"
a1228 1
urtw*	at uhub? port ?		# Realtek RTL8187/RTL8187B 802.11b/g
@


1.1066.2.6
log
@Pull up following revision(s) (requested by sborrill in ticket #474):
	sys/arch/i386/conf/GENERIC: revision 1.1078
Add uts(4)
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a1154 4
# USB generic touchscreen
uts*	at uhidev? reportid ?
wsmouse* at uts? mux 0

@


1.1066.2.7
log
@Pull up the following revisions(s) (requested by martin in ticket #502):
	sys/arch/cobalt/conf/GENERIC:		patch
	sys/arch/i386/conf/GENERIC:		patch
	sys/arch/i386/conf/XEN3_DOM0:		patch
	sys/arch/i386/conf/XEN3_DOMU:		patch
	sys/arch/mvmeppc/conf/GENERIC:		patch
	sys/arch/shark/conf/GENERIC:		patch
	sys/arch/sparc64/conf/GENERIC:		patch
	sys/arch/sparc64/conf/GENERIC.DEBUG:	patch
	sys/arch/zaurus/conf/GENERIC:		patch

Switch off DIAGNOSTIC and/or DEBUG on release kernels.
Enable DIAGNOSTIC in DEBUG kernels to allow for option
being switched off in GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.6 2012/08/12 18:41:35 martin Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.6 $"
d110 1
a110 1
#options 	DIAGNOSTIC	# expensive kernel consistency checks
@


1.1066.2.8
log
@Apply patch (requested by maxv in ticket #1466):
Disable vm86 by default. The use case is limited, and the potential
for damage is too high.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.7 2012/08/15 15:33:00 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.7 $"
d30 1
a30 1
#options 	VM86		# virtual 8086 emulation
@


1.1066.2.9
log
@Apply patch requested by maxv in ticket #1500:

 * disable compat_svr4 and compat_svr4_32 everywhere
 * disable compat_ibcs2 everywhere but on Vax
 * remove the svr4/svr4_32/ibcs2/freebsd entries from the autoload list
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.8 2017/08/26 16:26:46 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.8 $"
d145 2
a146 2
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1066.2.7.6.1
log
@Apply patch (requested by maxv in ticket #1466):
Disable vm86 by default. The use case is limited, and the potential
for damage is too high.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.7 2012/08/15 15:33:00 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.7 $"
d30 1
a30 1
#options 	VM86		# virtual 8086 emulation
@


1.1066.2.7.6.2
log
@Apply patch requested by maxv in ticket #1500:

 * disable compat_svr4 and compat_svr4_32 everywhere
 * disable compat_ibcs2 everywhere but on Vax
 * remove the svr4/svr4_32/ibcs2/freebsd entries from the autoload list
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.7.6.1 2017/08/26 16:26:29 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.7.6.1 $"
d145 2
a146 2
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1066.2.7.4.1
log
@Apply patch (requested by maxv in ticket #1466):
Disable vm86 by default. The use case is limited, and the potential
for damage is too high.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.7 2012/08/15 15:33:00 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.7 $"
d30 1
a30 1
#options 	VM86		# virtual 8086 emulation
@


1.1066.2.7.4.2
log
@Apply patch requested by maxv in ticket #1500:

 * disable compat_svr4 and compat_svr4_32 everywhere
 * disable compat_ibcs2 everywhere but on Vax
 * remove the svr4/svr4_32/ibcs2/freebsd entries from the autoload list
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066.2.7.4.1 2017/08/26 16:26:06 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066.2.7.4.1 $"
d145 2
a146 2
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.1065
log
@add cir@@emdtv
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1064 2012/01/15 15:05:06 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1064 $"
d376 1
d1512 6
@


1.1064
log
@add & enable digital tv capture support
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1063 2012/01/14 12:14:28 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1063 $"
d1438 1
@


1.1063
log
@Use "options<SPC><TAB>CPU_UCODE" to keep the indentation if the option
is commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1062 2012/01/13 16:05:14 cegger Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1062 $"
d1434 9
a1442 3
pseye*	at uhub?		# Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub?		# USB Video Class capture devices
video* at videobus?
a1450 3
# Conexant CX2388[0-3]-based DTV cards
#cxdtv*	at pci? dev ? function ?
#iic*	at cxdtv?
@


1.1062
log
@Support CPU microcode loading via cpuctl(8).
Implemented and enabled via CPU_UCODE kernel config option
for x86 and Xen Dom0.
Tested on different AMD machines with different
CPU families.

ok wiz@@ for the manpages
ok releng@@
ok core@@ via releng@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1061 2011/12/31 00:11:21 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1061 $"
d83 1
a83 1
options		CPU_UCODE	# cpu ucode loading support
@


1.1061
log
@add uipad
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1060 2011/12/18 05:49:28 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1060 $"
d83 2
@


1.1060
log
@WABPL is no longer considered experimental (has not been for some time)
so update its comment in config files.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1059 2011/12/18 02:31:51 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1059 $"
d1258 3
@


1.1059
log
@adjust English usage in comment
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1058 2011/11/22 21:25:19 tls Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1058 $"
d186 1
a186 1
options 	WAPBL		# File system journaling support - Experimental
@


1.1058
log
@
The rnd pseudo-device is not really optional, because it is in the same
source file as the entropy-pool code itself.  Move it to std.  This
will be cleaned up more when I split the sources up as they should be.

This fixes build breaks on several ports.  Thanks to Havard Eidnes for
pointing them out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1057 2011/11/13 12:47:54 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1057 $"
d83 1
a83 1
# Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
@


1.1058.2.1
log
@merge to -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1066 2012/01/22 06:44:29 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1066 $"
d83 1
a83 3
options 	CPU_UCODE	# cpu ucode loading support

# Note: SysV IPC parameters can be changed dynamically; see sysctl(8).
d186 1
a186 1
options 	WAPBL		# File system journaling support
a373 1
#tpm*		at acpi?		# ACPI TPM (Experimental)
a1257 3
# Apple iPad
uipad* at uhub? port ?

d1429 3
a1431 10
auvitek* at uhub?			# Auvitek AU0828 USB TV
coram*	at pci? dev ? function ?	# Conexant CX23885 PCI-E TV
cxdtv*	at pci? dev ? function ?	# Conexant CX2388[0-3] PCI TV
emdtv*	at uhub?			# Empia EM28xx USB TV
cir*	at emdtv?
pseye*	at uhub?			# Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub?			# USB Video Class capture devices

video*	at videobus?			# Analog capture interface
dtv*	at dtvbus?			# Digital capture interface
d1440 3
a1501 6
# Trusted Platform Module
tpm*   at isa? iomem 0xfed40000 irq 7
#tpm*  at isa? port 0x02e
#tpm*  at isa? port 0x04e 
#tpm*  at isa? port 0x07e 
#tpm*  at isa? port 0x0ee
@


1.1058.2.2
log
@sync to latest -current
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d89 1
@


1.1058.2.3
log
@sync to latest -current.
@
text
@a1226 1
urtwn*	at uhub? port ?		# Realtek RTL8188CU/RTL8192CU 802.11b/g/n
@


1.1058.2.4
log
@sync to latest -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1058.2.3 2012/04/05 21:33:15 mrg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1058.2.3 $"
d154 1
a154 1
# The following three options can break /etc/fstab, so handle with care
a156 1
#options	DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
d448 1
a448 2
amdnb_misc* at pci?			# AMD NB Misc Configuration
amdtemp* at amdnb_misc?			# AMD CPU Temperature sensors
d743 1
a743 2
mpt*	at pci? dev ? function ?	# LSILogic 9x9 and 53c1030 (Fusion-MPT)
mpii*	at pci? dev ? function ?	# LSI Logic Fusion-MPT II
a1062 1
bwi*	at cardbus? function ?	# Broadcom BCM43xx wireless
@


1.1058.2.5
log
@sync to latest -current.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a1229 1
run*	at uhub? port ?		# Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
@


1.1057
log
@Add gpiopwm(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1056 2011/11/13 09:41:46 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1056 $"
a1609 1
pseudo-device	rnd			# /dev/random and in-kernel generator
@


1.1056
log
@Enable nsclpcsio and gpio devices.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1055 2011/10/30 12:12:21 hannken Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1055 $"
d725 3
@


1.1055
log
@Import of the virtio driver written by MINOURA Makoto <minoura@@netbsd.org>
with minor changes to make it compile an run on -current.  This driver
speeds up disk and network access in virtual environments like KVM.

Enabled on i386 and amd64.  Tested with a CentOS 5.7 x86_64 host.

See http://ozlabs.org/~rusty/virtio-spec/virtio.pdf for the specification.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1054 2011/10/02 12:19:17 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1054 $"
d682 1
a682 1
#nsclpcsio*	at isa?
d707 1
a707 1
#gpio*	at gpiobus?
d711 2
a712 2
#gpioow* 	at gpio?
#onewire*	at gpioow?
d715 1
a715 1
#owtemp* 	at onewire?			# Temperature sensors
d718 1
a718 1
#gpioiic*	at gpio? offset ? mask ? flag 0x00	# flag 0x01 reverses
d720 1
a720 1
#iic*		at gpioiic?
d723 1
a723 1
#gpiolock*	at gpio?
@


1.1055.2.1
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1055 2011/10/30 12:12:21 hannken Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1055 $"
d83 1
a83 3
options 	CPU_UCODE	# cpu ucode loading support

# Note: SysV IPC parameters can be changed dynamically; see sysctl(8).
d87 1
d153 1
a153 1
# The following three options can break /etc/fstab, so handle with care
a155 1
#options	DKWEDGE_METHOD_APPLE    # Support Apple partitions as wedges
d186 1
a186 1
options 	WAPBL		# File system journaling support
a373 1
#tpm*		at acpi?		# ACPI TPM (Experimental)
d446 1
a446 2
amdnb_misc* at pci?			# AMD NB Misc Configuration
amdtemp* at amdnb_misc?			# AMD CPU Temperature sensors
d682 1
a682 1
nsclpcsio*	at isa?
d707 1
a707 1
gpio*	at gpiobus?
d711 2
a712 2
gpioow* 	at gpio?
onewire*	at gpioow?
d715 1
a715 1
owtemp* 	at onewire?			# Temperature sensors
d718 1
a718 1
gpioiic*	at gpio? offset ? mask ? flag 0x00	# flag 0x01 reverses
d720 1
a720 1
iic*		at gpioiic?
d723 1
a723 4
gpiolock*	at gpio?

# Software pulsing GPIO pins
gpiopwm*	at gpio?
a1057 1
bwi*	at cardbus? function ?	# Broadcom BCM43xx wireless
a1221 1
urtwn*	at uhub? port ?		# Realtek RTL8188CU/RTL8192CU 802.11b/g/n
a1254 3
# Apple iPad
uipad* at uhub? port ?

d1426 3
a1428 10
auvitek* at uhub?			# Auvitek AU0828 USB TV
coram*	at pci? dev ? function ?	# Conexant CX23885 PCI-E TV
cxdtv*	at pci? dev ? function ?	# Conexant CX2388[0-3] PCI TV
emdtv*	at uhub?			# Empia EM28xx USB TV
cir*	at emdtv?
pseye*	at uhub?			# Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub?			# USB Video Class capture devices

video*	at videobus?			# Analog capture interface
dtv*	at dtvbus?			# Digital capture interface
d1437 3
a1498 6
# Trusted Platform Module
tpm*   at isa? iomem 0xfed40000 irq 7
#tpm*  at isa? port 0x02e
#tpm*  at isa? port 0x04e 
#tpm*  at isa? port 0x07e 
#tpm*  at isa? port 0x0ee
d1607 1
@


1.1055.2.2
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1055.2.1 2012/04/17 00:06:27 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1055.2.1 $"
d745 1
a745 2
mpt*	at pci? dev ? function ?	# LSILogic 9x9 and 53c1030 (Fusion-MPT)
mpii*	at pci? dev ? function ?	# LSI Logic Fusion-MPT II
@


1.1055.2.3
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1055.2.2 2012/05/23 10:07:43 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1055.2.2 $"
a41 1
vmt0		at cpu0		# VMware Tools
a138 1
options 	COMPAT_60	# NetBSD 6.0 compatibility.
d187 1
a187 1
options 	FFS_EI		# FFS Endian Independent support
d271 1
a271 1
options 	WSDISPLAY_COMPAT_USL		# wsconscfg VT handling
d314 1
a970 1
malo*   at pci? dev ? function ?    # Marvell Libertas Wireless
a1156 4
# USB generic touchscreen
uts*	at uhidev? reportid ?
wsmouse* at uts? mux 0

d1228 1
a1228 1
ural*	at uhub? port ?		# Ralink Technology RT2500USB 802.11a/b/g
a1229 1
run*	at uhub? port ?		# Ralink Technology RT(2[78]|30)00 802.11a/b/g/n
a1230 1
urtw*	at uhub? port ?		# Realtek RTL8187/RTL8187B 802.11b/g
a1556 1

d1590 3
a1616 2
#pseudo-device	pfsync			# PF sync if
#pseudo-device	npf			# NPF packet filter
@


1.1055.2.4
log
@sync with (a bit old) head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1055.2.3 2012/10/30 17:19:47 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1055.2.3 $"
a459 2
tcpcib* at pci? dev ? function ?	# Intel Atom E6xx PCI-LPC
hpet* at tcpcib?
a488 1
isa0	at tcpcib?
d972 1
a972 1
malo*	at pci? dev ? function ?	# Marvell Libertas Wireless
@


1.1055.2.5
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1055.2.4 2013/01/16 05:32:58 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1055.2.4 $"
a479 3
#ibmcd*	at pci ? dev ? function ?	# IBM 4810 BSP cash drawer port
#gpio*	at ibmcd?

d1530 2
a1531 2
#tpm*  at isa? port 0x04e
#tpm*  at isa? port 0x07e
@


1.1055.2.6
log
@sync with head.

for a reference, the tree before this commit was tagged
as yamt-pagecache-tag8.

this commit was splitted into small chunks to avoid
a limitation of cvs.  ("Protocol error: too many arguments")
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1055.2.5 2013/01/23 00:05:48 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1055.2.5 $"
d116 1
a116 1
#options 	DDB_ONPANIC=1	# see also sysctl(7): `ddb.onpanic'
d203 2
d209 2
d215 1
d372 1
d417 1
d533 6
a738 3
# Soekris 6501 GPIO/LED driver (provides gpiobus, needs gpio)
#soekrisgpio0	at isa? port 0x680

a954 1
athn*	at pci? dev ? function ?	# Atheros AR9k (802.11a/g/n)
a973 1
ixg*	at pci? dev ? function ?	# Intel 8259x 10 gigabit
a1027 1
malo*	at pcmcia? function ?		# Marvell Libertas
a1072 1
athn*	at cardbus? function ?	# Atheros AR9k (802.11a/g/n) - UNTESTED
a1130 1
xhci*	at pci?	dev ? function ?	# eXtensible Host Controller
a1147 1
usb*	at xhci?
a1222 4
# KingSun/DonShine USB/IrDA Bridge
udsir*	at uhub? port ?
irframe* at udsir?

a1229 1
axen*	at uhub? port ?		# ASIX AX88178a/AX88179 based adapters
a1237 1
athn*	at uhub? port ?		# Atheros AR9002U
a1342 1
rtsx*	at pci?				# Realtek RTS5209/RTS5229 Card Reader
a1347 1
sdmmc*	at rtsx?			# SD/MMC bus
d1583 3
a1585 3
pseudo-device	ccd			# concatenated/striped disk devices
pseudo-device	cgd			# cryptographic disk devices
pseudo-device	raid			# RAIDframe disk driver
d1642 1
a1642 1
pseudo-device	sequencer		# MIDI sequencer
d1653 1
a1653 1
pseudo-device	vcoda			# coda minicache <-> venus comm.
@


1.1054
log
@Document gpioiic flag in a comment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1053 2011/09/04 12:31:30 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1053 $"
d1528 6
@


1.1053
log
@Disable gpio(4) which can now be built and used as modules.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1052 2011/08/30 13:03:17 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1052 $"
d718 2
a719 1
#gpioiic*	at gpio?
@


1.1052
log
@Attach gpio* at gpiobus? instead of at individual drivers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1051 2011/08/30 12:13:25 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1051 $"
d707 1
a707 1
gpio*	at gpiobus?
d711 2
a712 2
gpioow* 	at gpio?
onewire*	at gpioow?
d715 1
a715 1
owtemp* 	at onewire?			# Temperature sensors
d718 2
a719 2
gpioiic*	at gpio?
iic*		at gpioiic?
@


1.1051
log
@revert previous
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1050 2011/08/30 08:01:13 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1050 $"
a443 1
gpio*	at elansc?
d456 1
a456 1
gpio*	at gcscpcib?			# timecounter, watchdog and GPIO
a682 1
#gpio*		at nsclpcsio?
d707 1
a707 2
gpio*	at gscpcib?
#gpio*	at gpiosim?
@


1.1050
log
@Comment out the legacy bktr(4) from the GENERICs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1049 2011/08/27 09:28:55 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1049 $"
d1436 2
a1437 2
#bktr*	at pci? dev ? function ?
#radio*	at bktr?
@


1.1049
log
@Enable some gpio devices.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1048 2011/08/18 20:55:20 jakllsch Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1048 $"
d1436 2
a1437 2
bktr*	at pci? dev ? function ?
radio*	at bktr?
@


1.1048
log
@Attach amdtemp(4) at pchb(4) instead of in place of pchb(4).

Should fix PR#45268.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1047 2011/08/11 07:38:56 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1047 $"
d459 1
a459 1
#gscpcib* at pci? dev ? function ?	# NS Geode PCI-ISA w/ GPIO support
d709 1
a709 1
#gpio*	at gscpcib?
d714 2
a715 2
#gpioow* 	at gpio?
#onewire*	at gpioow?
d718 5
a722 1
#owtemp* 	at onewire?			# Temperature sensors
@


1.1047
log
@Add entries for pwdog(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1046 2011/08/09 02:52:29 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1046 $"
d447 1
a447 1
amdtemp* at pci? dev ? function ?	# AMD CPU Temperature sensors
@


1.1046
log
@remove commented out entries for emdtv, auvitek, and dtv
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1045 2011/08/08 18:58:18 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1045 $"
d472 2
@


1.1045
log
@remove dtv (available as a module)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1044 2011/08/08 17:02:31 jakllsch Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1044 $"
a1423 2
#auvitek* at uhub?		# Auvitek AU0828 video capture devices
#emdtv*	at uhub?		# Empia EM28xx video capture devices
a1424 1
#dtv* at dtvbus?
@


1.1044
log
@We have PUFFS, we need putter.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1043 2011/08/08 16:27:07 jakllsch Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1043 $"
d1424 2
a1425 2
auvitek* at uhub?		# Auvitek AU0828 video capture devices
emdtv*	at uhub?		# Empia EM28xx video capture devices
d1427 1
a1427 1
dtv* at dtvbus?
d1437 1
a1437 1
cxdtv*	at pci? dev ? function ?
@


1.1043
log
@Finish reverting modularization of i386 GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1042 2011/08/07 10:04:41 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1042 $"
d1551 1
@


1.1042
log
@Add commented out entries for V7FS and V7FS Endian Independent support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1041 2011/07/23 21:12:58 jakllsch Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1041 $"
a28 6
# For GENERIC, we build the exec formats as module(7)s by default.
no options 	EXEC_AOUT	# exec a.out binaries
no options 	EXEC_ELF32	# exec ELF binaries
no options 	EXEC_SCRIPT	# exec #! scripts
no options 	COREDUMP

d87 1
a87 3
#options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
no options 	AIO		# POSIX asynchronous I/O, built as a module(7)
no options 	MQUEUE		# POSIX messsage queues, built as a module(7)
d124 1
a124 1
# Compatibility options, built as module(7)s by default
d142 5
a146 5
#options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
#options 	COMPAT_LINUX	# binary compatibility with Linux
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
d159 18
a176 19
# File systems, built as module(7)s by default
#file-system	EXT2FS		# second extended file system (linux)
#file-system	LFS		# log-structured file system
#file-system	MFS		# memory file system
#file-system	NTFS		# Windows/NT file system (experimental)
#file-system	CD9660		# ISO 9660 + Rock Ridge file system
#file-system	MSDOSFS		# MS-DOS file system
#file-system	FDESC		# /dev/fd
#file-system	KERNFS		# /kern
#file-system	NULLFS		# loopback file system
#file-system	OVERLAY		# overlay file system
#file-system	PROCFS		# /proc
#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
#file-system	UMAPFS		# NULLFS + uid and gid remapping
#file-system	UNION		# union file system
#file-system	CODA		# Coda File System; also needs vcoda (below)
#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
#file-system	PTYFS		# /dev/ptm support
#file-system	TMPFS		# Efficient memory file-system
d183 2
a184 2
#options 	QUOTA		# legacy UFS quotas
#options 	QUOTA2		# new, in-filesystem UFS quotas
d188 1
a188 1
#options 	NFSSERVER	# Network File System server
d1591 3
a1593 3
# accept filters, built as module(7)s by default
#pseudo-device	accf_data		# "dataready" accept filter
#pseudo-device	accf_http		# "httpready" accept filter
d1609 1
a1609 1
#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
d1612 1
a1612 1
#pseudo-device	nsmb			# experimental - SMB requester
@


1.1041
log
@Enable or note aubtfwl(4) wherever ubt(4) is enabled or noted.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1040 2011/07/20 20:29:54 jakllsch Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1040 $"
d189 1
d201 1
@


1.1040
log
@Add cxdtv(4) and urndis(4).  Also, two slight cosmetic changes.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1039 2011/07/19 21:02:25 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1039 $"
d1458 1
@


1.1039
log
@add irmce
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1038 2011/07/13 07:52:48 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1038 $"
d1205 1
a1205 1
# Windows Media Center IR tranceiver
d1217 1
d1443 3
@


1.1038
log
@A driver for HP 3D DriverGuard; a LIS3LV02DL-based accelerometer. Tested on
HP NC4400. Like aps(4), this is commented out in the GENERIC kernels.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1037 2011/07/11 18:31:10 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1037 $"
d1205 4
@


1.1037
log
@add emdtv at uhub
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1036 2011/07/09 15:02:43 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1036 $"
d369 1
@


1.1036
log
@add dtv at dtvbus
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1035 2011/07/03 10:40:16 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1035 $"
d1426 1
@


1.1035
log
@Add back DIAGNOSTIC option to x86 GENERIC kernels, as discussed on tech-kern.
This will have to be commented out on release branches.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1034 2011/06/21 05:01:17 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1034 $"
d1426 2
a1427 1
video*	at videobus?
@


1.1034
log
@By default, enable wmihp(4) instead of hpqlb(4), as it has a better chance
of working with a greater number of HP laptops. Ok cegger@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1033 2011/06/14 13:59:23 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1033 $"
d116 2
a117 1
#options 	DIAGNOSTIC	# expensive kernel consistency checks
@


1.1033
log
@Try to attach hpet(4) also via a specific HPET table. Fixes PR kern/43702.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1032 2011/05/28 13:01:49 ryo Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1032 $"
d368 1
a368 1
hpqlb*		at acpi?		# HP Quick Launch Buttons
d385 1
a385 1
#wmihp*		at acpiwmibus?		# HP WMI mappings
@


1.1032
log
@many whitespace cleanup.
confirmed "cvs diff -b" are identical.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1031 2011/04/26 16:57:40 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1031 $"
d369 2
a370 1
hpet*		at acpi?		# High Precision Event Timer
@


1.1032.2.1
log
@Catchup with rmind-uvmplock merge.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1034 2011/06/21 05:01:17 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1034 $"
d368 2
a369 3
#hpqlb*		at acpi?		# HP Quick Launch Buttons
hpet*		at acpihpetbus?		# High Precision Event Timer (table)
hpet*		at acpinodebus?		# High Precision Event Timer (device)
d384 1
a384 1
wmihp*		at acpiwmibus?		# HP WMI mappings
@


1.1031
log
@Remove PECOFF/Win32 emulation.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1030 2011/04/26 15:51:22 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1030 $"
d30 3
a32 3
no options 	EXEC_AOUT       # exec a.out binaries
no options 	EXEC_ELF32      # exec ELF binaries
no options 	EXEC_SCRIPT     # exec #! scripts
d126 1
a126 1
#makeoptions 	DEBUG="-g"	# compile full symbol table
d208 1
a208 1
#options	MPLS		# MultiProtocol Label Switching (needs ifmpls)
d337 1
a337 1
acpi0 		at mainbus0
d350 1
a350 1
acpifan* 	at acpi?		# ACPI Fan
d375 1
a375 1
pcppi*		at acpi?                # AT-style speaker sound
d385 1
a385 1
wmimsi*		at acpiwmibus?		# MSI WMI mappings
d448 1
a448 1
gpio* 	at elansc?
d455 1
a455 1
#hpet* 	at amdpcib?
d459 1
a459 1
#hpet* 	at ichlpcib?
d461 1
a461 1
gpio* 	at gcscpcib?			# timecounter, watchdog and GPIO
d476 1
a476 1
agp* 	at pchb?
d484 2
a485 2
#isa0 	at amdpcib?
isa0 	at gcscpcib?
d554 2
a555 2
#unichromefb* 	at pci? dev ? function ?
#wsdisplay* 	at unichromefb?
d564 1
a564 1
mgadrm*		at drm?		# Matrox G[24]00, G[45]50 DRM driver
d568 1
a568 1
sisdrm*		at drm?		# SiS DRM driver
d570 1
a570 1
viadrm*		at drm?		# VIA DRM driver
d657 1
a657 1
#aps0 	at isa? port 0x1600
d689 1
a689 1
#ug0    at isa? port 0xe0
d756 1
a756 1
spc* 	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI
d759 1
a759 1
aha*	at isapnp? 			# Adaptec AHA-154[02
d831 3
a833 3
aceride* 	at pci? dev ? function ?	# Acer Lab IDE controllers
ahcisata* 	at pci? dev ? function ?	# AHCI SATA controllers
artsata* 	at pci? dev ? function ?	# Intel i31244 SATA controller
d836 2
a837 2
gcscide* 	at pci? dev ? function ? 	# AMD CS5535 Companion IDE controllers
geodeide* 	at pci? dev ? function ?	# AMD Geode IDE controllers
d842 1
a842 1
ahcisata* 	at jmide?
d844 2
a845 2
optiide* 	at pci? dev ? function ?	# Opti IDE controllers
piixide* 	at pci? dev ? function ?	# Intel IDE controllers
d855 1
a855 1
svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
d941 1
a941 1
bce* 	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
d943 1
a943 1
bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
d966 1
a966 1
#ndis* 	at pci? dev ? function ?	# Experimental - NDIS Network Driver
d1101 1
a1101 1
rdcphy*	at mii? phy ?			# RDC R6040 10/100 PHY
d1188 1
a1188 1
umidi* at uhub? port ? configuration ?
d1192 1
a1192 1
uirda* at uhub? port ? configuration ? interface ?
d1199 1
a1199 1
ustir* at uhub? port ?
d1421 1
a1421 1
pseye* at uhub? 		# Sony PLAYSTATION(R) Eye webcam
d1424 1
a1424 1
video* at videobus?
d1563 1
a1563 1
#options	PPPOE_SERVER            # Enable PPPoE server via link0
@


1.1030
log
@Remove Darwin, MACH and Mach-O support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1029 2011/04/04 17:09:39 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1029 $"
a154 1
#options 	COMPAT_PECOFF	# kernel support to run Win32 apps
@


1.1029
log
@Add a driver for RDC's vortex86/PMX-1000 SoC PCI/ISA bridge, with support
for the integrated watchdog timer.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1028 2011/04/04 14:33:51 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1028 $"
a153 3
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
@


1.1028
log
@Add rdcide(4), a driver for the IDE controller found in RDC's
vortex86/PMX-1000 system-on-chip.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1027 2011/04/01 12:11:16 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1027 $"
d470 2
d494 1
@


1.1027
log
@Enable acpicpu(4) by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1026 2011/03/06 17:08:25 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1026 $"
d850 1
@


1.1026
log
@merge the bouyer-quota2 branch. This adds a new on-disk format
to store disk quota usage and limits, integrated with ffs
metadata. Usage is checked by fsck_ffs (no more quotacheck)
and is covered by the WAPBL journal. Enabled with kernel
option QUOTA2 (added where QUOTA was enabled in kernel config files),
turned on with tunefs(8) on a per-filesystem
basis. mount_mfs(8) can also turn quotas on.

See http://mail-index.netbsd.org/tech-kern/2011/02/19/msg010025.html
for details.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d41 1
a41 1
#acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
@


1.1025
log
@Move INTEL_ONDEMAND_CLOCKMOD -- or odcm(4) -- to the cpufeaturebus.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1024 2011/02/27 17:10:34 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1024 $"
d194 2
a195 1
#options 	QUOTA		# UFS quotas
@


1.1024
log
@Move acpicpu(4) from "acpinodebus" to "cpufeaturebus".
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1023 2011/02/24 13:58:39 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1023 $"
d44 1
a48 3
# Intel(R) On Demand Clock Modulation (aka ODCM)
#options 	INTEL_ONDEMAND_CLOCKMOD

@


1.1023
log
@Move VIA_C7TEMP to the cpufeaturebus.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1022 2011/02/24 10:56:01 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1022 $"
d41 1
a351 1
#acpicpu*	at acpi?		# ACPI CPU
@


1.1022
log
@Move PowerNow! to the cpufeaturebus.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1021 2011/02/23 11:43:22 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1021 $"
d45 1
a639 3
# VIA C7 Temperature sensor
options 	VIA_C7TEMP

@


1.1021
log
@Move ENHANCED_SPEEDSTEP, or henceforth est(4), to the cpufeaturebus.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1020 2011/02/23 00:45:56 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1020 $"
a39 6
# AMD PowerNow! K7
options 	POWERNOW_K7

# AMD PowerNow! and Cool`n'Quiet technology
options 	POWERNOW_K8

d44 1
@


1.1020
log
@add alc@@pci
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1019 2011/02/20 13:42:45 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1019 $"
a39 4
# Enhanced SpeedStep Technology in the Pentium M
options 	ENHANCED_SPEEDSTEP
#options 	EST_FREQ_USERWRITE	# any user can set frequency

d46 4
a49 5
# Intel Core's on-die Thermal sensor
coretemp*	at cpu?

# VIA PadLock
#padlock0	at cpu0
@


1.1019
log
@Modularize coretemp(4). Ok jmcneill@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1018 2011/02/19 13:52:27 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1018 $"
d950 1
@


1.1018
log
@modularize VIA PadLock support
 - retire options VIA_PADLOCK, replace with 'padlock0 at cpu0'
 - driver supports attach & detach
 - support building as a module
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1017 2011/02/19 00:13:55 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1017 $"
d50 3
a648 3
# Intel Core's on-die Thermal sensor
options 	INTEL_CORETEMP

@


1.1017
log
@add VCONS_DRAW_INTR
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1016 2011/02/16 07:30:27 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1016 $"
d51 1
a51 1
#options 	VIA_PADLOCK
@


1.1016
log
@Add a skeleton driver for Asus EeePC acpiwmi(4) mappings.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1015 2011/02/15 12:06:22 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1015 $"
d552 1
@


1.1015
log
@retire azalia from GENERIC
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1014 2011/02/14 08:50:39 hannken Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1014 $"
d394 1
@


1.1014
log
@Initial implementation of ibmhawk(4) driver for sensors behind the IBM Hawk
on-board Integrated Systems Management Processor found on some eServers.

Tested on an IBM eServer x335.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1013 2011/02/13 04:37:21 jym Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1013 $"
d1337 1
a1337 1
azalia* at pci? dev ? function ?	# High Definition Audio
@


1.1013
log
@Compile FFS and NFS statically (e.g. not modular) for GENERIC. These
file-systems can be critical for mountroot; as kernel cannot have access
to module(7)s without having / mounted first... yes, you see the point.

See http://mail-index.netbsd.org/port-i386/2011/02/11/msg002323.html

XXX Hopefully, /stand does not reside in a separate partition :o
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1012 2011/02/13 04:22:41 jym Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1012 $"
d681 3
@


1.1012
log
@Add missing PUFFS (commented out).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1011 2011/02/11 01:59:57 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1011 $"
d175 2
a177 1
#file-system	FFS		# UFS
a180 1
#file-system	NFS		# Network File System client
@


1.1011
log
@attach drm hw drivers to 'drm' not 'vga'
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1010 2011/02/07 04:05:49 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1010 $"
d189 1
@


1.1010
log
@options SPLASHSCREEN_PROGRESS is no more
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1009 2011/01/26 18:48:12 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1009 $"
d567 9
a575 9
i915drm*	at vga?		# Intel i915, i945 DRM driver
mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm*		at vga?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at vga?		# ATI Rage 128 DRM driver
radeondrm*	at vga?		# ATI Radeon DRM driver
savagedrm*	at vga?		# S3 Savage DRM driver
sisdrm*		at vga?		# SiS DRM driver
tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver
viadrm*		at vga?		# VIA DRM driver
@


1.1009
log
@Add a driver for the RDC Semiconductor RDC R6040 10/100 Ethernet controller,
as found in the vortex86 SoCs (http://www.vortex86dx.com).
Ported from freebsd.
Not added to amd64's GENERIC because this CPU is 32bit only.

thanks to DM&P Electronics, Inc for providing documentation and sample
devices for this work.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1008 2011/01/26 00:25:55 pooka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1008 $"
a306 1
#options 	SPLASHSCREEN_PROGRESS
@


1.1008
log
@Add bwi from PR kern/40279.  There is no know case of testing the
driver on amd64/i386, but if it doesn't work at least we're more
likely to get a PR instead of people wondering about lacking driver
support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1007 2011/01/17 15:56:03 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1007 $"
d992 1
d1108 1
@


1.1007
log
@add acpiwdrt
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1006 2011/01/09 15:12:33 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1006 $"
d951 1
@


1.1007.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1010 2011/02/07 04:05:49 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1010 $"
d307 1
a950 1
bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
a990 1
vte*	at pci? dev ? function ?	# RDC R6040 10/100 Ethernet
a1105 1
rdcphy*	at mii? phy ?			# RDC R6040 10/100 PHY
@


1.1007.2.2
log
@Add QUOTA2 where QUOTA is enabled (and QUOTA2 commented out where QUOTA
is commented out)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1007.2.1 2011/02/08 16:19:25 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1007.2.1 $"
d200 1
a200 2
#options 	QUOTA		# legacy UFS quotas
#options 	QUOTA2		# new, in-filesystem UFS quotas
@


1.1007.2.3
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1016 2011/02/16 07:30:27 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1016 $"
a174 2
file-system	FFS		# UFS
file-system	NFS		# Network File System client
d176 1
d180 1
a188 1
#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
a393 1
wmieeepc*	at acpiwmibus?		# Asus Eee PC WMI mappings
d568 9
a576 9
i915drm*	at drm?		# Intel i915, i945 DRM driver
mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm*		at drm?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at drm?		# ATI Rage 128 DRM driver
radeondrm*	at drm?		# ATI Radeon DRM driver
savagedrm*	at drm?		# S3 Savage DRM driver
sisdrm*		at drm?		# SiS DRM driver
tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
viadrm*		at drm?		# VIA DRM driver
a680 3
# IBM Hawk Integrated Systems Management Processor
#ibmhawk0	at iic?	addr 0x37

d1334 1
a1334 1
#azalia* at pci? dev ? function ?	# High Definition Audio
@


1.1007.2.4
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d40 15
a54 8
# CPU features
#acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
coretemp*	at cpu?		# Intel on-die thermal sensor
est0		at cpu0		# Intel Enhanced SpeedStep (non-ACPI)
#odcm0		at cpu0		# On-demand clock modulation
#padlock0	at cpu0		# VIA PadLock
powernow0	at cpu0		# AMD PowerNow! and Cool'n'Quiet (non-ACPI)
viac7temp*	at cpu?		# VIA C7 temperature sensor
d358 1
a552 1
options 	VCONS_DRAW_INTR
d646 6
a949 1
alc*	at pci? dev ? function ?	# Attansic/Atheros L1C/L2C Ethernet
@


1.1006
log
@Add a dummy-driver for ACPI fans.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1005 2011/01/05 20:08:12 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1005 $"
d368 1
@


1.1006.2.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1032 2011/05/28 13:01:49 ryo Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1032 $"
d30 3
a32 3
no options 	EXEC_AOUT	# exec a.out binaries
no options 	EXEC_ELF32	# exec ELF binaries
no options 	EXEC_SCRIPT	# exec #! scripts
d40 15
a54 8
# CPU features
acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
coretemp*	at cpu?		# Intel on-die thermal sensor
est0		at cpu0		# Intel Enhanced SpeedStep (non-ACPI)
#odcm0		at cpu0		# On-demand clock modulation
#padlock0	at cpu0		# VIA PadLock
powernow0	at cpu0		# AMD PowerNow! and Cool'n'Quiet (non-ACPI)
viac7temp*	at cpu?		# VIA C7 temperature sensor
d133 1
a133 1
#makeoptions	DEBUG="-g"	# compile full symbol table
d161 3
d165 1
a174 2
file-system	FFS		# UFS
file-system	NFS		# Network File System client
d176 1
d180 1
a188 1
#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
d200 1
a200 2
#options 	QUOTA		# legacy UFS quotas
#options 	QUOTA2		# new, in-filesystem UFS quotas
d217 1
a217 1
#options 	MPLS		# MultiProtocol Label Switching (needs ifmpls)
d307 1
d347 1
a347 1
acpi0		at mainbus0
d357 1
d361 1
a361 1
acpifan*	at acpi?		# ACPI Fan
a367 1
acpiwdrt*	at acpi?		# ACPI Watchdog Resource Table
d385 1
a385 1
pcppi*		at acpi?		# AT-style speaker sound
a392 1
wmieeepc*	at acpiwmibus?		# Asus Eee PC WMI mappings
d394 1
a394 1
wmimsi* 	at acpiwmibus?		# MSI WMI mappings
d457 1
a457 1
gpio*	at elansc?
d464 1
a464 1
#hpet*	at amdpcib?
d468 1
a468 1
#hpet*	at ichlpcib?
d470 1
a470 1
gpio*	at gcscpcib?			# timecounter, watchdog and GPIO
a474 2
rdcpcib* at pci? dev ? function ?	# RDC Vortex86/PMX-1000 PCI-ISA w/
					# watchdog
d483 1
a483 1
agp*	at pchb?
d491 2
a492 2
#isa0	at amdpcib?
isa0	at gcscpcib?
a496 1
isa0	at rdcpcib?
a549 1
options 	VCONS_DRAW_INTR
d559 2
a560 2
#unichromefb*	at pci? dev ? function ?
#wsdisplay*	at unichromefb?
d567 9
a575 9
i915drm*	at drm?		# Intel i915, i945 DRM driver
mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at drm?		# ATI Rage 128 DRM driver
radeondrm*	at drm?		# ATI Radeon DRM driver
savagedrm*	at drm?		# S3 Savage DRM driver
sisdrm* 	at drm?		# SiS DRM driver
tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
viadrm* 	at drm?		# VIA DRM driver
d643 6
d668 1
a668 1
#aps0	at isa? port 0x1600
a679 3
# IBM Hawk Integrated Systems Management Processor
#ibmhawk0	at iic?	addr 0x37

d697 1
a697 1
#ug0	at isa? port 0xe0
d764 1
a764 1
spc*	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI
d767 1
a767 1
aha*	at isapnp?			# Adaptec AHA-154[02
d839 3
a841 3
aceride*	at pci? dev ? function ?	# Acer Lab IDE controllers
ahcisata*	at pci? dev ? function ?	# AHCI SATA controllers
artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
d844 2
a845 2
gcscide*	at pci? dev ? function ?	# AMD CS5535 Companion IDE controllers
geodeide*	at pci? dev ? function ?	# AMD Geode IDE controllers
d850 1
a850 1
ahcisata*	at jmide?
d852 2
a853 2
optiide*	at pci? dev ? function ?	# Opti IDE controllers
piixide*	at pci? dev ? function ?	# Intel IDE controllers
a856 1
rdcide* 	at pci? dev ? function ?	# RDC PMX-1000 IDE controllers
d862 1
a862 1
svwsata*	at pci? dev ? function ?	# ServerWorks SATA controllers
a943 1
alc*	at pci? dev ? function ?	# Attansic/Atheros L1C/L2C Ethernet
d947 1
a947 1
bce*	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
d949 1
a949 2
bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
d971 1
a971 1
#ndis*	at pci? dev ? function ?	# Experimental - NDIS Network Driver
a989 1
vte*	at pci? dev ? function ?	# RDC R6040 10/100 Ethernet
a1104 1
rdcphy* at mii? phy ?			# RDC R6040 10/100 PHY
d1191 1
a1191 1
umidi*	at uhub? port ? configuration ?
d1195 1
a1195 1
uirda*	at uhub? port ? configuration ? interface ?
d1202 1
a1202 1
ustir*	at uhub? port ?
d1330 1
a1330 1
#azalia* at pci? dev ? function ?	# High Definition Audio
d1424 1
a1424 1
pseye*	at uhub?		# Sony PLAYSTATION(R) Eye webcam
d1427 1
a1427 1
video*	at videobus?
d1566 1
a1566 1
#options 	PPPOE_SERVER		# Enable PPPoE server via link0
@


1.1005
log
@Add a driver for ACPI power meters.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1004 2011/01/03 06:07:43 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1004 $"
d361 1
@


1.1004
log
@Xref module(7) in comments.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1003 2010/12/27 20:45:00 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1003 $"
d359 2
a360 5
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
acpiec* 	at acpi?		# ACPI Embedded Controller (late binding)
acpiecdt*	at acpi?		# ACPI Embedded Controller (early binding)
d362 1
@


1.1003
log
@add auvitek at uhub
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1002 2010/12/27 15:56:50 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1002 $"
d29 1
a29 1
# For GENERIC, we build the exec formats as modules by default.
d101 2
a102 2
no options 	AIO		# POSIX asynchronous I/O, built as a module
no options 	MQUEUE		# POSIX messsage queues, built as a module
d104 1
a104 1
options 	MODULAR		# new style module framework
d138 1
a138 1
# Compatibility options, built as modules by default
d175 1
a175 1
# File systems, built as modules by default
d1551 1
a1551 1
options 	MEMORY_DISK_DYNAMIC	# loaded via kernel module
d1588 1
a1588 1
# accept filters, built as modules by default
@


1.1002
log
@add 'uaudio* at usbifif?' so uaudio can attach to something other than
a hub
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1001 2010/11/27 20:18:46 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1001 $"
d1427 1
@


1.1001
log
@add ihphy
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1000 2010/11/23 11:14:00 hannken Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1000 $"
d1189 1
@


1.1000
log
@Remove unused count from pseudo-device md.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.999 2010/11/13 09:48:55 jnemeth Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.999 $"
d1096 1
@


1.999
log
@Add new et(4)/etphy(4) devices.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.998 2010/11/06 15:06:29 jakllsch Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.998 $"
d1546 1
a1546 1
pseudo-device	md		1	# memory disk device (ramdisk)
@


1.998
log
@Enable schide(4), Intel SCH IDE controller driver from PR#42310.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.997 2010/11/05 10:28:21 gsutre Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.997 $"
d956 1
d1089 1
@


1.997
log
@Merge ACPI Fujitsu Driver.  Provides support for hotkeys and other
built-in components through vendor-specific ACPI devices.

ok jruoho@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.996 2010/11/03 20:10:00 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.996 $"
d859 1
@


1.996
log
@add otus
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.995 2010/10/24 08:54:14 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.995 $"
d377 2
@


1.995
log
@Add acpiwmi(4) mappings for MSI laptops.

XXX: It may be necessary to fix PR # 43659 before this works on all models.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.994 2010/10/12 19:10:50 gsutre Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.994 $"
d1210 1
@


1.994
log
@Merge ACPI display driver.  Provides generic support for brightness
control and output switching, through ACPI video extensions.

TODO: use wsconsctl(8) instead of sysctl(8) for brightness control.

ok jruoho@@
also discussed with cegger@@ and jmcneill@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.993 2010/08/22 18:56:21 rmind Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.993 $"
d393 1
@


1.993
log
@Import NPF - a packet filter.  Some features:

- Designed to be fully MP-safe and highly efficient.

- Tables/IP sets (hash or red-black tree) for high performance lookups.

- Stateful filtering and Network Address Port Translation (NAPT).
  Framework for application level gateways (ALGs).

- Packet inspection engine called n-code processor - inspired by BPF -
  supporting generic RISC-like and specific CISC-like instructions for
  common patterns (e.g. IPv4 address matching).  See npf_ncode(9) manual.

- Convenient userland utility npfctl(8) with npf.conf(8).

NOTE: This is not yet a fully capable alternative to PF or IPFilter.
Further work (support for binat/rdr, return-rst/return-icmp, common ALGs,
state saving/restoring, logging, etc) is in progress.

Thanks a lot to Matt Thomas for various useful comments and code review.
Aye by: board@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.992 2010/08/21 11:55:21 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.992 $"
d367 2
@


1.992
log
@enable viadrm
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.991 2010/08/21 03:06:37 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.991 $"
d1544 3
@


1.991
log
@Add upgt(4), Intersil PrismGT USB 802.11b/g adapter.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.990 2010/08/08 20:04:24 chs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.990 $"
d571 1
@


1.990
log
@add more (commented-out) spdmem instances for HP xw-series workstations.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.989 2010/07/24 00:45:54 jym Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.989 $"
d1208 1
@


1.989
log
@Welcome PAE inside i386 current.

This patch is inspired by work previously done by Jeremy Morse, ported by me
to -current, merged with the work previously done for port-xen, together with
additionals fixes and improvements.

PAE option is disabled by default in GENERIC (but will be enabled in ALL in
the next few days).

In quick, PAE switches the CPU to a mode where physical addresses become
36 bits (64 GiB). Virtual address space remains at 32 bits (4 GiB). To cope
with the increased size of the physical address, they are manipulated as
64 bits variables by kernel and MMU.

When supported by the CPU, it also allows the use of the NX/XD bit that
provides no-execution right enforcement on a per physical page basis.

Notes:

- reworked locore.S

- introduce cpu_load_pmap(), used to switch pmap for the curcpu. Due to the
different handling of pmap mappings with PAE vs !PAE, Xen vs native, details
are hidden within this function. This helps calling it from assembly,
as some features, like BIOS calls, switch to pmap_kernel before mapping
trampoline code in low memory.

- some changes in bioscall and kvm86_call, to reflect the above.

- the L3 is "pinned" per-CPU, and is only manipulated by a
reduced set of functions within pmap. To track the L3, I added two
elements to struct cpu_info, namely ci_l3_pdirpa (PA of the L3), and
ci_l3_pdir (the L3 VA). Rest of the code considers that it runs "just
like" a normal i386, except that the L2 is 4 pages long (PTP_LEVELS is
still 2).

- similar to the ci_pae_l3_pdir{,pa} variables, amd64's xen_current_user_pgd
becomes an element of cpu_info (slowly paving the way for MP world).

- bootinfo_source struct declaration is modified, to cope with paddr_t size
change with PAE (it is not correct to assume that bs_addr is a paddr_t when
compiled with PAE - it should remain 32 bits). bs_addrs is now a
void * array (in bootloader's code under i386/stand/, the bs_addrs
is a physaddr_t, which is an unsigned long).

- fixes in multiboot code (same reason as bootinfo): paddr_t size
change. I used Elf32_* types, use RELOC() where necessary, and move the
memcpy() functions out of the if/else if (I do not expect sym and str tables
to overlap with ELF).

- 64 bits atomic functions for pmap

- all pmap_pdirpa access are now done through the pmap_pdirpa macro. It
hides the L3/L2 stuff from PAE, as well as the pm_pdirpa change in
struct pmap (it now becomes a PDP_SIZE array, with or without PAE).

- manipulation of recursive mappings ( PDIR_SLOT_{,A}PTEs ) is done via
loops on PDP_SIZE.

See also http://mail-index.netbsd.org/port-i386/2010/07/17/msg002062.html

No objection raised on port-i386@@ and port-xen@@R for about a week.

XXX kvm(3) will be fixed in another patch to properly handle both PAE and !PAE
kernel dumps (VA => PA macros are slightly different, and need proper 64 bits
PA support in kvm_i386).

XXX Mixing PAE and !PAE modules may lead to unwanted/unexpected results. This
cannot be solved easily, and needs lots of thinking before being declared
safe (paddr_t/bus_addr_t size handling, PD/PT macros abstractions).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.988 2010/07/23 00:43:20 jakllsch Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.988 $"
d702 4
@


1.988
log
@Almost entirely rework Intel Firmware Hub random number generator support.

This introduces fwhrng(4) which attaches via ichlpcib(4), replacing
the rnd(4) support in pchb(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.987 2010/07/18 09:29:12 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.987 $"
d38 1
@


1.987
log
@Merge a driver for ACPI CPUs with basic support for processor power states,
also known as C-states. The code is modular and provides an easy way to add
the remaining functionality later (namely throttling and P-states).

Remarks:

  1.	Commented out in the GENERICs; more testing exposure is needed.

  2.	The C3-state is disabled for the time being because it turns off
	timers, among them the local APIC timer. This may not be universally
	true on all x86 processors; define ACPICPU_ENABLE_C3 to test.

  3.	The algorithm used to choose a power state may need tuning. When
	evaluating the appropriate state, the implementation uses the
	previous sleep time as an indicator. Additional hints would include
	for example the system load.

	Also bus master activity is evaluated when choosing a state. The
	usb(4) stack is notorious for such activity even when unused.
	Typically it must be disabled in order to reach the C3-state,
	but it may also prevent the use of C2.

  4.	While no extensive empirical measurements have been carried out, the
	power savings are somewhere between 1-2 W with C1 and C2, depending
	on the processor, firmware, and load. With C3 even up to 4 W can be
	saved.  The less something ticks, the more power is saved.

ok jmcneill@@, joerg@@, and discussed with various people.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.986 2010/06/26 15:17:56 kefren Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.986 $"
d460 1
a460 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
d462 1
@


1.986
log
@Fix build for MPLS import: add options MPLS, changed pseudo-device mpls
to pseudo-device ifmpls
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.985 2010/06/26 14:36:48 kefren Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.985 $"
d356 1
@


1.985
log
@add pseudo-device mpls - commented in GENERIC for now
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.984 2010/06/01 02:40:13 mrg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.984 $"
d216 1
d1540 1
a1540 1
#pseudo-device	mpls			# MultiProtocol Label Switching
@


1.984
log
@enable the drm drivers; they've been tested for ages and have been
enabled on amd64 for some months now.  as requested in PR#42936.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.983 2010/05/22 19:02:08 plunky Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.983 $"
d1539 1
@


1.983
log
@add btmagic(4) where other Bluetooth drivers are listed
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.982 2010/05/08 22:16:28 mrg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.982 $"
d558 10
@


1.982
log
@enable IPFILTER_COMPAT in all kernels that have ipfilter already.
canonicalise several of the ipf option segments in various files
(this mostly means adding commented out IPFILTER_DEFAULT_BLOCK,
or adding commented or uncommented IPFILTER_LOG or IPFILTER_LOOKUP
option statements.)

i built about 20 of these kernels to check, but not all of them.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.981 2010/05/02 17:24:35 chs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.981 $"
d1437 4
@


1.981
log
@add alipm and its iic bus.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.980 2010/04/16 13:48:32 pooka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.980 $"
d227 1
@


1.980
log
@Remove unused count (invariably "4") from pseudo-device fss.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.979 2010/04/10 17:55:25 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.979 $"
d617 5
a621 1
#iic*	at amdpm?			# sensors below are on this bus
@


1.979
log
@Move vald(4) to sys/dev/acpi. This is MI and should work also on amd64.

ok jmcneill@@

XXX:    This is broken: it calls methods with absolute pathnames (almost
        guaranteed not to be portable across models), it accesses methods
        that are in the domain of other drivers, it walks the namespace on
        its own, it contains plenty of magic constants, it does not
        integrate with existing KPIs, etc. Summa summarum: this should be
        rewritten as a more generic toshiba_acpi(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.978 2010/04/09 14:02:05 ahoka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.978 $"
d1506 1
a1506 1
pseudo-device	fss		4	# file system snapshot device
@


1.978
log
@Remove pad from GENERIC, add to MONOLITH, we have it as a module now.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.977 2010/04/08 17:32:30 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.977 $"
d379 1
d382 1
a393 6
# Sony LCD brightness etc.
sony* 		at acpi?		# Sony Miscellaneous Controller

# Toshiba Libretto devices
vald*		at acpi?

@


1.977
log
@Add WMI mappings for HP laptops. Requested by cegger@@.
Thanks to apb@@ and cegger@@ for initial testing.

XXX: This conflicts with hpqlb(4). Someone with the suitable hardware needs
     to complete the list of hotkeys before -- and if -- this can replace
     hpqlb(4). For now, the driver was left uncommented in the GENERICs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.976 2010/04/08 09:45:17 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.976 $"
a1576 3
# pseudo audio device driver
pseudo-device	pad

@


1.976
log
@Add wmidell(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.975 2010/03/27 03:04:51 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.975 $"
d384 1
@


1.975
log
@Added sdhc at cardbus support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.974 2010/03/08 22:51:52 hubertf Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.974 $"
d383 1
@


1.974
log
@Add etherip(4), commented out
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.973 2010/03/06 21:12:04 plunky Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.973 $"
d1279 1
a1279 1
# SD/MMC controller
d1281 4
a1285 1

@


1.974.2.1
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.974 2010/03/08 22:51:52 hubertf Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.974 $"
a226 1
options 	IPFILTER_COMPAT # Compat for IP-Filter
a378 1
sony*		at acpi?		# Sony Miscellaneous Controller
a380 1
vald*		at acpi?		# Toshiba Libretto hotkeys
a382 2
wmidell*	at acpiwmibus?		# Dell WMI mappings
#wmihp*		at acpiwmibus?		# HP WMI mappings
d390 6
d619 1
a619 5
iic*	at amdpm?

# Acer Labs M7101 SMBus controller
alipm*	at pci? dev ? function ?
iic*	at alipm?
d1279 1
a1279 1
# PCI SD/MMC controller
d1281 1
a1282 4
# CardBus SD/MMC controller
sdhc*	at cardbus? function ?		# SD Host Controller

sdmmc*	at sdhc?			# SD/MMC bus
a1430 4
# Bluetooth Apple Magic Mouse
btmagic* at bthub?
wsmouse* at btmagic? mux 0

d1505 1
a1505 1
pseudo-device	fss			# file system snapshot device
d1572 3
@


1.974.2.2
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.974.2.1 2010/05/30 05:16:53 rmind Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.974.2.1 $"
a215 1
#options	MPLS		# MultiProtocol Label Switching (needs ifmpls)
a557 10
# DRI driver
i915drm*	at vga?		# Intel i915, i945 DRM driver
mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm*		at vga?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at vga?		# ATI Rage 128 DRM driver
radeondrm*	at vga?		# ATI Radeon DRM driver
savagedrm*	at vga?		# S3 Savage DRM driver
sisdrm*		at vga?		# SiS DRM driver
tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver

a1528 1
#pseudo-device	ifmpls			# MPLS pseudo-interface
@


1.974.2.3
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d29 1
a29 1
# For GENERIC, we build the exec formats as module(7)s by default.
a37 1
#options 	PAE		# PAE mode (36 bits physical addressing)
d39 15
a53 8
# CPU features
#acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
coretemp*	at cpu?		# Intel on-die thermal sensor
est0		at cpu0		# Intel Enhanced SpeedStep (non-ACPI)
#odcm0		at cpu0		# On-demand clock modulation
#padlock0	at cpu0		# VIA PadLock
powernow0	at cpu0		# AMD PowerNow! and Cool'n'Quiet (non-ACPI)
viac7temp*	at cpu?		# VIA C7 temperature sensor
d100 2
a101 2
no options 	AIO		# POSIX asynchronous I/O, built as a module(7)
no options 	MQUEUE		# POSIX messsage queues, built as a module(7)
d103 1
a103 1
options 	MODULAR		# new style module(7) framework
d137 1
a137 1
# Compatibility options, built as module(7)s by default
d174 2
a175 3
file-system	FFS		# UFS
file-system	NFS		# Network File System client
# File systems, built as module(7)s by default
d179 1
a187 1
#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
d306 1
d357 5
a361 3
acpiec* 	at acpi?		# ACPI Embedded Controller (late)
acpiecdt*	at acpi?		# ACPI Embedded Controller (early)
acpifan* 	at acpi?		# ACPI Fan
a362 1
#acpipmtr*	at acpi?		# ACPI Power Meter (experimental)
a364 3
acpivga*	at acpi?		# ACPI Display Adapter
acpiout*	at acpivga?		# ACPI Display Output Device
acpiwdrt*	at acpi?		# ACPI Watchdog Resource Table
a372 2
fujbp*		at acpi?		# Fujitsu Brightness & Pointer
fujhk*		at acpi?		# Fujitsu Hotkeys
a387 1
wmieeepc*	at acpiwmibus?		# Asus Eee PC WMI mappings
a388 1
wmimsi*		at acpiwmibus?		# MSI WMI mappings
d459 1
a459 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-LPC w/ timecounter,
a460 1
fwhrng* at ichlpcib?		# Intel 82802 FWH Random Number Generator
a542 1
options 	VCONS_DRAW_INTR
d560 8
a567 9
i915drm*	at drm?		# Intel i915, i945 DRM driver
mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm*		at drm?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at drm?		# ATI Rage 128 DRM driver
radeondrm*	at drm?		# ATI Radeon DRM driver
savagedrm*	at drm?		# S3 Savage DRM driver
sisdrm*		at drm?		# SiS DRM driver
tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
viadrm*		at drm?		# VIA DRM driver
d635 6
a671 3
# IBM Hawk Integrated Systems Management Processor
#ibmhawk0	at iic?	addr 0x37

a698 4
#spdmem* at iic? addr 0x54
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
a845 1
schide* 	at pci? dev ? function ?	# Intel SCH IDE controllers
a930 1
alc*	at pci? dev ? function ?	# Attansic/Atheros L1C/L2C Ethernet
a936 1
bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
a941 1
et*	at pci? dev ? function ?	# Agere/LSI ET1310/ET1301 Gigabit
a975 1
vte*	at pci? dev ? function ?	# RDC R6040 10/100 Ethernet
a1073 1
etphy*	at mii? phy ?			# Agere/LSI ET1011 TruePHY Gig-E PHYs
a1079 1
ihphy*	at mii? phy ?			# Intel 82577 PHYs
a1088 1
rdcphy*	at mii? phy ?			# RDC R6040 10/100 PHY
a1171 1
uaudio* at usbifif?
a1198 1
otus*	at uhub? port ?		# Atheros AR9001U
a1200 1
upgt*	at uhub? port ?		# Intersil PrismGT
d1311 1
a1311 1
#azalia* at pci? dev ? function ?	# High Definition Audio
a1406 1
auvitek* at uhub?		# Auvitek AU0828 video capture devices
d1528 1
a1528 1
pseudo-device	md			# memory disk device (ramdisk)
d1530 1
a1530 1
options 	MEMORY_DISK_DYNAMIC	# loaded via kernel module(7)
a1534 3
# NPF
#pseudo-device	npf

d1564 1
a1564 1
# accept filters, built as module(7)s by default
@


1.974.2.4
log
@sync with head
@
text
@d41 1
a41 1
acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
d194 1
a194 2
#options 	QUOTA		# legacy UFS quotas
#options 	QUOTA2		# new, in-filesystem UFS quotas
a468 2
rdcpcib* at pci? dev ? function ?	# RDC Vortex86/PMX-1000 PCI-ISA w/
					# watchdog
a490 1
isa0	at rdcpcib?
a848 1
rdcide* 	at pci? dev ? function ?	# RDC PMX-1000 IDE controllers
@


1.974.2.5
log
@sync with head
@
text
@d30 3
a32 3
no options 	EXEC_AOUT	# exec a.out binaries
no options 	EXEC_ELF32	# exec ELF binaries
no options 	EXEC_SCRIPT	# exec #! scripts
d126 1
a126 1
#makeoptions	DEBUG="-g"	# compile full symbol table
d154 3
d158 1
d212 1
a212 1
#options 	MPLS		# MultiProtocol Label Switching (needs ifmpls)
d341 1
a341 1
acpi0		at mainbus0
d354 1
a354 1
acpifan*	at acpi?		# ACPI Fan
d379 1
a379 1
pcppi*		at acpi?		# AT-style speaker sound
d389 1
a389 1
wmimsi* 	at acpiwmibus?		# MSI WMI mappings
d452 1
a452 1
gpio*	at elansc?
d459 1
a459 1
#hpet*	at amdpcib?
d463 1
a463 1
#hpet*	at ichlpcib?
d465 1
a465 1
gpio*	at gcscpcib?			# timecounter, watchdog and GPIO
d480 1
a480 1
agp*	at pchb?
d488 2
a489 2
#isa0	at amdpcib?
isa0	at gcscpcib?
d558 2
a559 2
#unichromefb*	at pci? dev ? function ?
#wsdisplay*	at unichromefb?
d568 1
a568 1
mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
d572 1
a572 1
sisdrm* 	at drm?		# SiS DRM driver
d574 1
a574 1
viadrm* 	at drm?		# VIA DRM driver
d661 1
a661 1
#aps0	at isa? port 0x1600
d693 1
a693 1
#ug0	at isa? port 0xe0
d760 1
a760 1
spc*	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI
d763 1
a763 1
aha*	at isapnp?			# Adaptec AHA-154[02
d835 3
a837 3
aceride*	at pci? dev ? function ?	# Acer Lab IDE controllers
ahcisata*	at pci? dev ? function ?	# AHCI SATA controllers
artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
d840 2
a841 2
gcscide*	at pci? dev ? function ?	# AMD CS5535 Companion IDE controllers
geodeide*	at pci? dev ? function ?	# AMD Geode IDE controllers
d846 1
a846 1
ahcisata*	at jmide?
d848 2
a849 2
optiide*	at pci? dev ? function ?	# Opti IDE controllers
piixide*	at pci? dev ? function ?	# Intel IDE controllers
d859 1
a859 1
svwsata*	at pci? dev ? function ?	# ServerWorks SATA controllers
d945 1
a945 1
bce*	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
d947 1
a947 1
bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
d970 1
a970 1
#ndis*	at pci? dev ? function ?	# Experimental - NDIS Network Driver
d1105 1
a1105 1
rdcphy* at mii? phy ?			# RDC R6040 10/100 PHY
d1192 1
a1192 1
umidi*	at uhub? port ? configuration ?
d1196 1
a1196 1
uirda*	at uhub? port ? configuration ? interface ?
d1203 1
a1203 1
ustir*	at uhub? port ?
d1425 1
a1425 1
pseye*	at uhub?		# Sony PLAYSTATION(R) Eye webcam
d1428 1
a1428 1
video*	at videobus?
d1567 1
a1567 1
#options 	PPPOE_SERVER		# Enable PPPoE server via link0
@


1.973
log
@add uhso(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.972 2010/03/06 04:28:53 cnst Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.972 $"
d1537 1
@


1.972
log
@remove aiboost(4) from GENERICs, since it cannot win in autoconf(9) over aibs(4);  ok pgoyette
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.971 2010/02/22 17:27:04 pgoyette Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.971 $"
d1149 3
@


1.971
log
@Forgot to add smscmon here...
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.970 2010/02/22 05:57:10 ahoka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.970 $"
a365 1
aiboost*	at acpi?		# ASUS AI Booster Hardware Monitor
@


1.970
log
@Mention splash need genfb or radeonfb
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.969 2010/02/21 05:16:29 cnst Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.969 $"
d667 4
@


1.969
log
@New wbsio(4) driver for Winbond Super I/O attachment of lm(4) on any port.

    http://mail-index.netbsd.org/tech-kern/2010/02/17/msg007338.html

Reviewed by <pgoyette>, <tech-kern>.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.968 2010/02/12 15:51:16 hubertf Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.968 $"
d302 1
a302 1
# enable splash screen support; requires hw driver support
@


1.968
log
@Add PPPOE_SERVER
 - disabled (commented out) in GENERIC,
 - enabled in ALL
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.967 2010/02/10 19:54:36 tonio Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.967 $"
d655 4
d662 1
@


1.967
log
@Fix typo in TEMPer comment, spotted by Patrick Welche
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.966 2010/02/09 22:38:32 tonio Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.966 $"
d1510 1
@


1.966
log
@Add TEMPer and TERMPerHUM driver
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.965 2010/02/09 03:19:50 cnst Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.965 $"
d1121 1
a1121 1
# USB TERMPer and TEMPerHUM
@


1.965
log
@New aibs(4) driver for ASUSTeK AI Booster (ACPI ATK0110) hardware monitor
with limit support.

        http://thread.gmane.org/gmane.os.netbsd.devel.kernel/35654

Reviewed by <pgoyette>, <jruoho> and <tech-kern>.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.964 2010/02/08 21:45:31 pgoyette Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.964 $"
d1121 3
@


1.964
log
@Add flags to all instances of lm(4), add a reference to man page
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.963 2010/02/06 20:12:32 pgoyette Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.963 $"
d367 1
@


1.963
log
@Add acpismbus enries - commented out!
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.962 2010/01/31 12:14:45 jruoho Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.962 $"
d655 2
a656 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310
@


1.963.2.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.963 $"
d302 1
a302 1
# enable splash screen support; requires genfb or radeonfb
d366 1
a366 1
aibs*		at acpi?		# ASUSTeK AI Booster hardware monitor
a378 1
sony*		at acpi?		# Sony Miscellaneous Controller
a380 1
vald*		at acpi?		# Toshiba Libretto hotkeys
a382 2
wmidell*	at acpiwmibus?		# Dell WMI mappings
#wmihp*		at acpiwmibus?		# HP WMI mappings
d390 6
a653 4
# Winbond LPC Super I/O
#wbsio*	at isa? port 0x2e
#wbsio*	at isa? port 0x4e

d655 1
a655 3
# 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
#lm*	at wbsio?
a659 4
# SMSC LPC47M192 hardware monitor
#smscmon*	at iic? addr 0x2c
#smscmon*	at iic? addr 0x2d	# (alternate address)

a1118 3
# USB TEMPer and TEMPerHUM
uthum*	at uhidev? reportid ?

a1135 3
# Option N.V. Wireless WAN modems
uhso*	at uhub? port ? configuration ?

d1263 1
a1263 1
# PCI SD/MMC controller
d1265 1
a1266 4
# CardBus SD/MMC controller
sdhc*	at cardbus? function ?		# SD Host Controller

sdmmc*	at sdhc?			# SD/MMC bus
d1489 1
a1489 1
pseudo-device	fss			# file system snapshot device
a1504 1
#options	PPPOE_SERVER            # Enable PPPoE server via link0
a1519 1
#pseudo-device 	etherip 		# Tunnel Ethernet over IP
d1554 3
@


1.963.2.2
log
@Sync with HEAD.
@
text
@d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a37 1
#options 	PAE		# PAE mode (36 bits physical addressing)
a215 1
#options	MPLS		# MultiProtocol Label Switching (needs ifmpls)
a226 1
options 	IPFILTER_COMPAT # Compat for IP-Filter
a353 1
#acpicpu*	at acpi?		# ACPI CPU
d457 1
a457 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-LPC w/ timecounter,
a458 1
fwhrng* at ichlpcib?		# Intel 82802 FWH Random Number Generator
a556 10
# DRI driver
i915drm*	at vga?		# Intel i915, i945 DRM driver
mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm*		at vga?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at vga?		# ATI Rage 128 DRM driver
radeondrm*	at vga?		# ATI Radeon DRM driver
savagedrm*	at vga?		# S3 Savage DRM driver
sisdrm*		at vga?		# SiS DRM driver
tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver

d617 1
a617 5
iic*	at amdpm?

# Acer Labs M7101 SMBus controller
alipm*	at pci? dev ? function ?
iic*	at alipm?
a682 4
#spdmem* at iic? addr 0x54
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
a1431 4
# Bluetooth Apple Magic Mouse
btmagic* at bthub?
wsmouse* at btmagic? mux 0

a1519 1
#pseudo-device	ifmpls			# MPLS pseudo-interface
@


1.963.2.3
log
@Sync with HEAD (-D20101022).
@
text
@a366 2
acpivga*	at acpi?		# ACPI Display Adapter
acpiout*	at acpivga?		# ACPI Display Output Device
a570 1
viadrm*		at vga?		# VIA DRM driver
a1207 1
upgt*	at uhub? port ?		# Intersil PrismGT
a1541 3
# NPF
#pseudo-device	npf

@


1.963.2.4
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.963.2.3 2010/10/22 07:21:19 uebayasi Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.963.2.3 $"
a376 2
fujbp*		at acpi?		# Fujitsu Brightness & Pointer
fujhk*		at acpi?		# Fujitsu Hotkeys
a392 1
wmimsi*		at acpiwmibus?		# MSI WMI mappings
a1208 1
otus*	at uhub? port ?		# Atheros AR9001U
@


1.963.2.5
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.963.2.4 2010/11/06 08:08:18 uebayasi Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.963.2.4 $"
a858 1
schide* 	at pci? dev ? function ?	# Intel SCH IDE controllers
@


1.962
log
@Remove ACPICA_PEDANTIC. Appears to be no longer in use.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.961 2010/01/21 12:02:25 pooka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.961 $"
d361 1
@


1.961
log
@remove accidentally committed bit.  pointed out by Patrick Welche
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.960 2010/01/19 22:06:20 pooka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.960 $"
a346 1
#options 	ACPICA_PEDANTIC		# force strict conformance to the Spec.
@


1.960
log
@Redefine bpf linkage through an always present op vector, i.e.
#if NBPFILTER is no longer required in the client.  This change
doesn't yet add support for loading bpf as a module, since drivers
can register before bpf is attached.  However, callers of bpf can
now be modularized.

Dynamically loadable bpf could probably be done fairly easily with
coordination from the stub driver and the real driver by registering
attachments in the stub before the real driver is loaded and doing
a handoff.  ... and I'm not going to ponder the depths of unload
here.

Tested with i386/MONOLITHIC, modified MONOLITHIC without bpf and rump.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.959 2010/01/07 18:49:30 tnn Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.959 $"
d93 1
a93 1
#options 	KTRACE		# system call tracing via ktrace(1)
@


1.959
log
@uhmodem(4) is superseded by u3g(4) and u3ginit(4).
Prepare for uhmodem(4) removal by not building it anymore.
This may fix PR kern/41174.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.958 2010/01/07 00:18:47 martin Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.958 $"
d93 1
a93 1
options 	KTRACE		# system call tracing via ktrace(1)
@


1.958
log
@Add the u3ginit driver to all configs which have the u3g driver
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.957 2010/01/03 03:53:34 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.957 $"
a1135 4
# Huawei E220 3G/HSDPA modem
uhmodem* at uhub? port ? configuration ? interface ?
ucom*	at uhmodem? portno ?

@


1.957
log
@Whitespace. Portions from Igor Sobrado in PR kern/22595.
Deploy <space><tab> where needed so columns don't teleport when
commenting or uncommenting things.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.956 2010/01/03 03:50:38 dholland Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.956 $"
d1239 1
@


1.956
log
@Assorted spelling/capitalization fixes from Igor Sobrado in PR kern/22595.
Merged by yours truly as the set of configs has changed quite a bit since
the PR was filed in 2003, and I may have missed some stuff. These changes
should probably be merged into other arches' configs; I'm not going to do
that now though.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.955 2009/12/23 01:04:46 pooka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.955 $"
d175 21
a195 21
#file-system 	FFS		# UFS
#file-system 	EXT2FS		# second extended file system (linux)
#file-system 	LFS		# log-structured file system
#file-system 	MFS		# memory file system
#file-system 	NFS		# Network File System client
#file-system 	NTFS		# Windows/NT file system (experimental)
#file-system 	CD9660		# ISO 9660 + Rock Ridge file system
#file-system 	MSDOSFS		# MS-DOS file system
#file-system 	FDESC		# /dev/fd
#file-system 	KERNFS		# /kern
#file-system 	NULLFS		# loopback file system
#file-system 	OVERLAY		# overlay file system
#file-system 	PROCFS		# /proc
#file-system 	UMAPFS		# NULLFS + uid and gid remapping
#file-system 	UNION		# union file system
#file-system 	CODA		# Coda File System; also needs vcoda (below)
#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
#file-system 	PTYFS		# /dev/ptm support
#file-system 	TMPFS		# Efficient memory file-system
#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system 	HFS		# experimental - Apple HFS+ (read-only)
d320 1
a320 1
#p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
d322 1
a322 1
#apm0	at mainbus0			# Advanced power management
d352 3
a354 3
acpiacad* 	at acpi?		# ACPI AC Adapter
acpibat* 	at acpi?		# ACPI Battery
acpibut* 	at acpi?		# ACPI Button
d360 2
a361 2
acpiecdt* 	at acpi?		# ACPI Embedded Controller (early binding)
acpilid* 	at acpi?		# ACPI Lid Switch
d369 2
a370 2
#com* 		at acpi?		# Serial communications interface
#fdc* 		at acpi?		# Floppy disk controller
d372 1
a372 1
hpet* 		at acpi?		# High Precision Event Timer
d374 1
a374 1
#lpt* 		at acpi?		# Parallel port
d377 1
a377 1
pckbc*  	at acpi?		# PC keyboard controller
d380 1
a380 1
ug* 		at acpi?		# Abit uGuru Hardware monitor
d383 2
a384 2
wss* 		at acpi?		# NeoMagic 256AV in wss mode
ym* 		at acpi?		# Yamaha OPL3-SA[23] audio
d387 2
a388 2
spic* 		at acpi?		# Sony Programmable I/O Controller
wsmouse* 	at spic?
d394 1
a394 1
vald* at acpi?
d547 1
a547 1
#wsdisplay* 	at machfb? console ?
d628 1
a628 1
ichsmb*	at pci? dev ? function ?
d632 1
a632 1
nfsmbc*	at pci? dev ? function ?
d668 1
a668 1
#viaenv*	at pci? dev ? function ?
d813 1
a813 1
jmide* 		at pci? dev ? function ?	# JMicron PCI-e PATA/SATA controllers
d815 1
a815 1
mvsata*		at pci? dev ? function ?	# Marvell Hercules-I/II
d824 1
a824 1
slide*  	at pci? dev ? function ?	# Symphony Labs IDE controllers
d838 1
a838 1
siisata* at cardbus? function ?			# SiI SteelVine controllers
d911 1
a911 1
bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
d1105 1
a1105 1
uhidev*	at uhub? port ? configuration ? interface ?
d1120 1
a1120 1
ucycom*	at uhidev? reportid ?
d1133 1
a1133 1
umodem*	at uhub? port ? configuration ?
d1145 1
a1145 1
uaudio*	at uhub? port ? configuration ?
d1184 1
a1184 1
uchcom*	at uhub? port ?		# WinChipHead CH341/CH340 serial adapter
d1206 1
a1206 1
uberry*	at uhub? port ?
d1212 1
a1212 1
uvisor*	at uhub? port ?
d1226 1
a1226 1
utoppy*	at uhub? port ?
d1229 1
a1229 1
uyap* at uhub? port ?
d1243 1
a1243 1
ugensa*	at uhub? port ?
d1249 1
a1249 1
oboe* 	at pci? dev ? function ?
d1254 1
a1254 1
fwohci*	at pci? dev ? function ?	# IEEE1394 Open Host Controller
d1257 1
a1257 1
fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
d1267 2
a1268 2
sdhc*  at pci?				# SD Host Controller
sdmmc* at sdhc?				# SD/MMC bus
d1281 1
a1281 1
azalia*	at pci? dev ? function ?	# High Definition Audio
d1352 1
a1352 1
#az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
d1354 1
a1354 1
#rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
d1358 1
a1358 1
#rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
d1360 1
a1360 1
#sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card
d1375 1
a1375 1
pseye* at uhub?			# Sony PLAYSTATION(R) Eye webcam
d1383 2
a1384 2
bktr* at pci? dev ? function ?
radio* at bktr?
d1475 2
a1476 2
pseudo-device 	crypto		# /dev/crypto device
pseudo-device	swcrypto	# software crypto implementation
@


1.955
log
@unifdef -D UGEN_BULK_RA_WB

Default behaviour unchanged, the feature must still be explicitly
enabled for a ugen fd.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.954 2009/12/05 20:11:15 pooka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.954 $"
d211 1
a211 1
options 	INET6		# IPV6
d533 1
a533 1
pckbc0		at isa?			# pc keyboard controller
d918 1
a918 1
ex*	at pci? dev ? function ?	# 3Com 90x[BC]
d970 1
a970 1
tr*	at isapnp?			# IBM/3COM TROPIC Token-Ring
d984 1
a984 1
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
d996 4
a999 4
eg0	at isa? port 0x280 irq 9		# 3C505 Ethernet cards
el0	at isa? port 0x300 irq 9		# 3C501 Ethernet cards
ep*	at isa? port ? irq ?			# 3C509 Ethernet cards
ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
d1017 1
a1017 1
tr*	at isa? port ? irq ?			# 3COM TROPIC based Token-Ring
d1024 1
a1024 1
ex*	at cardbus? function ?	# 3Com 3C575TX
d1514 2
a1515 2
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith			# IPv[46] tcp relay translation i/f
@


1.954
log
@Remove the portalfs kernel file system driver.  Replace mount_portal(8)
with a version based on puffs.  User functionality remains the same.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.953 2009/11/30 16:19:55 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.953 $"
a1236 2
# On ugen bulk endpoints, perform read-ahead and write-behind.
options 	UGEN_BULK_RA_WB
@


1.953
log
@Add udl(4) and wsdisplay(4) as its child.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.952 2009/11/21 12:15:55 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.952 $"
a186 1
#file-system 	PORTAL		# portal filesystem (still experimental)
@


1.952
log
@- more options<space><tab>
- capitalize Ethenet
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.951 2009/11/21 12:09:15 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.951 $"
d1126 4
@


1.951
log
@- use options<space><tab>
- remove an extra whitespace
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.950 2009/10/03 13:37:27 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.950 $"
d927 1
a927 1
jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
d997 3
a999 3
eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
ep*	at isa? port ? irq ?			# 3C509 ethernet cards
d1013 1
a1013 1
ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
d1235 1
a1235 1
options UGEN_BULK_RA_WB
d1571 6
a1576 6
options VERIFIED_EXEC_FP_RMD160
options VERIFIED_EXEC_FP_SHA256
options VERIFIED_EXEC_FP_SHA384
options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
@


1.950
log
@Enable viapcib
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.949 2009/10/02 18:50:49 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.949 $"
d30 4
a33 4
no options	EXEC_AOUT       # exec a.out binaries
no options	EXEC_ELF32      # exec ELF binaries
no options	EXEC_SCRIPT     # exec #! scripts
no options	COREDUMP
d100 2
a101 2
no options	AIO		# POSIX asynchronous I/O, built as a module
no options	MQUEUE		# POSIX messsage queues, built as a module
d103 1
a103 1
options		MODULAR		# new style module framework
d308 2
a309 2
#options	KEYLOCK
#options	secmodel_keylock	# Requires options KEYLOCK
d814 1
a814 1
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
d850 1
a850 1
options	ATADEBUG
d1494 2
a1495 2
options		MEMORY_DISK_HOOKS	# enable root ramdisk
options		MEMORY_DISK_DYNAMIC	# loaded via kernel module
@


1.949
log
@Add and enable options VIA_C7TEMP
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.948 2009/10/02 16:47:52 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.948 $"
d467 2
a468 2
#viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
d490 1
a490 1
#isa0	at viapcib?
@


1.948
log
@PR# kern/42139: ACPI WMI: new driver

Import acpiwmi(4) from Jukka Ruohonen. From the PR:

Attached is a driver that implements ACPI WMI API:

http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx

The WMI is used to provide a generic interface for OEMs to use certain
platform/laptop-specific additions to the standard ACPI in a somewhat
portable way. These can be hotkeys for additional buttons, different event
handlers (wireless kill switch, lid switch, etc.), and so on. At least HP
and Acer use it by default nowadays.

The benefit of this interface would be portability. For an example, instead
of hpqlb(4) that works only with certain HP models, we could have a generic
HP WMI-driver that should work in theory across all HP laptops. On many new
laptops WMI may also be the only way to access laptop/manufacturer-specific
features.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.947 2009/09/30 22:19:00 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.947 $"
d625 3
@


1.947
log
@Need sdmmc* at wb?
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.946 2009/09/30 20:47:10 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.946 $"
d364 1
@


1.946
log
@add and enable wb(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.945 2009/09/20 01:14:31 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.945 $"
d382 1
@


1.945
log
@add toshide
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.944 2009/09/07 22:59:09 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.944 $"
d381 1
@


1.944
log
@Switch on hdaudio(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.943 2009/09/07 10:40:54 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.943 $"
d822 1
@


1.943
log
@Refer to hdaudio as 'High Definition Audio', not
'Intel High Definition Audio' as many vendors implement the HD audio spec.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.942 2009/09/06 17:25:56 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.942 $"
d1318 2
a1319 2
#hdaudio*	at pci? dev ? function ?	# High Definition Audio
#hdafg*		at hdaudiobus?
@


1.942
log
@hdaudio(4) is a standards-compliant driver for Intel High Definition Audio.
It will replace azalia(4) after testing.

To use, comment out azalia in your kernel configuration and uncomment the
hdaudio and hdafg lines so it reads:

# Intel High Definition Audio
hdaudio*	at pci? dev ? function ?
hdafg*		at hdaudiobus?

You should also:
cd /dev
sh MAKEDEV audio
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.941 2009/08/15 08:44:35 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.941 $"
d1317 2
a1318 2
# Intel High Definition Audio
#hdaudio*	at pci? dev ? function ?	# Intel High Definition Audio
@


1.941
log
@Add commented entries for keylock support.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.940 2009/07/29 11:58:31 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.940 $"
d1317 4
@


1.940
log
@Fix (commented out) gpioow usage.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.939 2009/07/29 11:55:40 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.939 $"
d307 4
d689 3
@


1.939
log
@Add commented out entries for gpiosim and gpio at gpiosim.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.938 2009/07/27 12:34:13 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.938 $"
d678 2
a679 1
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
@


1.938
log
@Support Marvell Hercules-I/II SATA Controllers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.937 2009/07/19 06:28:08 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.937 $"
d675 1
d1522 1
@


1.937
log
@Support siisata@@cardbus.
  It tested on amd64 and i386 only.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.936 2009/07/19 02:50:44 rmind Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.936 $"
d801 1
@


1.936
log
@Make POSIX message queues a kernel module.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.935 2009/07/18 16:31:42 reinoud Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.935 $"
d822 1
@


1.935
log
@Import read-only part of the NiLFS (v2) implementation for NetBSD. It has been
tested with a DEBUG+DIAGNOSTIC+LOCKDEBUG kernel. To summerise NiLFS, i'll
repeat my posting to tech-kern here:

NiLFS stands for New implementation of Logging File System; LFS done
right they claim :) It is at version 2 now and is being developed by NTT, the
Japanese telecom company and recently put into the linux source tree. See
http://www.nilfs.org. The on-disc format is not completely frozen and i expect
at least one minor revision to come in time.

The benefits of NiLFS are build-in fine-grained checkpointing, persistent
snapshots, multiple mounts and very large file and media support. Every
checkpoint can be transformed into a snapshot and v.v. It is said to perform
very well on flash media since it is not overwriting pieces apart from a
incidental update of the superblock, but that might change. It is accompanied
by a cleaner to clean up the segments and recover lost space.

My work is not a port of the linux code; its a new implementation. Porting the
code would be more work since its very linux oriented and never written to be
ported outside linux. The goal is to be fully interchangable. The code is non
intrusive to other parts of the kernel. It is also very light-weight.

The current state of the code is read-only access to both clean and dirty
NiLFS partitions. On mounting a dirty partition it rolls forward the log to
the last checkpoint. Full read-write support is however planned!

Just as the linux code, mount_nilfs allows for the `head' to be mounted
read/write and allows multiple read-only snapshots/checkpoint mounts next to
it.

By allowing the RW mount at a different snapshot for read-write it should be
possible eventually to revert back to a previous state; i.e. try to upgrade a
system and being able to revert to the exact state prior to the upgrade.

Compared to other FS's its pretty light-weight, suitable for embedded use and
on flash media. The read-only code is currently 17kb object code on
NetBSD/i386. I doubt the read-write code will surpass the 50 or 60. Compared
this to FFS being 156kb, UDF being 84 kb and NFS being 130kb. Run-time memory
usage is most likely not very different from other uses though maybe a bit
higher than FFS.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.934 2009/04/21 03:00:29 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.934 $"
d100 2
a101 1
no options	AIO		# POSIX AIO, built as a module
@


1.934
log
@Added SD/MMC support from OpenBSD.
tested on i386, amd64 at current-users ML by pgoyette@@.
tested on zaurus by myself.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.933 2009/04/20 20:49:21 cegger Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.933 $"
d196 1
@


1.933
log
@add ale(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.932 2009/04/10 23:00:53 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.932 $"
d1243 9
d1368 3
d1379 1
@


1.932
log
@add commented out LOCKDEBUG
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.931 2009/03/29 15:45:08 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.931 $"
d888 1
@


1.931
log
@Unfuck compat some more
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.930 2009/03/27 21:04:35 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.930 $"
d123 1
@


1.930
log
@Remove -mtune, we'll let the compiler pick a good default (the current
default sucks).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.929 2009/03/17 20:04:39 dyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.929 $"
d149 1
a149 1
#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
@


1.929
log
@Reactivate native compatibility in GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.928 2009/03/06 09:58:14 cegger Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.928 $"
a28 3
makeoptions 	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
							# tune for more modern

@


1.928
log
@add age(4) and atphy(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.927 2009/02/16 23:40:14 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.927 $"
d139 13
a151 13
#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
#options 	COMPAT_09	# NetBSD 0.9
#options 	COMPAT_10	# NetBSD 1.0
#options 	COMPAT_11	# NetBSD 1.1
#options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
#options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
#options 	COMPAT_14	# NetBSD 1.4
#options 	COMPAT_15	# NetBSD 1.5
#options 	COMPAT_16	# NetBSD 1.6
#options 	COMPAT_20	# NetBSD 2.0
#options 	COMPAT_30	# NetBSD 3.0
#options 	COMPAT_40	# NetBSD 4.0
#options 	COMPAT_50	# NetBSD 5.0
@


1.927
log
@Fix typo in genfb line
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.926 2009/02/16 22:43:47 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.926 $"
d888 1
d1027 1
@


1.926
log
@Add and enable genfb(4), and remove vesafb(4) section.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.925 2009/02/07 09:58:10 mrg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.925 $"
d536 1
a536 1
genfb*		at pci? def ? function ?
@


1.925
log
@move COMPAT_50 into MONOLITHIC, as pointed out by enami@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.924 2009/01/29 21:48:13 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.924 $"
d536 1
d540 1
a544 10
# VESA framebuffer console
#options 	KVM86			# required for vesabios
#vesabios*	at vesabiosbus?
#vesafb* 	at vesabios?
#options 	VESAFB_WIDTH=640
#options 	VESAFB_HEIGHT=480
#options 	VESAFB_DEPTH=8
#options 	VESAFB_PM		# power management support
#wsdisplay*	at vesafb? console ?

@


1.925.2.1
log
@Sync with HEAD.

Commit is split, to avoid a "too many arguments" protocol error.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.934 2009/04/21 03:00:29 nonaka Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.934 $"
d29 3
a125 1
#options 	LOCKDEBUG	# expensive locking checks/support
d139 14
a152 14
options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
options 	COMPAT_09	# NetBSD 0.9
options 	COMPAT_10	# NetBSD 1.0
options 	COMPAT_11	# NetBSD 1.1
options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
options 	COMPAT_14	# NetBSD 1.4
options 	COMPAT_15	# NetBSD 1.5
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
options 	COMPAT_30	# NetBSD 3.0
options 	COMPAT_40	# NetBSD 4.0
options 	COMPAT_50	# NetBSD 5.0
options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
a535 1
genfb*		at pci? dev ? function ?
a538 1
wsdisplay*	at wsemuldisplaydev?
d543 10
a895 1
age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
a896 1
ale*	at pci? dev ? function ?	# Attansic/Atheros L1E Ethernet
a1033 1
atphy*	at mii? phy ?			# Attansic/Atheros PHYs
a1249 9
# SD/MMC/SDIO Controller and Device support

# SD/MMC controller
sdhc*  at pci?				# SD Host Controller
sdmmc* at sdhc?				# SD/MMC bus

ld*	at sdmmc?


a1365 3
# Bluetooth SDIO Controller
sbt* at sdmmc?

a1373 1
bthub* at sbt?
@


1.925.2.2
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.937 2009/07/19 06:28:08 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.937 $"
d100 1
a100 2
no options	AIO		# POSIX asynchronous I/O, built as a module
no options	MQUEUE		# POSIX messsage queues, built as a module
a195 1
#file-system	NILFS		# experimental - NTT's NiLFS(2)
a819 1
siisata* at cardbus? function ?			# SiI SteelVine controllers
@


1.925.2.3
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.950 2009/10/03 13:37:27 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.950 $"
a306 4
# Keylock support
#options	KEYLOCK
#options	secmodel_keylock	# Requires options KEYLOCK

a359 1
acpiwmi*	at acpi?		# ACPI WMI Mapper
a376 2
wb*		at acpi?		# Winbond W83L518D SD/MMC reader
sdmmc*		at wb?			# SD/MMC bus
d460 2
a461 2
viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
iic*	at viapcib?
d483 1
a483 1
isa0	at viapcib?
a617 3
# VIA C7 Temperature sensor
options 	VIA_C7TEMP

a674 1
#gpio*	at gpiosim?
d677 1
a677 2
#gpioow* 	at gpio? offset ? mask ?	# 1-wire bitbanging via gpio
#gpioow* 	at gpio?
a682 3
# Keylock support
#gpiolock*	at gpio?

a800 1
mvsata*		at pci? dev ? function ?	# Marvell Hercules-I/II
a811 1
toshide*	at pci? dev ? function ?	# TOSHIBA PICCOLO controllers
a1306 4
# High Definition Audio
hdaudio*	at pci? dev ? function ?	# High Definition Audio
hdafg*		at hdaudiobus?

a1519 1
#pseudo-device	gpiosim		1	# GPIO simulator
@


1.925.2.4
log
@Sync with HEAD. TODO before merge:
- shortcut for suspend code in sysmon, when powerd(8) is not running.
Borrow ``xs_watch'' thread context?
- bug hunting in xbd + xennet resume. Rings are currently thrashed upon
resume, so current implementation force flush them on suspend. It's not
really needed.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1026 2011/03/06 17:08:25 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1026 $"
d39 15
a53 8
# CPU features
#acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
coretemp*	at cpu?		# Intel on-die thermal sensor
est0		at cpu0		# Intel Enhanced SpeedStep (non-ACPI)
#odcm0		at cpu0		# On-demand clock modulation
#padlock0	at cpu0		# VIA PadLock
powernow0	at cpu0		# AMD PowerNow! and Cool'n'Quiet (non-ACPI)
viac7temp*	at cpu?		# VIA C7 temperature sensor
d174 23
a196 23
file-system	FFS		# UFS
file-system	NFS		# Network File System client
# File systems, built as module(7)s by default
#file-system	EXT2FS		# second extended file system (linux)
#file-system	LFS		# log-structured file system
#file-system	MFS		# memory file system
#file-system	NTFS		# Windows/NT file system (experimental)
#file-system	CD9660		# ISO 9660 + Rock Ridge file system
#file-system	MSDOSFS		# MS-DOS file system
#file-system	FDESC		# /dev/fd
#file-system	KERNFS		# /kern
#file-system	NULLFS		# loopback file system
#file-system	OVERLAY		# overlay file system
#file-system	PROCFS		# /proc
#file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
#file-system	UMAPFS		# NULLFS + uid and gid remapping
#file-system	UNION		# union file system
#file-system	CODA		# Coda File System; also needs vcoda (below)
#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
#file-system	PTYFS		# /dev/ptm support
#file-system	TMPFS		# Efficient memory file-system
#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system	HFS		# experimental - Apple HFS+ (read-only)
d200 1
a200 2
#options 	QUOTA		# legacy UFS quotas
#options 	QUOTA2		# new, in-filesystem UFS quotas
d305 1
d353 3
a355 3
acpiacad*	at acpi?		# ACPI AC Adapter
acpibat*	at acpi?		# ACPI Battery
acpibut*	at acpi?		# ACPI Button
a363 3
acpivga*	at acpi?		# ACPI Display Adapter
acpiout*	at acpivga?		# ACPI Display Output Device
acpiwdrt*	at acpi?		# ACPI Watchdog Resource Table
d384 2
a385 6
wmidell*	at acpiwmibus?		# Dell WMI mappings
wmieeepc*	at acpiwmibus?		# Asus Eee PC WMI mappings
#wmihp*		at acpiwmibus?		# HP WMI mappings
wmimsi*		at acpiwmibus?		# MSI WMI mappings
wss*		at acpi?		# NeoMagic 256AV in wss mode
ym*		at acpi?		# Yamaha OPL3-SA[23] audio
a543 1
options 	VCONS_DRAW_INTR
a559 11
# DRI driver
i915drm*	at drm?		# Intel i915, i945 DRM driver
mach64drm*	at drm?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm*		at drm?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at drm?		# ATI Rage 128 DRM driver
radeondrm*	at drm?		# ATI Radeon DRM driver
savagedrm*	at drm?		# S3 Savage DRM driver
sisdrm*		at drm?		# SiS DRM driver
tdfxdrm*	at drm?		# 3dfx (voodoo) DRM driver
viadrm*		at drm?		# VIA DRM driver

d622 6
a654 7
# Winbond LPC Super I/O
#wbsio*	at isa? port 0x2e
#wbsio*	at isa? port 0x4e

# IBM Hawk Integrated Systems Management Processor
#ibmhawk0	at iic?	addr 0x37

a907 1
alc*	at pci? dev ? function ?	# Attansic/Atheros L1C/L2C Ethernet
a913 1
bwi*	at pci? dev ? function ?	# Broadcom BCM43xx wireless
a952 1
vte*	at pci? dev ? function ?	# RDC R6040 10/100 Ethernet
a1065 1
rdcphy*	at mii? phy ?			# RDC R6040 10/100 PHY
d1280 1
a1280 1
#azalia* at pci? dev ? function ?	# High Definition Audio
@


1.925.2.5
log
@More sync fixes. And add the mbr_gpt files.
@
text
@d29 5
a33 5
no options 	EXEC_AOUT	# exec a.out binaries, built as module(7)
no options 	COREDUMP	# coredump support, built as module(7)
# Common binary formats are statically compiled in by default.
#no options 	EXEC_ELF32	# exec ELF 32-bits binaries
#no options 	EXEC_SCRIPT	# exec #! scripts
a37 1
#options 	PAE		# PAE mode (36 bits physical addressing)
d93 2
a94 2
no options 	AIO		# POSIX asynchronous I/O, built as a module(7)
no options 	MQUEUE		# POSIX messsage queues, built as a module(7)
d96 1
a96 1
options 	MODULAR		# new style module(7) framework
d130 1
a130 1
# Compatibility options, built as module(7)s by default
a168 1
file-system	TMPFS		# Efficient memory file-system
d187 1
d206 1
a206 1
options 	INET6		# IPv6
a210 1
#options	MPLS		# MultiProtocol Label Switching (needs ifmpls)
a221 1
options 	IPFILTER_COMPAT # Compat for IP-Filter
d297 1
a297 1
# enable splash screen support; requires genfb or radeonfb
d301 2
a302 2
#options 	KEYLOCK
#options 	secmodel_keylock	# Requires options KEYLOCK
d314 1
a314 1
#p64h2apic*	at pci? dev? function?	# P64H2 IOxAPIC
d316 1
a316 1
#apm0		at mainbus0		# Advanced power management
d341 1
d350 6
a355 6
acpiec* 	at acpi?		# ACPI Embedded Controller (late)
acpiecdt*	at acpi?		# ACPI Embedded Controller (early)
acpifan* 	at acpi?		# ACPI Fan
acpilid*	at acpi?		# ACPI Lid Switch
#acpipmtr*	at acpi?		# ACPI Power Meter (experimental)
#acpismbus*	at acpi?		# ACPI SMBus CMI (experimental)
d363 1
a363 1
aibs*		at acpi?		# ASUSTeK AI Booster hardware monitor
d366 2
a367 4
#com*		at acpi?		# Serial communications interface
#fdc*		at acpi?		# Floppy disk controller
fujbp*		at acpi?		# Fujitsu Brightness & Pointer
fujhk*		at acpi?		# Fujitsu Hotkeys
d369 1
a369 1
hpet*		at acpi?		# High Precision Event Timer
d371 1
a371 1
#lpt*		at acpi?		# Parallel port
d374 1
a374 1
pckbc*		at acpi?		# PC keyboard controller
a375 1
sony*		at acpi?		# Sony Miscellaneous Controller
d377 1
a377 2
ug*		at acpi?		# Abit uGuru Hardware monitor
vald*		at acpi?		# Toshiba Libretto hotkeys
d388 8
a395 2
spic*		at acpi?		# Sony Programmable I/O Controller
wsmouse*	at spic?
d460 1
a460 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-LPC w/ timecounter,
a461 1
fwhrng* at ichlpcib?		# Intel 82802 FWH Random Number Generator
d534 1
a534 1
pckbc0		at isa?			# PC keyboard controller
d549 1
a549 1
#wsdisplay*	at machfb? console ?
d632 1
a632 5
iic*	at amdpm?

# Acer Labs M7101 SMBus controller
alipm*	at pci? dev ? function ?
iic*	at alipm?
d635 1
a635 1
ichsmb* at pci? dev ? function ?
d639 1
a639 1
nfsmbc* at pci? dev ? function ?
d669 1
a669 3
# 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
#lm*	at wbsio?
a673 4
# SMSC LPC47M192 hardware monitor
#smscmon*	at iic? addr 0x2c
#smscmon*	at iic? addr 0x2d	# (alternate address)

d682 1
a682 1
#viaenv* 	at pci? dev ? function ?
a688 4
#spdmem* at iic? addr 0x54
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
d827 1
a827 1
jmide*		at pci? dev ? function ?	# JMicron PCI-e PATA/SATA controllers
d829 1
a829 1
mvsata* 	at pci? dev ? function ?	# Marvell Hercules-I/II
a835 1
schide* 	at pci? dev ? function ?	# Intel SCH IDE controllers
d838 1
a838 1
slide*		at pci? dev ? function ?	# Symphony Labs IDE controllers
d852 1
a852 1
siisata* at cardbus? function ? 		# SiI SteelVine controllers
d863 1
a863 1
options 	ATADEBUG
d926 1
a926 1
bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
d934 1
a934 2
et*	at pci? dev ? function ?	# Agere/LSI ET1310/ET1301 Gigabit
ex*	at pci? dev ? function ?	# 3Com 3c90x[BC]
d942 1
a942 1
jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 Ethernet
d987 1
a987 1
tr*	at isapnp?			# IBM/3Com TROPIC Token-Ring
d1001 1
a1001 1
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLAN/IEEE (802.11)
d1013 4
a1016 4
eg0	at isa? port 0x280 irq 9		# 3c505 Ethernet cards
el0	at isa? port 0x300 irq 9		# 3c501 Ethernet cards
ep*	at isa? port ? irq ?			# 3c509 Ethernet cards
ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3c507
d1029 1
a1029 1
ne0	at isa? port 0x280 irq 9		# NE[12]000 Ethernet cards
d1034 1
a1034 1
tr*	at isa? port ? irq ?			# 3Com TROPIC based Token-Ring
d1041 1
a1041 1
ex*	at cardbus? function ?	# 3Com 3c575TX
a1066 1
etphy*	at mii? phy ?			# Agere/LSI ET1011 TruePHY Gig-E PHYs
a1072 1
ihphy*	at mii? phy ?			# Intel 82577 PHYs
d1123 1
a1123 1
uhidev* at uhub? port ? configuration ? interface ?
a1136 3
# USB TEMPer and TEMPerHUM
uthum*	at uhidev? reportid ?

d1138 1
a1138 1
ucycom* at uhidev? reportid ?
a1142 4
# USB LCDs and USB-VGA adaptors
udl*	at uhub? port ?		# DisplayLink DL-1x0/1x5
wsdisplay* at udl?

d1147 1
a1147 1
umodem* at uhub? port ? configuration ?
d1150 3
a1152 2
# Option N.V. Wireless WAN modems
uhso*	at uhub? port ? configuration ?
d1159 1
a1159 2
uaudio* at uhub? port ? configuration ?
uaudio* at usbifif?
a1186 1
otus*	at uhub? port ?		# Atheros AR9001U
a1188 1
upgt*	at uhub? port ?		# Intersil PrismGT
d1198 1
a1198 1
uchcom* at uhub? port ? 	# WinChipHead CH341/CH340 serial adapter
d1220 1
a1220 1
uberry* at uhub? port ?
d1226 1
a1226 1
uvisor* at uhub? port ?
d1240 1
a1240 1
utoppy* at uhub? port ?
d1243 1
a1243 1
uyap*	at uhub? port ?
d1251 2
a1254 1
u3ginit* at uhub? port ?
d1259 1
a1259 1
ugensa* at uhub? port ?
d1265 1
a1265 1
oboe*	at pci? dev ? function ?
d1270 1
a1270 1
fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
d1273 1
a1273 1
fwohci* at cardbus? function ?		# IEEE1394 Open Host Controller
d1282 3
a1284 5
# PCI SD/MMC controller
sdhc*	at pci?				# SD Host Controller

# CardBus SD/MMC controller
sdhc*	at cardbus? function ?		# SD Host Controller
a1285 1
sdmmc*	at sdhc?			# SD/MMC bus
d1368 1
a1368 1
#az0	at isa? port 0x350	# Aztech/PackardBell FM Radio Card
d1370 1
a1370 1
#rt0	at isa? port 0x20c	# AIMS Lab Radiotrack & compatible
d1374 1
a1374 1
#rtii0	at isa? port 0x20c	# AIMS Lab Radiotrack II FM Radio Card
d1376 1
a1376 1
#sf2r0	at isa? port 0x384	# SoundForte RadioLink SF16-FMR2 FM Radio Card
d1391 1
a1391 1
pseye* at uhub? 		# Sony PLAYSTATION(R) Eye webcam
a1392 1
auvitek* at uhub?		# Auvitek AU0828 video capture devices
d1399 2
a1400 2
bktr*	at pci? dev ? function ?
radio*	at bktr?
a1433 4
# Bluetooth Apple Magic Mouse
btmagic* at bthub?
wsmouse* at btmagic? mux 0

d1491 2
a1492 2
pseudo-device 	crypto			# /dev/crypto device
pseudo-device	swcrypto		# software crypto implementation
d1508 1
a1508 1
pseudo-device	fss			# file system snapshot device
d1510 3
a1512 3
pseudo-device	md			# memory disk device (ramdisk)
options 	MEMORY_DISK_HOOKS	# enable root ramdisk
options 	MEMORY_DISK_DYNAMIC	# loaded via kernel module(7)
a1516 3
# NPF
#pseudo-device	npf

a1521 1
#pseudo-device	ifmpls			# MPLS pseudo-interface
a1523 1
#options	PPPOE_SERVER            # Enable PPPoE server via link0
d1530 2
a1531 2
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
#pseudo-device	faith			# IPv[46] TCP relay translation i/f
a1538 1
#pseudo-device 	etherip 		# Tunnel Ethernet over IP
d1543 1
a1543 1
# accept filters, built as module(7)s by default
d1573 3
d1588 6
a1593 6
options 	VERIFIED_EXEC_FP_RMD160
options 	VERIFIED_EXEC_FP_SHA256
options 	VERIFIED_EXEC_FP_SHA384
options 	VERIFIED_EXEC_FP_SHA512
options 	VERIFIED_EXEC_FP_SHA1
options 	VERIFIED_EXEC_FP_MD5
@


1.925.2.6
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1031 2011/04/26 16:57:40 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1031 $"
d41 1
a41 1
acpicpu*	at cpu?		# ACPI CPU (including frequency scaling)
d154 3
d158 1
a469 2
rdcpcib* at pci? dev ? function ?	# RDC Vortex86/PMX-1000 PCI-ISA w/
					# watchdog
a491 1
isa0	at rdcpcib?
a849 1
rdcide* 	at pci? dev ? function ?	# RDC PMX-1000 IDE controllers
@


1.925.2.7
log
@Sync with HEAD. Most notably: uvm/pmap work done by rmind@@, and MP Xen
work of cherry@@.

No regression observed on suspend/restore.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.1049 2011/08/27 09:28:55 mbalmer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.1049 $"
d29 6
d93 3
a95 1
options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
d116 1
a116 2
options 	DIAGNOSTIC	# expensive kernel consistency checks
				# XXX to be commented out on release branch
d126 1
a126 1
#makeoptions	DEBUG="-g"	# compile full symbol table
d131 1
a131 1
# Compatibility options
d149 5
a153 5
options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
options 	COMPAT_SVR4	# binary compatibility with SVR4
options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
options 	COMPAT_LINUX	# binary compatibility with Linux
options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
a165 17
file-system	EXT2FS		# second extended file system (linux)
file-system	LFS		# log-structured file system
file-system	MFS		# memory file system
file-system	NTFS		# Windows/NT file system (experimental)
file-system	CD9660		# ISO 9660 + Rock Ridge file system
file-system	MSDOSFS		# MS-DOS file system
file-system	FDESC		# /dev/fd
file-system	KERNFS		# /kern
file-system	NULLFS		# loopback file system
file-system	OVERLAY		# overlay file system
file-system	PROCFS		# /proc
file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
file-system	UMAPFS		# NULLFS + uid and gid remapping
file-system	UNION		# union file system
file-system	CODA		# Coda File System; also needs vcoda (below)
file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system	PTYFS		# /dev/ptm support
d167 18
a187 1
#file-system	V7FS		# 7th Edition(V7) File System
d190 2
a191 2
options 	QUOTA		# legacy UFS quotas
options 	QUOTA2		# new, in-filesystem UFS quotas
d195 1
a195 1
options 	NFSSERVER	# Network File System server
a198 1
#options 	V7FS_EI		# V7FS Endian Independent support
d208 1
a208 1
#options 	MPLS		# MultiProtocol Label Switching (needs ifmpls)
d337 1
a337 1
acpi0		at mainbus0
d350 1
a350 1
acpifan*	at acpi?		# ACPI Fan
d368 2
a369 4
#hpacel*	at acpi?		# HP 3D DriveGuard accelerometer
#hpqlb*		at acpi?		# HP Quick Launch Buttons
hpet*		at acpihpetbus?		# High Precision Event Timer (table)
hpet*		at acpinodebus?		# High Precision Event Timer (device)
d375 1
a375 1
pcppi*		at acpi?		# AT-style speaker sound
d384 2
a385 2
wmihp*		at acpiwmibus?		# HP WMI mappings
wmimsi* 	at acpiwmibus?		# MSI WMI mappings
d448 1
a448 1
gpio*	at elansc?
d451 1
a451 1
amdtemp* at pchb?			# AMD CPU Temperature sensors
d455 1
a455 1
#hpet*	at amdpcib?
d459 1
a459 1
#hpet*	at ichlpcib?
d461 1
a461 1
gpio*	at gcscpcib?			# timecounter, watchdog and GPIO
d463 1
a463 1
gscpcib* at pci? dev ? function ?	# NS Geode SC1100 PCI-ISA w/ GPIO
d476 1
a476 3
pwdog*	at pci ? dev ? function ?	# QUANCOM PWDOG1

agp*	at pchb?
d484 2
a485 2
#isa0	at amdpcib?
isa0	at gcscpcib?
d554 2
a555 2
#unichromefb*	at pci? dev ? function ?
#wsdisplay*	at unichromefb?
d564 1
a564 1
mgadrm* 	at drm?		# Matrox G[24]00, G[45]50 DRM driver
d568 1
a568 1
sisdrm* 	at drm?		# SiS DRM driver
d570 1
a570 1
viadrm* 	at drm?		# VIA DRM driver
d657 1
a657 1
#aps0	at isa? port 0x1600
d689 1
a689 1
#ug0	at isa? port 0xe0
d711 1
a711 1
gpio*	at gscpcib?
d716 2
a717 2
gpioow* 	at gpio?
onewire*	at gpioow?
d720 1
a720 5
owtemp* 	at onewire?			# Temperature sensors

# i2c support
gpioiic*	at gpio?
iic*		at gpioiic?
d756 1
a756 1
spc*	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI
d759 1
a759 1
aha*	at isapnp?			# Adaptec AHA-154[02
d831 3
a833 3
aceride*	at pci? dev ? function ?	# Acer Lab IDE controllers
ahcisata*	at pci? dev ? function ?	# AHCI SATA controllers
artsata*	at pci? dev ? function ?	# Intel i31244 SATA controller
d836 2
a837 2
gcscide*	at pci? dev ? function ?	# AMD CS5535 Companion IDE controllers
geodeide*	at pci? dev ? function ?	# AMD Geode IDE controllers
d842 1
a842 1
ahcisata*	at jmide?
d844 2
a845 2
optiide*	at pci? dev ? function ?	# Opti IDE controllers
piixide*	at pci? dev ? function ?	# Intel IDE controllers
d855 1
a855 1
svwsata*	at pci? dev ? function ?	# ServerWorks SATA controllers
d941 1
a941 1
bce*	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
d943 1
a943 1
bnx*	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
d966 1
a966 1
#ndis*	at pci? dev ? function ?	# Experimental - NDIS Network Driver
d1101 1
a1101 1
rdcphy* at mii? phy ?			# RDC R6040 10/100 PHY
d1188 1
a1188 1
umidi*	at uhub? port ? configuration ?
d1192 1
a1192 1
uirda*	at uhub? port ? configuration ? interface ?
d1199 1
a1199 1
ustir*	at uhub? port ?
a1201 4
# Windows Media Center IR transceiver
irmce*	at uhub? port ?
cir*	at irmce?

a1209 1
urndis*	at uhub? port ?		# Microsoft RNDIS specification
d1421 1
a1421 1
pseye*	at uhub?		# Sony PLAYSTATION(R) Eye webcam
d1423 1
a1432 3
# Conexant CX2388[0-3]-based DTV cards
#cxdtv*	at pci? dev ? function ?
#iic*	at cxdtv?
a1444 1
aubtfwl* at uhub? port ?
a1543 1
pseudo-device	putter			# for puffs and pud
d1563 1
a1563 1
#options 	PPPOE_SERVER		# Enable PPPoE server via link0
d1584 3
a1586 3
# accept filters
pseudo-device	accf_data		# "dataready" accept filter
pseudo-device	accf_http		# "httpready" accept filter
d1602 1
a1602 1
pseudo-device	vcoda		4	# coda minicache <-> venus comm.
d1605 1
a1605 1
pseudo-device	nsmb			# experimental - SMB requester
@


1.924
log
@Enable BUFQ_PRIOCSCAN by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.923 2009/01/24 05:06:06 mrg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.923 $"
d151 1
a151 1
options 	COMPAT_50	# NetBSD 5.0 compatibility.
@


1.923
log
@add COMPAT_50 to all the configs with COMPAT_40.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.922 2008/12/28 15:18:21 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.922 $"
d118 2
a119 2
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Likely stable but not yet the default.
d121 1
a121 1
#options 	BUFQ_PRIOCSCAN
@


1.922
log
@PR# port-i386/40284: add AMD Geode CS5536 audio driver; add gcscaudio(4)
to i386 GENERIC and ALL kernels
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.921 2008/12/14 00:44:29 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.921 $"
d151 1
@


1.921
log
@add options PMS_ELANTECH_TOUCHPAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.920 2008/11/25 02:47:19 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.920 $"
d1267 1
@


1.920
log
@Don't compile PPP compressors in by default, they'll be auto-loaded.  This
saves an incredible 10k of text and data.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.919 2008/11/24 11:41:11 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.919 $"
d531 1
@


1.919
log
@Remove softdep, pass 1. We are focused on improving journalling.

Proposed on tech-kern@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.918 2008/11/21 15:55:59 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.918 $"
d221 2
a222 2
options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP
@


1.918
log
@Remove the following from i386 GENERIC since they are also provided by
modules. Shrinks the kernel by 1278kB. XXX Need to further investigate
situation with vcoda and nsmb.

- all file systems
- all exec formats
- all compat code
- POSIX AIO
- the NFS server
- accept filters
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.917 2008/11/12 14:36:31 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.917 $"
a200 1
#options 	SOFTDEP		# FFS soft updates support.
@


1.917
log
@Comment out P1003_1B_SEMAPHORE. The ksem module will now be autoloaded from
the file system if POSIX semaphores are used.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.916 2008/11/12 12:36:01 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.916 $"
d32 6
d103 1
a105 1
options 	APM_NO_IDLE	# needed for SMP
d138 14
a151 14
# Compatibility options
options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
options 	COMPAT_09	# NetBSD 0.9
options 	COMPAT_10	# NetBSD 1.0
options 	COMPAT_11	# NetBSD 1.1
options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
options 	COMPAT_14	# NetBSD 1.4
options 	COMPAT_15	# NetBSD 1.5
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
options 	COMPAT_30	# NetBSD 3.0
options 	COMPAT_40	# NetBSD 4.0
options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
d155 5
a159 5
options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
options 	COMPAT_SVR4	# binary compatibility with SVR4
options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
options 	COMPAT_LINUX	# binary compatibility with Linux
options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
d174 21
a194 21
# File systems
file-system 	FFS		# UFS
file-system 	EXT2FS		# second extended file system (linux)
file-system 	LFS		# log-structured file system
file-system 	MFS		# memory file system
file-system 	NFS		# Network File System client
file-system 	NTFS		# Windows/NT file system (experimental)
file-system 	CD9660		# ISO 9660 + Rock Ridge file system
file-system 	MSDOSFS		# MS-DOS file system
file-system 	FDESC		# /dev/fd
file-system 	KERNFS		# /kern
file-system 	NULLFS		# loopback file system
file-system 	OVERLAY		# overlay file system
file-system 	PORTAL		# portal filesystem (still experimental)
file-system 	PROCFS		# /proc
file-system 	UMAPFS		# NULLFS + uid and gid remapping
file-system 	UNION		# union file system
file-system 	CODA		# Coda File System; also needs vcoda (below)
file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system 	PTYFS		# /dev/ptm support
file-system 	TMPFS		# Efficient memory file-system
d199 1
a199 1
options 	QUOTA		# UFS quotas
d201 1
a201 1
options 	SOFTDEP		# FFS soft updates support.
a202 2
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
# It is not recommended for general use.
d204 1
a204 1
options 	NFSSERVER	# Network File System server
d1494 3
a1496 3
# accept filters
pseudo-device	accf_data		# "dataready" accept filter
pseudo-device	accf_http		# "httpready" accept filter
d1511 1
a1511 1
pseudo-device	vcoda		4	# coda minicache <-> venus comm.
d1514 1
a1514 1
pseudo-device	nsmb			# experimental - SMB requester
@


1.916
log
@Remove LKMs and switch to the module framework, pass 1.

Proposed on tech-kern@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915 2008/10/29 11:56:53 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915 $"
d96 1
a96 1
options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
@


1.915
log
@Reenable ichlpcib by default. This allows all modern ICH systems to use
the watchdog support out-of-the-box.

It is not clear, if the workaround for ancient revisions with broken
SpeedStep work, so if this breaks a report with PCI dump of the
southbridge is required to blacklist them.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.914 2008/10/19 11:34:31 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.914 $"
a97 1
options 	LKM		# loadable kernel modules
@


1.915.2.1
log
@Apply patch (requested by bouyer in ticket #65):
Add i386-specific COMPAT_30_PTHREAD option (enabled where COMPAT_30
is enabled), which restore binary compatibility with netbsd-3 libpthread.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915 2008/10/29 11:56:53 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915 $"
a144 1
options 	COMPAT_30_PTHREAD # NetBSD 3.0 pthreads compatibility.
@


1.915.2.2
log
@Pull up following revision(s) (requested by ad in ticket #402):
	sys/arch/amd64/conf/GENERIC: revision 1.237
	sys/arch/i386/conf/GENERIC: revision 1.924
Enable BUFQ_PRIOCSCAN by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.1 2008/11/18 01:56:58 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.1 $"
d113 2
a114 2
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
d116 1
a116 1
options 	BUFQ_PRIOCSCAN
@


1.915.2.3
log
@Apply patch (requested by pooka in ticket #453):
Add puffs and putter to amd64, i386, macppc, and sparc64 GENERIC kernels.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.2 2009/02/02 22:12:34 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.2 $"
a192 1
file-system	PUFFS		# Userspace file systems (e.g. ntfs-3g & sshfs)
a1526 3
# Pass-to-Userspace TransporTER, required for puffs(4) and pud(4)
pseudo-device	putter

@


1.915.2.3.4.1
log
@sync to netbsd-5
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.10 2009/10/28 09:03:42 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.10 $"
a375 2
wb*		at acpi?		# Winbond W83L518D SD/MMC reader
sdmmc*		at wb?			# SD/MMC bus
a530 1
options 	PMS_ELANTECH_TOUCHPAD	# Enable support for Elantech Touchpads
a623 3
# VIA C7 Temperature sensor
options 	VIA_C7TEMP

a893 1
age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
a894 1
ale*	at pci? dev ? function ?	# Attansic/Atheros L1E Ethernet
a1031 1
atphy*	at mii? phy ?			# Attansic/Atheros PHYs
a1246 7
# SD/MMC/SDIO Controller and Device support

# SD/MMC controller
sdhc*  at pci?				# SD Host Controller
sdmmc* at sdhc?				# SD/MMC bus

ld*    at sdmmc?
a1265 1
gcscaudio* at pci? dev ? function ?	# AMD Geode CS5536 Companion Audio
a1298 4
# High Definition Audio
#hdaudio*	at pci? dev ? function ?	# High Definition Audio
#hdafg*		at hdaudiobus?

@


1.915.2.4
log
@Pull up following revision(s) (requested by jmcneill in ticket #260):
	sys/arch/i386/conf/ALL: revision 1.187
	sys/arch/i386/conf/GENERIC: revision 1.922
PR# port-i386/40284: add AMD Geode CS5536 audio driver; add gcscaudio(4)
to i386 GENERIC and ALL kernels
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.3 2009/02/19 20:23:46 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.3 $"
a1265 1
gcscaudio* at pci? dev ? function ?	# AMD Geode CS5536 Companion Audio
@


1.915.2.5
log
@Pull up following revision(s) (requested by cegger in ticket #735):
	sys/dev/pci/if_age.c: revisions 1.1-1.28
	sys/dev/pci/if_agereg.h: revisions 1.1-1.2
	sys/dev/pci/if_ale.c: revisions 1.1-1.3
	sys/dev/pci/if_alereg.h: revisions 1.1-1.2
	sys/dev/pci/files.pci: revisions 1.310-1.313
	sys/dev/mii/atphy.c: revisions 1.1-1.5
	sys/dev/mii/files.mii: revision 1.42
	share/man/man4/age.4: revisions 1.1-1.3
	share/man/man4/ale.4: revisions 1.1-1.2
	share/man/man4/atphy.4: revisions 1.1-1.2
	share/man/man4/Makefile: revisions 1.486, 1.489
	distrib/sets/lists/man/mi: revisions 1.1118, 1.1132
	sys/arch/i386/conf/GENERIC: revisions 1.928, 1.933
	sys/arch/i386/conf/XEN2_DOM0: revisions 1.57, 1.60
	sys/arch/amd64/conf/GENERIC: revisions 1.239, 1.241
	sys/arch/amd64/conf/XEN3_DOM0: revisions 1.38, 1.42
Add the age(4) and ale(4) drivers for Attansic L1 and Atheros
AR8121/AR8113/AR8114 devices respectively.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.4 2009/05/01 01:20:42 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.4 $"
a893 1
age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
a894 1
ale*	at pci? dev ? function ?	# Attansic/Atheros L1E Ethernet
a1031 1
atphy*	at mii? phy ?			# Attansic/Atheros PHYs
@


1.915.2.6
log
@Pull up following revision(s) (requested by jmcneill in ticket #943):
	sys/arch/i386/conf/ALL: revision 1.186
	sys/arch/i386/conf/GENERIC: revision 1.921
add options PMS_ELANTECH_TOUCHPAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.5 2009/05/03 23:45:46 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.5 $"
a530 1
options 	PMS_ELANTECH_TOUCHPAD	# Enable support for Elantech Touchpads
@


1.915.2.7
log
@Pull up following revision(s) (requested by jmcneill in ticket #946):
	distrib/sets/lists/man/mi: revision 1.1155
	doc/CHANGES: revision 1.1285
	etc/MAKEDEV.tmpl: revision 1.128
	share/man/man4/Makefile: revision 1.498 via patch
	share/man/man4/hdaudio.4: revision 1.1-1.3
	share/man/man8/MAKEDEV.8: revision 1.36
	sys/arch/amd64/conf/GENERIC: revision 1.250-1.251
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.44-1.45
	sys/arch/i386/conf/ALL: revision 1.206-1.207
	sys/arch/i386/conf/GENERIC: revision 1.942-1.943
	sys/arch/i386/conf/XEN3_DOM0: patch
	sys/conf/majors: revision 1.47 via patch
	sys/dev/pci/hdaudio/files.hdaudio: revision 1.1-1.2
	sys/dev/pci/hdaudio/hdaudio.c: revision 1.1-1.4
	sys/dev/pci/hdaudio/hdaudio_afg.c: revisions 1.1-1.14
	sys/dev/pci/hdaudio/hdaudio_mixer.h: revisions 1.1-1.3
	sys/dev/pci/hdaudio/hdaudio_pci.c: revisions 1.1-1.2
	sys/dev/pci/hdaudio/hdaudioio.h: revisions 1.1-1.2
	sys/dev/pci/hdaudio/hdaudioreg.h: revisions 1.1-1.3
	sys/dev/pci/hdaudio/hdaudiovar.h: revisions 1.1-1.4
	sys/dev/pci/files.pci: revisions 1.319 and 1.322 via patch
hdaudio(4) is a standards-compliant driver for High Definition Audio.
It will replace azalia(4) after testing.
To use, comment out azalia in your kernel configuration and uncomment the
hdaudio and hdafg lines so it reads:
hdaudio*        at pci? dev ? function ?
hdafg*          at hdaudiobus?
You should also:
cd /dev
sh MAKEDEV audio
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.6 2009/09/13 22:11:14 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.6 $"
a1303 4
# High Definition Audio
#hdaudio*	at pci? dev ? function ?	# High Definition Audio
#hdafg*		at hdaudiobus?

@


1.915.2.8
log
@Pull up the following revisions(s) (requested by jmcneill in ticket #1061):
	sys/arch/x86/conf/files.x86:	revision 1.53
	sys/arch/x86/include/cpuvar.h:	revision 1.31
	sys/arch/x86/x86/identcpu.c:	revision 1.17
	sys/arch/x86/x86/viac7temp.c:	revision 1.1
	sys/arch/i386/conf/ALL:	revision 1.218
	sys/arch/i386/conf/GENERIC:	revision 1.949
Add support for VIA C7 temperature sensors (options VIA_C7TEMP) and enable
in i386 GENERIC kernel.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.7 2009/09/26 19:52:09 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.7 $"
a624 3
# VIA C7 Temperature sensor
options 	VIA_C7TEMP

@


1.915.2.9
log
@Pull up the following revisions(s) (requested by jmcneill in ticket #1045):
	distrib/sets/lists/man/mi:	revision 1.1160
	share/man/man4/Makefile:	revision 1.499
	share/man/man4/wb.4:		revision 1.1-1.2
	share/man/man4/ld.4:		revision 1.17
	sys/arch/i386/conf/ALL:		revision 1.215-1.216 + patch
	sys/arch/i386/conf/GENERIC:	revision 1.946-1.947 + patch
	sys/arch/amd64/conf/GENERIC:	revision 1.254-1.256 + patch
	sys/conf/files:			revision 1.958
	sys/dev/acpi/files.acpi:	revision 1.59
	sys/dev/acpi/wb_acpi.c:		revision 1.1
	sys/dev/ic/w83l518d.c:		revision 1.1
	sys/dev/ic/w83l518d_sdmmc.c:	revision 1.1
	sys/dev/ic/w83l518d_sdmmc.h:	revision 1.1
	sys/dev/ic/w83l518dreg.h:	revision 1.1
	sys/dev/ic/w83l518dvar.h.c:	revision 1.1

wb(4): Add a driver for Winbond W83L518D SD/MMC readers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.8 2009/10/05 11:37:13 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.8 $"
a375 2
wb*		at acpi?		# Winbond W83L518D SD/MMC reader
sdmmc*		at wb?			# SD/MMC bus
a1253 3
# SD/MMC/SDIO Controller and Device support

ld*    at sdmmc?
@


1.915.2.10
log
@Pull up the following revisions, requested by sborrill in ticket #1114:
	share/man/man4/sdhc.4           1.1-1.2
	sys/dev/pci/sdhc_pci.c          1.1-1.3
	distrib/sets/lists/man/mi       patch
	share/man/man4/Makefile         patch
	sys/arch/amd64/conf/GENERIC     patch
	sys/arch/i386/conf/ALL          patch
	sys/arch/i386/conf/GENERIC      patch
	sys/dev/pci/files.pci           patch
	sys/dev/pci/pcidevs             patch
	sys/dev/pci/pcidevs.h           regen
	sys/dev/pci/pcidevs_data.h      regen

Add sdhc(4), a driver for SD controllers following the SD Host
Controller Standard Simplified Specification.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.9 2009/10/08 09:47:09 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.9 $"
a1257 4
# SD/MMC controller
sdhc*  at pci?				# SD Host Controller
sdmmc* at sdhc?				# SD/MMC bus

@


1.915.2.11
log
@Pull up following revision(s) (requested by plunky in ticket #1407):
	sys/dev/bluetooth/btdev.h: revision 1.9
	sys/arch/iyonix/conf/GENERIC: revision 1.60
	sys/arch/sparc64/conf/GENERIC: revision 1.129
	sys/dev/usb/hid.c: revision 1.30
	sys/dev/usb/hid.h: revision 1.13
	sys/arch/i386/conf/GENERIC: revision 1.983
	usr.sbin/btdevctl/print.c: revision 1.10
	sys/arch/evbarm/conf/MPCSA_GENERIC: revision 1.16
	sys/arch/alpha/conf/GENERIC: revision 1.337
	sys/dev/bluetooth/files.bluetooth: revision 1.14
	sys/arch/evbarm/conf/GUMSTIX: revision 1.49
	sys/dev/usb/usbdevs: revision 1.550
	sys/arch/evbppc/conf/OPENBLOCKS266_OPT: revision 1.14
	sys/arch/hpcsh/conf/GENERIC: revision 1.91
	sys/dev/bluetooth/btmagic.c: revision 1.1
	distrib/sets/lists/man/mi: revision 1.1210
	sys/arch/amd64/conf/GENERIC: revision 1.279
	sys/arch/i386/conf/ALL: revision 1.258
	sys/arch/amd64/conf/XEN3_DOM0: revision 1.54
	sys/arch/hpcarm/conf/JORNADA720: revision 1.78
	sys/dev/usb/hid.c: revision 1.29
	share/man/man4/btmagic.4: revision 1.1
hid_get_data() does not work if the size of data is less than
a byte and crosses a byte boundary, and it always returns a
sign-extended value.
fix this by using the algorithm from libusbhid to read bytes,
and provide a hid_get_udata() function to return unsigned data
values.
while here, const args
update DPRINTF to reflect actual function name
add Apple Magic Mouse product-id
regen for Magic Mouse id
allow for vendor-id and product-id properties, passing them
through to child devices
add Magic Mouse driver and manpage btmagic(4)
additionally query the "PnP Information" service record to discover
any USB Forum vendor-id and product-id values and store them in the
property list if found.
add btmagic(4) where other Bluetooth drivers are listed
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a1404 4
# Bluetooth Apple Magic Mouse
btmagic* at bthub?
wsmouse* at btmagic? mux 0

@


1.915.2.12
log
@Pull up following revision(s) (requested by hannken in ticket #1715):
- Be robust against an invalid timer period value.
sys/dev/ic/hpetreg.h			Rev. 1.4
sys/dev/ic/hpet.c			Rev. 1.8

- Fix wrong definition of LAPIC_LEVEL_ASSERT / _MASK
sys/arch/x86/include/i82489reg.h	Rev. 1.11

- Add virtio driver - speed up disk and network access in virtual environments
sys/arch/i386/conf/GENERIC		Rev. 1.1055
sys/arch/i386/conf/ALL			Rev. 1.325
sys/arch/amd64/conf/GENERIC		Rev. 1.338
sys/dev/pci/files.pci			Rev. 1.350
sys/dev/pci/if_vioif.c			Rev. 0-1.2
sys/dev/pci/ld_virtio.c			Rev. 0-1.4
sys/dev/pci/viomb.c			Rev. 0-1.1
sys/dev/pci/virtio.c			Rev. 0-1.3
sys/dev/pci/virtioreg.h			Rev. 0-1.1
sys/dev/pci/virtiovar.h			Rev. 0-1.1
distrib/sets/lists/man/mi		Rev. 1.1352 and 1.1358
share/man/man4/Makefile			Rev. 1.573 and 1.575
share/man/man4/ld.4			Rev. 1.19
share/man/man4/virtio.4			Rev. 0-1.4
share/man/man4/vioif.4			Rev. 0-1.2
share/man/man4/viomb.4			Rev. 0-1.2

Allow NetBSD to run unmodified under Linux/kvm.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.11 2010/11/21 03:05:05 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.11 $"
a1459 6
# Virtio devices
virtio*	at pci? dev ? function ?	# Virtio PCI device
viomb*	at virtio?			# Virtio memory balloon device
ld*	at virtio?			# Virtio disk device
vioif*	at virtio?			# Virtio network device

@


1.915.2.13
log
@Pull up the following revisions(s) (requested by liamjfoy in ticket #1797):
	lib/libusbhid/usb_hid_usages:	revision 1.5 via patch
	share/man/man4/Makefile:	revision 1.578 via patch
	share/man/man4/uts.4:		revision 1.1
	share/man/man4/wsmouse.4:	revision 1.19 via patch
	sys/arch/amd64/conf/GENERIC:	revision 1.346-1.347 via patch
	sys/arch/i386/conf/GENERIC:	revision 1.1078 via patch
	sys/dev/usb/FILES:		revision 1.12 via patch
	sys/dev/usb/usbdevices.config:	revision 1.12 via patch
	sys/dev/usb/files.usb:		revision 1.119-1.120 via patch
	sys/dev/usb/usbhid.h:		revision 1.14 via patch
	sys/dev/usb/uts.c:		revision 1.1
	distrib/sets/lists/man/mi:	revision 1.1370 via patch

Add uts(4) driver for USB touchscreens.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.12 2012/01/25 21:18:14 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.12 $"
a1105 4
# USB generic touchscreen
uts*    at uhidev? reportid ?
wsmouse* at uts? mux 0

@


1.915.2.14
log
@Pullup the following revisions via patch, requested by msaitoh in ticket #1850:
	sys/dev/pci/if_wm.c			1.201, 1.203-1.204,
						1.207-1.212, 1.215,
						1.217-1.218, 1.220-1.223,
						1.228, 1.232-245
	sys/dev/pci/if_wmreg.h			1.40-1.45, 1.47-1.48
	sys/dev/pci/if_wmvar.h			1.11-1.13
	sys/dev/pci/pcidevs			1.1074, 1.1077, 1.1117
	sys/dev/pci/pcidevs.h			regen
	sys/dev/pci/pcidevs_data.h		regen
	sys/dev/mii/igphyreg.h			1.6
	sys/dev/mii/ihphy.c			1.1-1.2
	sys/dev/mii/ihphyreg.h			1.1
	sys/dev/mii/inbmphyreg.h		1.3
	sys/dev/mii/files.mii			1.47 via patch
	sys/dev/mii/miidevs			1.97 and 1.100
	sys/dev/mii/miidevs.h			regen
	sys/dev/mii/miidevs_data.h		regen
	sys/arch/i386/conf/ALL			1.280
	sys/arch/i386/conf/GENERIC		1.1001
	sys/arch/i386/conf/INSTALL_FLOPPY	1.11
	sys/arch/i386/conf/XEN2_DOM0		patch
	sys/arch/amd64/conf/GENERIC		1.293
	sys/arch/amd64/conf/XEN3_DOM0		1.61
	share/man/man4/wm.4			1.21-1.24

Apply almost all fixes and improvements from netbsd-6 except for
the rev. 1.196's iqdrops' change.

- Add the detach code.
- Add code for WOL, ASF, IPMI and Intel AMT. WOL is disabled by default
- Add Yet another workaround for ICH8.
- 82576 is dual port, so check the FUNCID and increment the MAC address for
  the 2nd port.
- Fix the names of 82577L[MC] LAN controllers (for mobile).
- Fix CTRL_EXT_SWDPIN() and CTRL_EXT_SWDPIO() macros. The bit order of the
  SW definable pin is not 6543 but 3654!!!
- Rewrite the code to read MAC address from eeprom.
- Add 82580 support.
- 82571 quirk. Only 82571 shares port 0 of EEMNGCTL_CFGDONE.
- The document says that the TDH register must be set after
  TCL.EN is set on 82575 and newer devices.
- Fix some register names. No functional change.
- Omit U+00AE "REGISTERED SIGN" in a product name due to its non-ASCII nature.
- Stop wm(4) from needlessly resetting when you add or delete a vlan(4).
- Fix MAC address check on 8257[156] and 80003 case. Some cards have non 0xffff
  pointer but those don't use alternative MAC address in reality. So we check
  whether the broadcast bit is set or not like Intel's e1000 driver.
  Fixes PR kern/44072 reported by Jean-Yves Moulin.
- Add PCH2(and 82579) support. Fixes PR#46487
- Add yet another 82567V support.
- Add ICH10+HANKSVILL support.
- Add support Intel I350 Ethernet.
- Make vlan and all ip/ip6 checksum offload work for the I350.
- Fix compile error with  WM_DEBUG.
- Fix a bug that PHY isn't set to low-power mode on PCH and PCH2.
- Add WM_DEBUG_NVM. If WM_DEBUG_NVM is enabled, dump the FLASH ROM data.
- Skip 64bit BAR correctly.
- Fix RAL_TABSIZE for ICH8, 82576, 82580 and I350.
- Use 82580(and I350) specific PHY read/write functions. Fixes PR#47542.
- Style fix. Fix typo in comment. Fix comments. Add comments.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.915.2.13 2012/09/28 10:58:15 sborrill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.915.2.13 $"
a1050 1
ihphy*	at mii? phy ?			# Intel 82577 PHYs
@


1.914
log
@Add u3g entries in kernels that have ugensa as well.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.913 2008/10/11 21:54:11 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.913 $"
d450 1
a450 1
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
d477 1
a477 1
#isa0	at ichlpcib?
@


1.914.2.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.922 2008/12/28 15:18:21 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.922 $"
a31 6
# For GENERIC, we build the exec formats as modules by default.
no options	EXEC_AOUT       # exec a.out binaries
no options	EXEC_ELF32      # exec ELF binaries
no options	EXEC_SCRIPT     # exec #! scripts
no options	COREDUMP

d96 1
a96 2
#options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
no options	AIO		# POSIX AIO, built as a module
d98 1
d100 1
d133 14
a146 14
# Compatibility options, built as modules by default
#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
#options 	COMPAT_09	# NetBSD 0.9
#options 	COMPAT_10	# NetBSD 1.0
#options 	COMPAT_11	# NetBSD 1.1
#options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
#options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
#options 	COMPAT_14	# NetBSD 1.4
#options 	COMPAT_15	# NetBSD 1.5
#options 	COMPAT_16	# NetBSD 1.6
#options 	COMPAT_20	# NetBSD 2.0
#options 	COMPAT_30	# NetBSD 3.0
#options 	COMPAT_40	# NetBSD 4.0
#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
d150 5
a154 5
#options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
#options 	COMPAT_LINUX	# binary compatibility with Linux
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
d169 21
a189 21
# File systems, built as modules by default
#file-system 	FFS		# UFS
#file-system 	EXT2FS		# second extended file system (linux)
#file-system 	LFS		# log-structured file system
#file-system 	MFS		# memory file system
#file-system 	NFS		# Network File System client
#file-system 	NTFS		# Windows/NT file system (experimental)
#file-system 	CD9660		# ISO 9660 + Rock Ridge file system
#file-system 	MSDOSFS		# MS-DOS file system
#file-system 	FDESC		# /dev/fd
#file-system 	KERNFS		# /kern
#file-system 	NULLFS		# loopback file system
#file-system 	OVERLAY		# overlay file system
#file-system 	PORTAL		# portal filesystem (still experimental)
#file-system 	PROCFS		# /proc
#file-system 	UMAPFS		# NULLFS + uid and gid remapping
#file-system 	UNION		# union file system
#file-system 	CODA		# Coda File System; also needs vcoda (below)
#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
#file-system 	PTYFS		# /dev/ptm support
#file-system 	TMPFS		# Efficient memory file-system
d194 1
a194 1
#options 	QUOTA		# UFS quotas
d196 1
d198 2
d201 1
a201 1
#options 	NFSSERVER	# Network File System server
d219 2
a220 2
#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
#options 	PPP_DEFLATE	# Deflate compression support for PPP
d450 1
a450 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
d477 1
a477 1
isa0	at ichlpcib?
a528 1
options 	PMS_ELANTECH_TOUCHPAD	# Enable support for Elantech Touchpads
a1263 1
gcscaudio* at pci? dev ? function ?	# AMD Geode CS5536 Companion Audio
d1491 3
a1493 3
# accept filters, built as modules by default
#pseudo-device	accf_data		# "dataready" accept filter
#pseudo-device	accf_http		# "httpready" accept filter
d1508 1
a1508 1
#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
d1511 1
a1511 1
#pseudo-device	nsmb			# experimental - SMB requester
@


1.914.2.2
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.914.2.1 2009/01/19 13:16:15 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.914.2.1 $"
d118 2
a119 2
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
d121 1
a121 1
options 	BUFQ_PRIOCSCAN
a150 1
#options 	COMPAT_50	# NetBSD 5.0
a534 1
genfb*		at pci? dev ? function ?
a537 1
wsdisplay*	at wsemuldisplaydev?
d542 10
@


1.914.2.3
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.914.2.2 2009/03/03 18:28:59 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.914.2.2 $"
d29 3
a125 1
#options 	LOCKDEBUG	# expensive locking checks/support
d139 14
a152 14
options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
options 	COMPAT_09	# NetBSD 0.9
options 	COMPAT_10	# NetBSD 1.0
options 	COMPAT_11	# NetBSD 1.1
options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
options 	COMPAT_14	# NetBSD 1.4
options 	COMPAT_15	# NetBSD 1.5
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
options 	COMPAT_30	# NetBSD 3.0
options 	COMPAT_40	# NetBSD 4.0
options 	COMPAT_50	# NetBSD 5.0
options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
a887 1
age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
a888 1
ale*	at pci? dev ? function ?	# Attansic/Atheros L1E Ethernet
a1025 1
atphy*	at mii? phy ?			# Attansic/Atheros PHYs
a1241 9
# SD/MMC/SDIO Controller and Device support

# SD/MMC controller
sdhc*  at pci?				# SD Host Controller
sdmmc* at sdhc?				# SD/MMC bus

ld*	at sdmmc?


a1357 3
# Bluetooth SDIO Controller
sbt* at sdmmc?

a1365 1
bthub* at sbt?
@


1.913
log
@jme(4), a driver for JMicron Technologies JME250 Gigabit Ethernet and
JME260 Fast Ethernet PCI Express controllers.
Written with a lot of cut-n-paste from the FreeBSD jme(4) driver.
No support for jumbo ethernet frames yet (but should come soon).
Thanks to JMicron Technologies for providing me sample boards and
documentation for this work.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.912 2008/10/07 12:43:32 pgoyette Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.912 $"
d1220 4
@


1.912
log
@Move all platforms to new dbCool driver in preparation for removal of
chip-specific drivers
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.911 2008/10/07 09:30:04 rmind Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.911 $"
d911 1
@


1.911
log
@Add a note that SysV IPC parameters could be changed dynamically.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.910 2008/09/30 16:45:33 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.910 $"
d635 4
a638 3
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D
@


1.910
log
@Remove esl(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.909 2008/09/09 03:26:42 ober Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.909 $"
d92 1
@


1.909
log
@Adding iwn(4) to GENERIC
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.908 2008/09/09 01:19:37 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.908 $"
a1275 4

# PCMCIA audio devices
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive

a1280 1
#opl*	at esl?
@


1.908
log
@Add uvideo(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.907 2008/09/07 12:01:25 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.907 $"
d908 1
@


1.907
log
@Remove references to non-existant kernel option NO_TSC_TIME.
This fixes PR port-i386/39460 by Juan RP.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.906 2008/09/06 20:08:01 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.906 $"
d1341 1
@


1.906
log
@Enable video(4) and pseye(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.905 2008/08/21 18:06:18 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.905 $"
a88 2
#options 	NO_TSC_TIME	# Don't use TSC microtime, even if available.
				# Improves time behavior under VMware.
@


1.905
log
@Enable ipmi(4) by default in GENERIC and related kernels.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.904 2008/08/04 03:55:47 tls Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.904 $"
d1340 6
@


1.904
log
@Add accept filters, ported from FreeBSD by Coyote Point Systems.  Add inetd
support for specifying an accept filter for a service (mostly as a usage
example, but it can be handy for other things).  Manual pages to follow
in a day or so.

OK core@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.903 2008/07/31 14:15:00 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.903 $"
d330 1
a330 1
#ipmi0		at mainbus?
@


1.903
log
@Include VGA_POST by default in GENERIC and ALL on x86 now that the code
is conditional.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.902 2008/07/31 07:41:01 simonb Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.902 $"
d1482 5
@


1.902
log
@Add "options WAPBL" to standard GENERIC/INSTALL type configs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.901 2008/06/11 20:37:38 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.901 $"
d343 1
@


1.901
log
@Add cmos(4). This should probably be added to amd64 as well.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.900 2008/05/30 19:51:00 dyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.900 $"
d198 1
@


1.901.2.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.914 2008/10/19 11:34:31 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.914 $"
d89 2
a93 1
# Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
a197 1
options 	WAPBL		# File system journaling support - Experimental
d329 1
a329 1
ipmi0		at mainbus?
a341 1
options 	VGA_POST		# in-kernel support for VGA POST
d634 3
a636 4
# dbCool Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D		# Tyan S2881
#dbcool* at iic? addr 0x2E		# Tyan S2882-D
a907 2
iwn*	at pci? dev ? function ?	# Intel PRO/Wireless 4965AGN
jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
a1215 4
# USB 3G datacards
u3g*	at uhub? port ?
ucom*	at u3g?

d1275 4
d1284 1
a1337 7
# Video capture devices

pseye* at uhub?			# Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub?		# USB Video Class capture devices
video* at videobus?


a1479 5
#
# accept filters
pseudo-device	accf_data		# "dataready" accept filter
pseudo-device	accf_http		# "httpready" accept filter

@


1.901.2.2
log
@Update haad-dm branch to haad-dm-base2.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.920 2008/11/25 02:47:19 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.920 $"
a31 6
# For GENERIC, we build the exec formats as modules by default.
no options	EXEC_AOUT       # exec a.out binaries
no options	EXEC_ELF32      # exec ELF binaries
no options	EXEC_SCRIPT     # exec #! scripts
no options	COREDUMP

d96 1
a96 2
#options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
no options	AIO		# POSIX AIO, built as a module
d98 1
d100 1
d133 14
a146 14
# Compatibility options, built as modules by default
#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
#options 	COMPAT_09	# NetBSD 0.9
#options 	COMPAT_10	# NetBSD 1.0
#options 	COMPAT_11	# NetBSD 1.1
#options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
#options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
#options 	COMPAT_14	# NetBSD 1.4
#options 	COMPAT_15	# NetBSD 1.5
#options 	COMPAT_16	# NetBSD 1.6
#options 	COMPAT_20	# NetBSD 2.0
#options 	COMPAT_30	# NetBSD 3.0
#options 	COMPAT_40	# NetBSD 4.0
#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
d150 5
a154 5
#options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
#options 	COMPAT_LINUX	# binary compatibility with Linux
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
d169 21
a189 21
# File systems, built as modules by default
#file-system 	FFS		# UFS
#file-system 	EXT2FS		# second extended file system (linux)
#file-system 	LFS		# log-structured file system
#file-system 	MFS		# memory file system
#file-system 	NFS		# Network File System client
#file-system 	NTFS		# Windows/NT file system (experimental)
#file-system 	CD9660		# ISO 9660 + Rock Ridge file system
#file-system 	MSDOSFS		# MS-DOS file system
#file-system 	FDESC		# /dev/fd
#file-system 	KERNFS		# /kern
#file-system 	NULLFS		# loopback file system
#file-system 	OVERLAY		# overlay file system
#file-system 	PORTAL		# portal filesystem (still experimental)
#file-system 	PROCFS		# /proc
#file-system 	UMAPFS		# NULLFS + uid and gid remapping
#file-system 	UNION		# union file system
#file-system 	CODA		# Coda File System; also needs vcoda (below)
#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
#file-system 	PTYFS		# /dev/ptm support
#file-system 	TMPFS		# Efficient memory file-system
d194 1
a194 1
#options 	QUOTA		# UFS quotas
d196 1
d198 2
d201 1
a201 1
#options 	NFSSERVER	# Network File System server
d219 2
a220 2
#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
#options 	PPP_DEFLATE	# Deflate compression support for PPP
d450 1
a450 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
d477 1
a477 1
isa0	at ichlpcib?
d1491 3
a1493 3
# accept filters, built as modules by default
#pseudo-device	accf_data		# "dataready" accept filter
#pseudo-device	accf_http		# "httpready" accept filter
d1508 1
a1508 1
#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
d1511 1
a1511 1
#pseudo-device	nsmb			# experimental - SMB requester
@


1.900
log
@Add pci* at elansc? bus ?.  Should fix Jasper's PR, port-i386/38800.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.899 2008/05/26 00:25:32 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.899 $"
d1502 3
@


1.900.2.1
log
@Initial commit of Wasabi System's WAPBL (Write Ahead Physical Block
Logging) journaling code.  Originally written by Darrin B. Jewell
while at Wasabi and updated to -current by Antti Kantee, Andy Doran,
Greg Oster and Simon Burge.

Still a number of issues - look in doc/BRANCHES for "simonb-wapbl"
for more info.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.900 2008/05/30 19:51:00 dyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.900 $"
a197 1
options 	WAPBL		# File system journaling support - Experimental
@


1.900.2.2
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.901 2008/06/11 20:37:38 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.901 $"
a1502 3
# cmos(4) pseudo-device
pseudo-device	cmos

@


1.899
log
@Add uberry.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.898 2008/05/25 19:05:17 agc Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.898 $"
d419 1
@


1.898
log
@Re-enable INCLUDE_CONFIG_FILE in the GENERIC kernel config files for
i386, amd64 and usermode - it is necessary for retrieving information
on kernel configuration for running kernels - cf config -x.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.897 2008/05/23 21:17:40 jnemeth Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.897 $"
d1180 3
@


1.897
log
@add siisata(4) -- SiI SteelVine SATA2
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.896 2008/05/18 22:05:59 cegger Exp $
d23 1
a23 1
#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.896 $"
@


1.896
log
@acpidalb(4): Driver for PNP0C32 Hotkeys aka "Direct Application Launch Buttons".
"awesome" jmcneill
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.895 2008/05/13 13:43:47 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.895 $"
d808 1
@


1.895
log
@PR kern/35296 option PIC_DELAY not use
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.894 2008/05/05 14:43:18 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.894 $"
d348 1
@


1.894
log
@The kernel is too large. Reduce size by commenting out eye candy options:

{ACPI,EISA,MII,PCI,USB,MCA}VERBOSE

Also remove INCLUDE_CONFIG_FILE, because it doesn't make sense in GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.893 2008/05/02 15:26:38 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.893 $"
a34 2
# insert delay no-ops in interrupts; recommended on very old machines
#options 	PIC_DELAY
@


1.894.2.1
log
@Sync w/ -current. 34 merge conflicts to follow.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.894 2008/05/05 14:43:18 ad Exp $
d23 1
a23 1
options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.894 $"
d35 2
a349 1
acpidalb*	at acpi?		# ACPI Direct Application Launch Button
a419 1
pci*	at elansc? bus ?
a808 1
siisata*	at pci? dev ? function ?	# SiI SteelVine controllers
a1179 3
# RIM BlackBerry
uberry*	at uhub? port ?

a1497 3
# cmos(4) pseudo-device
pseudo-device	cmos

@


1.894.2.2
log
@Sync with wrstuden-revivesa-base-2.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.894.2.1 2008/06/23 04:30:26 wrstuden Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.894.2.1 $"
d89 2
a197 1
options 	WAPBL		# File system journaling support - Experimental
d329 1
a329 1
ipmi0		at mainbus?
a341 1
options 	VGA_POST		# in-kernel support for VGA POST
a1337 6
# Video capture devices

pseye* at uhub?			# Sony PLAYSTATION(R) Eye webcam
video* at videobus?


a1479 5
#
# accept filters
pseudo-device	accf_data		# "dataready" accept filter
pseudo-device	accf_http		# "httpready" accept filter

@


1.894.2.3
log
@Merge in changes between wrstuden-revivesa-base-2 and
wrstuden-revivesa-base-3.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.894.2.2 2008/09/18 04:33:27 wrstuden Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.894.2.2 $"
a907 1
iwn*	at pci? dev ? function ?	# Intel PRO/Wireless 4965AGN
a1340 1
uvideo* at uhub?		# USB Video Class capture devices
@


1.894.2.4
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.894.2.3 2008/09/24 16:38:49 wrstuden Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.894.2.3 $"
a91 1
# Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
d634 3
a636 4
# dbCool Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D		# Tyan S2881
#dbcool* at iic? addr 0x2E		# Tyan S2882-D
d1276 4
d1285 1
@


1.893
log
@- Give x86 BIOS boot the ability to load new style modules and pass them
  into the kernel. Based on a patch by jmcneill@@, with many fixes and
  improvements by me.

- Put MEMORY_DISK_DYNAMIC and MODULAR into the GENERIC kernels, so that
  you can load miniroot.kmod from the boot blocks and boot into the
  installer!
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.892 2008/05/01 20:18:18 cegger Exp $
d23 1
a23 1
options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.892 $"
d245 4
a248 4
options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
options 	EISAVERBOSE	# verbose EISA device autoconfig messages
options 	MIIVERBOSE	# verbose PHY autoconfig messages
options 	PCIVERBOSE	# verbose PCI device autoconfig messages
d252 1
a252 1
options 	USBVERBOSE	# verbose USB device autoconfig messages
d255 1
a255 1
options 	MCAVERBOSE	# verbose MCA device autoconfig messages
@


1.892
log
@hpqlb(4): driver for HP Quick Launch buttons - found on HP Pavilion Notebooks
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.891 2008/04/30 15:29:11 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.891 $"
d102 1
d1445 3
@


1.891
log
@For PR kern/38537:

- Make MULTIPROCESSOR mandatory on i386.

Installation changes:

- Update installation section of release notes to match reality.
- Rename INSTALL to INSTALL_FLOPPY, retire INSTALL_LARGE.
- Build INSTALL kernel from GENERIC, like on amd64.
- Update boot menu to allow disabling ACPI and/or SMP.
- Remove GENERIC.NOACPI from the installed kernel list.
- TODO: install default boot.cfg in etc.tgz.
- TODO: possibly enable PCI fixup stuff at runtime if ACPI is disabled.

Build changes:

- No longer build ALL, it's for verification, is slow to build and the
  build process is already crippled by the number of kernels built.
- No longer build GENERIC.NOACPI.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.890 2008/04/22 22:37:14 cegger Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.890 $"
d363 1
@


1.890
log
@amdtemp(4): Driver for AMD CPU Temperature Sensors. Adopted from OpenBSD's kate(4).
Changes beyond OpenBSD's driver:
- Improved support for AMD K8
- Added support for AMD Barcelona, AMD Phenom and AMD Griffin
Tested on various single and multi-socket machines.
Review and OK xtreame
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.889 2008/04/11 11:55:18 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.889 $"
a101 1
options 	MULTIPROCESSOR	# SMP
a102 1
options 	MPBIOS		# configure CPUs and APICs using MPBIOS
a313 5
mainbus0 at root

cpu* at mainbus?
ioapic* at mainbus?

a335 2
# To use the I/O APIC(s), enable the ioapic line above.
#options 	MPBIOS		# configure CPUs and APICs using MPBIOS
@


1.890.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.890 2008/04/22 22:37:14 cegger Exp $
d23 1
a23 1
#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.890 $"
d35 2
d102 1
a102 1
options		MODULAR		# new style module framework
d104 1
d246 4
a249 4
#options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
#options 	EISAVERBOSE	# verbose EISA device autoconfig messages
#options 	MIIVERBOSE	# verbose PHY autoconfig messages
#options 	PCIVERBOSE	# verbose PCI device autoconfig messages
d253 1
a253 1
#options 	USBVERBOSE	# verbose USB device autoconfig messages
d256 1
a256 1
#options 	MCAVERBOSE	# verbose MCA device autoconfig messages
d316 5
d343 2
a371 1
hpqlb*		at acpi?		# HP Quick Launch Buttons
a1451 3
options		MEMORY_DISK_HOOKS	# enable root ramdisk
options		MEMORY_DISK_DYNAMIC	# loaded via kernel module

@


1.890.2.2
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.890.2.1 2008/05/16 02:22:32 yamt Exp $
d23 1
a23 1
options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.890.2.1 $"
d29 2
a30 5
# For GENERIC, we build the exec formats as modules by default.
no options	EXEC_AOUT       # exec a.out binaries
no options	EXEC_ELF32      # exec ELF binaries
no options	EXEC_SCRIPT     # exec #! scripts
no options	COREDUMP
d89 2
a93 1
# Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
d97 1
a97 2
#options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
no options	AIO		# POSIX AIO, built as a module
d99 1
d101 1
d114 2
a115 2
# Alternate buffer queue strategies for better responsiveness under high
# disk I/O load.
d117 1
a117 1
options 	BUFQ_PRIOCSCAN
a121 1
#options 	LOCKDEBUG	# expensive locking checks/support
d134 1
a134 1
# Compatibility options, built as modules by default
a146 1
options 	COMPAT_50	# NetBSD 5.0
d151 5
a155 5
#options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
#options 	COMPAT_LINUX	# binary compatibility with Linux
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
d170 21
a190 21
# File systems, built as modules by default
#file-system 	FFS		# UFS
#file-system 	EXT2FS		# second extended file system (linux)
#file-system 	LFS		# log-structured file system
#file-system 	MFS		# memory file system
#file-system 	NFS		# Network File System client
#file-system 	NTFS		# Windows/NT file system (experimental)
#file-system 	CD9660		# ISO 9660 + Rock Ridge file system
#file-system 	MSDOSFS		# MS-DOS file system
#file-system 	FDESC		# /dev/fd
#file-system 	KERNFS		# /kern
#file-system 	NULLFS		# loopback file system
#file-system 	OVERLAY		# overlay file system
#file-system 	PORTAL		# portal filesystem (still experimental)
#file-system 	PROCFS		# /proc
#file-system 	UMAPFS		# NULLFS + uid and gid remapping
#file-system 	UNION		# union file system
#file-system 	CODA		# Coda File System; also needs vcoda (below)
#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
#file-system 	PTYFS		# /dev/ptm support
#file-system 	TMPFS		# Efficient memory file-system
d195 1
a195 1
#options 	QUOTA		# UFS quotas
d197 3
a199 1
options 	WAPBL		# File system journaling support - Experimental
d201 1
a201 1
#options 	NFSSERVER	# Network File System server
d219 2
a220 2
#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
#options 	PPP_DEFLATE	# Deflate compression support for PPP
d329 1
a329 1
ipmi0		at mainbus?
a341 1
options 	VGA_POST		# in-kernel support for VGA POST
a347 1
acpidalb*	at acpi?		# ACPI Direct Application Launch Button
a417 1
pci*	at elansc? bus ?
d447 1
a447 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
d474 1
a474 1
isa0	at ichlpcib?
a525 1
options 	PMS_ELANTECH_TOUCHPAD	# Enable support for Elantech Touchpads
a528 1
genfb*		at pci? dev ? function ?
a531 1
wsdisplay*	at wsemuldisplaydev?
d536 10
d632 3
a634 4
# dbCool Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D		# Tyan S2881
#dbcool* at iic? addr 0x2E		# Tyan S2882-D
a806 1
siisata*	at pci? dev ? function ?	# SiI SteelVine controllers
a886 1
age*	at pci? dev ? function ?	# Attansic/Atheros L1 Gigabit Ethernet
a887 1
ale*	at pci? dev ? function ?	# Attansic/Atheros L1E Ethernet
a904 2
iwn*	at pci? dev ? function ?	# Intel PRO/Wireless 4965AGN
jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
a1022 1
atphy*	at mii? phy ?			# Attansic/Atheros PHYs
a1177 3
# RIM BlackBerry
uberry*	at uhub? port ?

a1209 4
# USB 3G datacards
u3g*	at uhub? port ?
ucom*	at u3g?

a1231 9
# SD/MMC/SDIO Controller and Device support

# SD/MMC controller
sdhc*  at pci?				# SD Host Controller
sdmmc* at sdhc?				# SD/MMC bus

ld*	at sdmmc?


a1249 1
gcscaudio* at pci? dev ? function ?	# AMD Geode CS5536 Companion Audio
d1269 4
d1278 1
a1331 7
# Video capture devices

pseye* at uhub?			# Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub?		# USB Video Class capture devices
video* at videobus?


a1344 3
# Bluetooth SDIO Controller
sbt* at sdmmc?

a1352 1
bthub* at sbt?
a1473 5
#
# accept filters, built as modules by default
#pseudo-device	accf_data		# "dataready" accept filter
#pseudo-device	accf_http		# "httpready" accept filter

d1487 1
a1487 1
#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
d1490 1
a1490 1
#pseudo-device	nsmb			# experimental - SMB requester
a1495 3
# cmos(4) pseudo-device
pseudo-device	cmos

@


1.890.2.3
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.890.2.2 2009/05/04 08:11:15 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.890.2.2 $"
d100 1
a100 2
no options	AIO		# POSIX asynchronous I/O, built as a module
no options	MQUEUE		# POSIX messsage queues, built as a module
a195 1
#file-system	NILFS		# experimental - NTT's NiLFS(2)
a304 4
# Keylock support
#options	KEYLOCK
#options	secmodel_keylock	# Requires options KEYLOCK

a672 1
#gpio*	at gpiosim?
d675 1
a675 2
#gpioow* 	at gpio? offset ? mask ?	# 1-wire bitbanging via gpio
#gpioow* 	at gpio?
a680 3
# Keylock support
#gpiolock*	at gpio?

a798 1
mvsata*		at pci? dev ? function ?	# Marvell Hercules-I/II
a819 1
siisata* at cardbus? function ?			# SiI SteelVine controllers
a1516 1
#pseudo-device	gpiosim		1	# GPIO simulator
@


1.890.2.4
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.890.2.3 2009/08/19 18:46:18 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.890.2.3 $"
a1316 4
# High Definition Audio
hdaudio*	at pci? dev ? function ?	# High Definition Audio
hdafg*		at hdaudiobus?

@


1.890.2.5
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.890.2.4 2009/09/16 13:37:39 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.890.2.4 $"
d30 4
a33 4
no options 	EXEC_AOUT       # exec a.out binaries
no options 	EXEC_ELF32      # exec ELF binaries
no options 	EXEC_SCRIPT     # exec #! scripts
no options 	COREDUMP
d100 2
a101 2
no options 	AIO		# POSIX asynchronous I/O, built as a module
no options 	MQUEUE		# POSIX messsage queues, built as a module
d103 1
a103 1
options 	MODULAR		# new style module framework
d175 22
a196 21
#file-system	FFS		# UFS
#file-system	EXT2FS		# second extended file system (linux)
#file-system	LFS		# log-structured file system
#file-system	MFS		# memory file system
#file-system	NFS		# Network File System client
#file-system	NTFS		# Windows/NT file system (experimental)
#file-system	CD9660		# ISO 9660 + Rock Ridge file system
#file-system	MSDOSFS		# MS-DOS file system
#file-system	FDESC		# /dev/fd
#file-system	KERNFS		# /kern
#file-system	NULLFS		# loopback file system
#file-system	OVERLAY		# overlay file system
#file-system	PROCFS		# /proc
#file-system	UMAPFS		# NULLFS + uid and gid remapping
#file-system	UNION		# union file system
#file-system	CODA		# Coda File System; also needs vcoda (below)
#file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
#file-system	PTYFS		# /dev/ptm support
#file-system	TMPFS		# Efficient memory file-system
#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system	HFS		# experimental - Apple HFS+ (read-only)
d212 1
a212 1
options 	INET6		# IPv6
d303 1
a303 1
# enable splash screen support; requires genfb or radeonfb
d308 2
a309 2
#options 	KEYLOCK
#options 	secmodel_keylock	# Requires options KEYLOCK
d321 1
a321 1
#p64h2apic*	at pci? dev? function?	# P64H2 IOxAPIC
d323 1
a323 1
#apm0		at mainbus0		# Advanced power management
d348 1
d353 3
a355 3
acpiacad*	at acpi?		# ACPI AC Adapter
acpibat*	at acpi?		# ACPI Battery
acpibut*	at acpi?		# ACPI Button
d361 2
a362 3
acpiecdt*	at acpi?		# ACPI Embedded Controller (early binding)
acpilid*	at acpi?		# ACPI Lid Switch
#acpismbus*	at acpi?		# ACPI SMBus CMI (experimental)
a363 1
acpiwmi*	at acpi?		# ACPI WMI Mapper
d366 1
a366 1
aibs*		at acpi?		# ASUSTeK AI Booster hardware monitor
d369 2
a370 2
#com*		at acpi?		# Serial communications interface
#fdc*		at acpi?		# Floppy disk controller
d372 1
a372 1
hpet*		at acpi?		# High Precision Event Timer
d374 1
a374 1
#lpt*		at acpi?		# Parallel port
d377 1
a377 1
pckbc*		at acpi?		# PC keyboard controller
d380 3
a382 5
ug*		at acpi?		# Abit uGuru Hardware monitor
wb*		at acpi?		# Winbond W83L518D SD/MMC reader
sdmmc*		at wb?			# SD/MMC bus
wss*		at acpi?		# NeoMagic 256AV in wss mode
ym*		at acpi?		# Yamaha OPL3-SA[23] audio
d385 2
a386 2
spic*		at acpi?		# Sony Programmable I/O Controller
wsmouse*	at spic?
d392 1
a392 1
vald*		at acpi?
d464 2
a465 2
viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
iic*	at viapcib?
d487 1
a487 1
isa0	at viapcib?
d531 1
a531 1
pckbc0		at isa?			# PC keyboard controller
d545 1
a545 1
#wsdisplay*	at machfb? console ?
a621 3
# VIA C7 Temperature sensor
options 	VIA_C7TEMP

d623 1
a623 1
ichsmb* at pci? dev ? function ?
d627 1
a627 1
nfsmbc* at pci? dev ? function ?
a648 4
# Winbond LPC Super I/O
#wbsio*	at isa? port 0x2e
#wbsio*	at isa? port 0x4e

d650 1
a650 3
# 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
#lm*	at wbsio?
a654 4
# SMSC LPC47M192 hardware monitor
#smscmon*	at iic? addr 0x2c
#smscmon*	at iic? addr 0x2d	# (alternate address)

d663 1
a663 1
#viaenv* 	at pci? dev ? function ?
d808 1
a808 1
jmide*		at pci? dev ? function ?	# JMicron PCI-e PATA/SATA controllers
d810 1
a810 1
mvsata* 	at pci? dev ? function ?	# Marvell Hercules-I/II
d819 1
a819 1
slide*		at pci? dev ? function ?	# Symphony Labs IDE controllers
a821 1
toshide*	at pci? dev ? function ?	# TOSHIBA PICCOLO controllers
d832 1
a832 1
siisata* at cardbus? function ? 		# SiI SteelVine controllers
d843 1
a843 1
options 	ATADEBUG
d905 1
a905 1
bge*	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
d912 1
a912 1
ex*	at pci? dev ? function ?	# 3Com 3c90x[BC]
d920 1
a920 1
jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 Ethernet
d964 1
a964 1
tr*	at isapnp?			# IBM/3Com TROPIC Token-Ring
d978 1
a978 1
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLAN/IEEE (802.11)
d990 4
a993 4
eg0	at isa? port 0x280 irq 9		# 3c505 Ethernet cards
el0	at isa? port 0x300 irq 9		# 3c501 Ethernet cards
ep*	at isa? port ? irq ?			# 3c509 Ethernet cards
ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3c507
d1006 1
a1006 1
ne0	at isa? port 0x280 irq 9		# NE[12]000 Ethernet cards
d1011 1
a1011 1
tr*	at isa? port ? irq ?			# 3Com TROPIC based Token-Ring
d1018 1
a1018 1
ex*	at cardbus? function ?	# 3Com 3c575TX
d1099 1
a1099 1
uhidev* at uhub? port ? configuration ? interface ?
a1112 3
# USB TEMPer and TEMPerHUM
uthum*	at uhidev? reportid ?

d1114 1
a1114 1
ucycom* at uhidev? reportid ?
a1118 4
# USB LCDs and USB-VGA adaptors
udl*	at uhub? port ?		# DisplayLink DL-1x0/1x5
wsdisplay* at udl?

d1123 1
a1123 1
umodem* at uhub? port ? configuration ?
d1126 3
a1128 2
# Option N.V. Wireless WAN modems
uhso*	at uhub? port ? configuration ?
d1135 1
a1135 1
uaudio* at uhub? port ? configuration ?
d1174 1
a1174 1
uchcom* at uhub? port ? 	# WinChipHead CH341/CH340 serial adapter
d1196 1
a1196 1
uberry* at uhub? port ?
d1202 1
a1202 1
uvisor* at uhub? port ?
d1216 1
a1216 1
utoppy* at uhub? port ?
d1219 1
a1219 1
uyap*	at uhub? port ?
d1227 2
a1230 1
u3ginit* at uhub? port ?
d1235 1
a1235 1
ugensa* at uhub? port ?
d1241 1
a1241 1
oboe*	at pci? dev ? function ?
d1246 1
a1246 1
fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
d1249 1
a1249 1
fwohci* at cardbus? function ?		# IEEE1394 Open Host Controller
d1259 2
a1260 2
sdhc*	at pci?				# SD Host Controller
sdmmc*	at sdhc?			# SD/MMC bus
d1273 1
a1273 1
azalia* at pci? dev ? function ?	# High Definition Audio
d1344 1
a1344 1
#az0	at isa? port 0x350	# Aztech/PackardBell FM Radio Card
d1346 1
a1346 1
#rt0	at isa? port 0x20c	# AIMS Lab Radiotrack & compatible
d1350 1
a1350 1
#rtii0	at isa? port 0x20c	# AIMS Lab Radiotrack II FM Radio Card
d1352 1
a1352 1
#sf2r0	at isa? port 0x384	# SoundForte RadioLink SF16-FMR2 FM Radio Card
d1367 1
a1367 1
pseye* at uhub? 		# Sony PLAYSTATION(R) Eye webcam
d1375 2
a1376 2
bktr*	at pci? dev ? function ?
radio*	at bktr?
d1467 2
a1468 2
pseudo-device 	crypto			# /dev/crypto device
pseudo-device	swcrypto		# software crypto implementation
d1487 2
a1488 2
options 	MEMORY_DISK_HOOKS	# enable root ramdisk
options 	MEMORY_DISK_DYNAMIC	# loaded via kernel module
a1499 1
#options	PPPOE_SERVER            # Enable PPPoE server via link0
d1506 2
a1507 2
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC 1933)
#pseudo-device	faith			# IPv[46] TCP relay translation i/f
a1514 1
#pseudo-device 	etherip 		# Tunnel Ethernet over IP
d1564 6
a1569 6
options 	VERIFIED_EXEC_FP_RMD160
options 	VERIFIED_EXEC_FP_SHA256
options 	VERIFIED_EXEC_FP_SHA384
options 	VERIFIED_EXEC_FP_SHA512
options 	VERIFIED_EXEC_FP_SHA1
options 	VERIFIED_EXEC_FP_MD5
@


1.890.2.6
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.890.2.5 2010/03/11 15:02:27 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.890.2.5 $"
a37 1
#options 	PAE		# PAE mode (36 bits physical addressing)
a215 1
#options	MPLS		# MultiProtocol Label Switching (needs ifmpls)
a226 1
options 	IPFILTER_COMPAT # Compat for IP-Filter
a353 1
#acpicpu*	at acpi?		# ACPI CPU
a378 1
sony*		at acpi?		# Sony Miscellaneous Controller
a380 1
vald*		at acpi?		# Toshiba Libretto hotkeys
a382 2
wmidell*	at acpiwmibus?		# Dell WMI mappings
#wmihp*		at acpiwmibus?		# HP WMI mappings
d390 6
d459 1
a459 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-LPC w/ timecounter,
a460 1
fwhrng* at ichlpcib?		# Intel 82802 FWH Random Number Generator
a558 10
# DRI driver
i915drm*	at vga?		# Intel i915, i945 DRM driver
mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm*		at vga?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at vga?		# ATI Rage 128 DRM driver
radeondrm*	at vga?		# ATI Radeon DRM driver
savagedrm*	at vga?		# S3 Savage DRM driver
sisdrm*		at vga?		# SiS DRM driver
tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver

d619 1
a619 5
iic*	at amdpm?

# Acer Labs M7101 SMBus controller
alipm*	at pci? dev ? function ?
iic*	at alipm?
a684 4
#spdmem* at iic? addr 0x54
#spdmem* at iic? addr 0x55
#spdmem* at iic? addr 0x56
#spdmem* at iic? addr 0x57
d1279 1
a1279 1
# PCI SD/MMC controller
d1281 1
a1282 4
# CardBus SD/MMC controller
sdhc*	at cardbus? function ?		# SD Host Controller

sdmmc*	at sdhc?			# SD/MMC bus
a1430 4
# Bluetooth Apple Magic Mouse
btmagic* at bthub?
wsmouse* at btmagic? mux 0

d1505 1
a1505 1
pseudo-device	fss			# file system snapshot device
a1518 1
#pseudo-device	ifmpls			# MPLS pseudo-interface
d1572 3
@


1.890.2.7
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.890.2.6 2010/08/11 22:52:10 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.890.2.6 $"
a570 1
viadrm*		at vga?		# VIA DRM driver
a1207 1
upgt*	at uhub? port ?		# Intersil PrismGT
a1541 3
# NPF
#pseudo-device	npf

@


1.889
log
@Please don't leave a debug option in GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.888 2008/04/09 17:35:17 dyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.888 $"
d450 3
@


1.889.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.889 2008/04/11 11:55:18 tsutsui Exp $
d23 1
a23 1
#options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.889 $"
d35 2
d102 1
a102 1
options		MODULAR		# new style module framework
d104 1
d246 4
a249 4
#options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
#options 	EISAVERBOSE	# verbose EISA device autoconfig messages
#options 	MIIVERBOSE	# verbose PHY autoconfig messages
#options 	PCIVERBOSE	# verbose PCI device autoconfig messages
d253 1
a253 1
#options 	USBVERBOSE	# verbose USB device autoconfig messages
d256 1
a256 1
#options 	MCAVERBOSE	# verbose MCA device autoconfig messages
d316 5
d343 2
a371 1
hpqlb*		at acpi?		# HP Quick Launch Buttons
a449 3
# Temperatures
amdtemp* at pci? dev ? function ?	# AMD CPU Temperature sensors

a1448 3
options		MEMORY_DISK_HOOKS	# enable root ramdisk
options		MEMORY_DISK_DYNAMIC	# loaded via kernel module

@


1.889.2.2
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.889.2.1 2008/05/18 12:32:09 yamt Exp $
d23 1
a23 1
options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.889.2.1 $"
a347 1
acpidalb*	at acpi?		# ACPI Direct Application Launch Button
a417 1
pci*	at elansc? bus ?
a806 1
siisata*	at pci? dev ? function ?	# SiI SteelVine controllers
a1177 3
# RIM BlackBerry
uberry*	at uhub? port ?

@


1.889.2.3
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.889.2.2 2008/06/04 02:04:46 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.889.2.2 $"
a1501 3
# cmos(4) pseudo-device
pseudo-device	cmos

@


1.888
log
@Attach elansc at mainbus instead of at pci.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.887 2008/04/03 22:51:09 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.887 $"
d132 1
a132 1
makeoptions 	DEBUG="-g"	# compile full symbol table
@


1.887
log
@Add finsio(4) entry (commented out).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.886 2008/03/31 15:19:28 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.886 $"
d132 1
a132 1
#makeoptions 	DEBUG="-g"	# compile full symbol table
d447 1
a447 1
elansc* at pci? dev ? function ?	# AMD Elan SC520 System Controller
@


1.886
log
@Enable asus(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.885 2008/03/29 00:21:01 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.885 $"
d645 3
@


1.885
log
@Add and enable lii(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.884 2008/03/18 20:48:42 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.884 $"
d368 1
@


1.884
log
@Back out previous, which obviously wasn't meant to get committed.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.882 2008/02/29 14:42:32 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.882 $"
d908 1
@


1.883
log
@Split device_t and softc for ATA devices, as well as wd(4).  Other
cosmetic changes where appropriate.
@
text
@d1 1
a1 2
# $NetBSD: ALL,v 1.160 2008/02/09 19:34:58 jmmv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
d3 1
a3 1
# ALL machine description file
d5 9
a13 3
# This machine description includes all devices and options and it is
# used to compile-test the source and does not necessarily produce a
# bootable or useful kernel.
d25 1
a25 1
#ident 		"ALL-$Revision: 1.160 $"
d27 4
a30 1
maxusers	32		# estimated number of users
d36 1
a36 1
options 	PIC_DELAY
d40 1
a40 1
options 	EST_FREQ_USERWRITE	# any user can set frequency
d49 1
a49 1
options 	VIA_PADLOCK
d52 1
a52 4
options 	INTEL_ONDEMAND_CLOCKMOD

# XBOX support
options		XBOX
d56 1
a56 1
options 	PERFCTRS	# performance-monitoring counters support
d61 1
a61 1
options 	CPURESET_DELAY=2000
d65 1
a65 1
options 	CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
d68 1
a68 1
options 	CONS_OVERRIDE	# Always use above! independent of boot info
d75 9
a83 2
options 	REALBASEMEM=639		# size of base memory (in KB)
options 	REALEXTMEM=15360	# size of extended memory (in KB)
d91 1
a91 1
options 	NO_TSC_TIME	# Don't use TSC microtime, even if available.
a97 4
options 	SEMMNI=10	# number of semaphore identifiers
options 	SEMMNS=60	# number of semaphores in system
options 	SEMUME=10	# max number of undo entries per process
options 	SEMMNU=30	# number of undo structures in system
a98 1
options 	SHMMAXPGS=2048	# 2048 pages is the default
d102 3
a104 1
options 	MODULAR		# new modules framework
d107 1
a107 1
options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
d111 1
a111 1
options 	BEEP_ONHALT
d113 3
a115 3
options 	BEEP_ONHALT_COUNT=3	# Times to beep
options 	BEEP_ONHALT_PITCH=1500	# Default frequency (in Hz)
options 	BEEP_ONHALT_PERIOD=250	# Default duration (in msecs)
d119 2
a120 2
options 	BUFQ_READPRIO
options 	BUFQ_PRIOCSCAN
d123 3
a125 3
options 	DIAGNOSTIC	# expensive kernel consistency checks
options 	DEBUG		# expensive debugging checks/support
options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
d127 1
a127 1
options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
d129 7
a135 7
options 	DDB_VERBOSE_HELP
options 	KGDB		# remote debugger
options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
makeoptions 	DEBUG="-g"	# compile full symbol table
options 	SYSCALL_STATS	# per syscall counts
options 	SYSCALL_TIMES 	# per syscall times
options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
d151 2
a152 2
options 	COMPAT_386BSD_MBRPART # recognize old partition ID
options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
d159 5
a163 5
options 	COMPAT_MACH	# binary compatibility with Mach binaries
options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
options 	EXEC_MACHO	# exec MACH-O binaries
options 	COMPAT_NDIS	# NDIS network driver
options 	COMPAT_PECOFF	# kernel support to run Win32 apps
d166 6
a171 1
options 	X86EMU		# 386 Real Mode emulator
a191 1
file-system 	SYSVBFS		# System V boot file system
d194 2
a195 6
file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
file-system 	PUFFS		# experimental - Userspace file system support
file-system 	HFS		# experimental - Apple HFS+ file system
file-system 	EFS		# Silicon Graphics Extent File System
file-system 	FILECORE	# Acorn filecore file system
file-system 	ADOSFS		# AmigaDOS file system
d199 1
a199 1
options 	FFS_EI		# FFS Endian Independent support
d203 1
a203 2
options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
options		UFS_EXTATTR
d205 2
a206 2
options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
a207 1
options 	VNODE_LOCKDEBUG
d210 1
a210 1
options 	GATEWAY		# packet forwarding
d213 3
a215 3
options 	IPSEC		# IP security
options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
d217 4
a220 4
options 	MROUTING	# IP multicast routing
options 	PIM		# Protocol Independent Multicast
options 	ISO,TPIP	# OSI
options 	EON		# OSI tunneling over IP
d228 1
a228 1
options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
a229 1
options 	TCP_SIGNATURE	# RFC2385 support, used with BGP
d231 12
a242 12
options 	ALTQ		# Manipulate network interfaces' output queues
options 	ALTQ_BLUE	# Stochastic Fair Blue
options 	ALTQ_CBQ	# Class-Based Queueing
options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
options 	ALTQ_FIFOQ	# First-In First-Out Queue
options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
options 	ALTQ_LOCALQ	# Local queueing discipline
options 	ALTQ_PRIQ	# Priority Queueing
options 	ALTQ_RED	# Random Early Detection
options 	ALTQ_RIO	# RED with IN/OUT
options 	ALTQ_WFQ	# Weighted Fair Queueing
d250 2
a251 2
options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
d254 1
a254 1
options 	PNPBIOSVERBOSE	# verbose PnP BIOS messages
d264 1
a264 1
options 	WSEMUL_SUN		# sun terminal emulation
d268 4
a271 4
options 	WS_DEFAULT_FG=WSCOL_WHITE
options 	WS_DEFAULT_BG=WSCOL_BLACK
options 	WS_DEFAULT_COLATTR="(0)"
options 	WS_DEFAULT_MONOATTR="(0)"
d273 3
a275 3
options 	WS_KERNEL_BG=WSCOL_BLACK
options 	WS_KERNEL_COLATTR="(0)"
options 	WS_KERNEL_MONOATTR="(0)"
d278 1
a278 1
options 	WSDISPLAY_BORDER_COLOR=WSCOL_BLUE	# default color
d284 1
a284 1
options 	WSKBD_EVENT_AUTOREPEAT		# auto repeat in event mode
d289 2
a290 2
options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver
options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver 
d292 1
a292 1
options 	WSDISPLAY_DEFAULTSCREENS=4
d296 1
a296 1
options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
d298 1
a298 3
options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
# issue VGA BIOS POST on resume
options 	VGA_POST
d322 1
a322 1
p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
d337 1
a337 1
ipmi0		at mainbus?
d346 1
a346 1
#options 	ACPI_SCANPCI	# find PCI roots using ACPI
d350 2
a351 2
options 	ACPI_ACTIVATE_DEV	# If set, activate inactive devices
options 	ACPICA_PEDANTIC		# force strict conformance to the Spec.
d354 1
d367 1
a367 1
aiboost* 	at acpi?		# ASUS AI Booster Hardware monitor
d369 2
a370 2
com* 		at acpi?		# Serial communications interface
fdc* 		at acpi?		# Floppy disk controller
d373 1
a373 1
lpt* 		at acpi?		# Parallel port
d395 1
a395 1
pnpbios*	at mainbus?
d398 4
a401 4
ess*		at pnpbios? index ?	# ESS AudioDrive
sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
ym*		at pnpbios? index ?	# Yamaha OPL3-SA[23] audio
d408 1
a408 1
com*		at pnpbios? index ?	# serial ports
d413 1
a413 1
lpt*		at pnpbios? index ?	# parallel ports
d415 3
a417 3
pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
fdc*		at pnpbios? index ?	# floppy controller
npx*		at pnpbios? index ?	# Math coprocessor
d420 1
a420 1
pciide* 	at pnpbios? index ?
d428 5
a432 5
options 	PCIBIOS			# PCI BIOS support
options 	PCIBIOSVERBOSE		# PCI BIOS verbose info
options 	PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
options 	PCIBIOS_INTR_GUESS	# see pcibios(4)
options 	PCIBIOS_LIBRETTO_FIXUP	# this code makes the Toshiba Libretto
d435 1
a435 1
options 	PCIBIOS_SHARP_MM20_FIXUP # this code makes the Sharp MM 20
d441 3
a443 3
options 	PCI_ADDR_FIXUP		# fixup PCI I/O addresses
options 	PCI_BUS_FIXUP		# fixup PCI bus numbering
options 	PCI_INTR_FIXUP		# fixup PCI interrupt routing
a447 2
elanpar*	at elansc?
elanpex*	at elansc?
d450 5
a454 5
amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
hpet* 	at amdpcib?
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ watchdog and
					# SpeedStep support
hpet0 		at ichlpcib?		# High Precision Event Timer
d456 5
a460 5
gpio* 	at gcscpcib? 			# timecounter, watchdog and GPIO
piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
gscpcib* at pci? dev ? function ?	# NS Geode PCI-ISA w/ GPIO support
viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
iic*	at viapcib?
d477 1
a477 1
isa0 	at amdpcib?
d479 4
a482 4
isa0	at ichlpcib?
isa0	at piixpcib?
isa0	at gscpcib?
isa0	at viapcib?
d529 1
a529 1
options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
d534 1
a534 1
machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
d537 1
a537 1
wsdisplay* 	at machfb? console ?
d542 8
a549 8
options 	KVM86			# required for vesabios
vesabios*	at vesabiosbus?
vesafb* 	at vesabios?
options 	VESAFB_WIDTH=640
options 	VESAFB_HEIGHT=480
options 	VESAFB_DEPTH=8
options 	VESAFB_PM		# power management support
wsdisplay*	at vesafb? console ?
d552 2
a553 16
unichromefb*	at pci? dev ? function ?
wsdisplay*	at unichromefb?

# XBOX framebuffer console
xboxfb0		at pci? dev ? function ?
wsdisplay*	at xboxfb? console ?

# DRI driver
i915drm*	at vga?		# Intel i915, i945 DRM driver
mach64drm*	at vga?		# mach64 (3D Rage Pro, Rage) DRM driver
mgadrm*		at vga?		# Matrox G[24]00, G[45]50 DRM driver
r128drm*	at vga?		# ATI Rage 128 DRM driver
radeondrm*	at vga?		# ATI Radeon DRM driver
savagedrm*	at vga?		# S3 Savage DRM driver
sisdrm*		at vga?		# SiS DRM driver
tdfxdrm*	at vga?		# 3dfx (voodoo) DRM driver
d583 18
a600 18
com3	at isa? port 0x2e8 irq 9
ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
com*	at ast? slave ?
boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
com*	at boca? slave ?
tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
com*	at tcom? slave ?
rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
com*	at rtfps? slave ?
cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
com*	at addcom? slave ?
moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
com*	at moxa? slave ?
ioat*	at isa? port 0x220 irq 5	# BOCA IOAT66 6-port serial card
com*	at ioat? slave ?
d619 1
a619 1
iic*	at amdpm?			# sensors below are on this bus
d637 3
a639 6
adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
adt7463c* at iic? addr 0x2D		# Tyan S2881
adt7463c* at iic? addr 0x2E		# Tyan S2882-D

pic16lc*	at iic? addr 0x10	# XBOX PIC16LC
xbseeprom*	at iic? addr 0x54	# XBOX serial EEPROM
d642 1
a642 1
aps0 	at isa? port 0x1600
d645 1
a645 1
itesio0 	at isa? port 0x2e
d648 1
a648 1
lm0	at isa?	port 0x290		# other common: 0x280, 0x310
d651 1
a651 1
smsc0	at isa? port 0x02e
d654 2
a655 2
nsclpcsio*	at isa?
gpio*		at nsclpcsio?
d658 1
a658 1
ug0    at isa? port 0xe0
d661 1
a661 1
viaenv* 	at pci? dev ? function ?
d664 4
a667 1
spdmem*	at iic? addr 0x50
d676 1
a676 1
gpio*	at gscpcib?
d679 2
a680 2
gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
onewire*	at gpioow?
d683 1
a683 1
owtemp* 	at onewire?			# Temperature sensors
d703 1
a703 1
options 	SIOP_SYMLED		# drive the act. LED in software
d731 3
a733 3
dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
a759 2
# SCSI NIC
se* at scsibus? target ? lun ?
d801 1
a801 1
jmide* 		at pci? dev ? function ?	# JMicron PCI-e PATA/SATA controllers
d870 1
a870 1
fd0	at fdc0 drive 0
d873 1
a873 1
mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
d879 1
a879 1
wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
d962 1
a962 1
tr*	at pcmcia? function ?		# TROPIC based Token-Ring
d984 2
a985 2
depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
le*	at depca?
d988 1
a988 1
ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
d1005 1
a1007 1
ral*	at cardbus? function ?	# Ralink Technology
d1061 3
a1063 3
ehci*	at cardbus? function ?	# Enhanced Host Controller
ohci*	at cardbus? function ?	# Open Host Controller
uhci*	at cardbus? function ?	# Universal Host Controller (Intel)
d1066 1
a1066 1
slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
d1129 3
d1158 2
a1159 2
uchcom* at uhub? port ? 	# WinChipHead CH341/CH340 serial adapter
ucom*   at uchcom? portno ?
a1205 4
# XBOX controller
xboxcontroller*	at uhub? port ?
wsmouse*	at xboxcontroller? mux 0

d1209 1
a1209 1
options	UGEN_BULK_RA_WB
d1211 3
d1264 2
a1265 2
aria0	at isa? port 0x290 irq 10 		# Aria
ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
d1272 1
a1272 1
esl*	at pcmcia? function ?			# ESS 1688 AudioDrive
d1274 1
a1274 1
cms0	at isa? port 0x220			# Creative Music System
d1277 1
a1277 1
opl0	at isa? port 0x388	# use only if not attached to sound card
d1279 1
a1279 1
opl*	at esl?
d1293 1
a1293 1
mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
d1307 1
a1307 1
spkr0	at pcppi?		# PC speaker
d1312 9
a1320 9
az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
az1	at isa? port 0x358
rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
rt1	at isa? port 0x284
rt2	at isa? port 0x30c
rt3	at isa? port 0x384
rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
rtii1	at isa? port 0x30c
sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card
d1323 1
a1323 1
gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d1326 5
a1330 5
radio*	at az?
radio*	at gtp?
radio*	at rt?
radio*	at rtii?
radio*	at sf2r?
d1392 1
a1392 1
joy*	at pnpbios? index ?		# Game port
d1399 1
a1399 1
joy*	at eap?				# See CAVEATS in eap(4) before enabling
d1403 1
a1403 1
joy0	at isa? port 0x201
d1412 1
a1412 1
satlink0 at isa? port 0x300 drq 1
d1419 1
a1419 1
#include	"arch/i386/conf/ALL.local"
d1428 1
d1434 7
a1440 7
options 	RF_INCLUDE_EVENODD=1
options 	RF_INCLUDE_RAID5_RS=1
options 	RF_INCLUDE_PARITYLOGGING=1
options 	RF_INCLUDE_CHAINDECLUSTER=1
options 	RF_INCLUDE_INTERDECLUSTER=1
options 	RF_INCLUDE_PARITY_DECLUSTERING=1
options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
a1447 1
pseudo-device	agr			# Link aggregation agr(4)
d1449 1
a1449 1
pseudo-device	carp			# Common Address Redundancy Protocol
d1461 1
a1461 1
pseudo-device	faith			# IPv[46] tcp relay translation i/f
d1465 4
a1468 5
options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
pseudo-device	pf			# PF packet filter
pseudo-device	pflog			# PF log if
pseudo-device	kttcp
pseudo-device	etherip			# EtherIP
d1470 1
a1470 1
pseudo-device	srt			# source-address-based routing
d1477 1
a1477 1
options 	RND_COM			# use "com" randomness as well (BROKEN)
d1480 1
d1494 6
d1504 1
a1504 22

# drvctl - needed to show device dictionary via drvctl(8)
pseudo-device	drvctl

# pseudo-device lockstat needed for lockstat(8)
pseudo-device	lockstat

# software watchdog driver - swwdog(4)
pseudo-device	swwdog

# cmos(4) pseudo-device
pseudo-device	cmos

# Pass-to-Userspace Transporter
pseudo-device	putter

# Userspace block/char drivers
pseudo-device	pud

# pseudo audio device driver
pseudo-device	pad

d1516 2
a1517 3
options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
options PAX_SEGVGUARD=0			# PaX Segmentation fault guard
options PAX_ASLR=0			# PaX Address Space Layout Randomization
@


1.882
log
@Remove GENERIC.local from the repository

Make all the kernels that currently include their corresponding GENERIC.local
file use the cinclude directive instead of include.  This way config(1) will
not complain if the file cannot be found.

After doing this, remove the GENERIC.local files from the repository so that
the user will not see modified files during updates, and local changes to
them cannot end up in the repository by mistake.

Discussed in tech-kern@@ earlier this month.  No strong objections.
@
text
@d1 2
a2 1
# $NetBSD: GENERIC,v 1.881 2008/01/30 19:58:19 ad Exp $
d4 1
a4 1
# GENERIC machine description file
d6 3
a8 9
# This machine description file is used to generate the default NetBSD
# kernel.  The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
#
# The machine description file can be customised for your specific
# machine to reduce the kernel size and improve its performance.
#
# For further information on compiling NetBSD kernels, see the config(8)
# man page.
d20 1
a20 1
#ident 		"GENERIC-$Revision: 1.881 $"
d22 1
a22 4
maxusers	64		# estimated number of users

makeoptions 	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
							# tune for more modern
d28 1
a28 1
#options 	PIC_DELAY
d32 1
a32 1
#options 	EST_FREQ_USERWRITE	# any user can set frequency
d41 1
a41 1
#options 	VIA_PADLOCK
d44 4
a47 1
#options 	INTEL_ONDEMAND_CLOCKMOD
d51 1
a51 1
#options 	PERFCTRS	# performance-monitoring counters support
d56 1
a56 1
#options 	CPURESET_DELAY=2000
d60 1
a60 1
#options 	CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
d63 1
a63 1
#options 	CONS_OVERRIDE	# Always use above! independent of boot info
d70 2
a71 9
#options 	REALBASEMEM=639		# size of base memory (in KB)
#options 	REALEXTMEM=15360	# size of extended memory (in KB)

# The following options limit the overall size of physical memory
# and/or the maximum address used by the system.
# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
# and can deal with holes in the memory layout.
#options 	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
#options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)
d79 1
a79 1
#options 	NO_TSC_TIME	# Don't use TSC microtime, even if available.
d86 4
d91 1
d95 1
a95 3
options 	MULTIPROCESSOR	# SMP
options 	APM_NO_IDLE	# needed for SMP
options 	MPBIOS		# configure CPUs and APICs using MPBIOS
d98 1
a98 1
#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
d102 1
a102 1
#options 	BEEP_ONHALT
d104 3
a106 3
#options 	BEEP_ONHALT_COUNT=3	# Times to beep
#options 	BEEP_ONHALT_PITCH=1500	# Default frequency (in Hz)
#options 	BEEP_ONHALT_PERIOD=250	# Default duration (in msecs)
d110 2
a111 2
#options 	BUFQ_READPRIO
#options 	BUFQ_PRIOCSCAN
d114 3
a116 3
#options 	DIAGNOSTIC	# expensive kernel consistency checks
#options 	DEBUG		# expensive debugging checks/support
#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
d118 1
a118 1
#options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
d120 7
a126 7
#options 	DDB_VERBOSE_HELP
#options 	KGDB		# remote debugger
#options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions 	DEBUG="-g"	# compile full symbol table
#options 	SYSCALL_STATS	# per syscall counts
#options 	SYSCALL_TIMES	# per syscall times
#options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
d142 2
a143 2
#options 	COMPAT_386BSD_MBRPART # recognize old partition ID
#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
d150 5
a154 5
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
#options 	COMPAT_NDIS	# NDIS network driver
#options 	COMPAT_PECOFF	# kernel support to run Win32 apps
d157 1
a157 6
# Wedge support
options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
# The following two options can break /etc/fstab, so handle with care
#options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
#options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges
d178 1
d181 6
a186 2
#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system 	HFS		# experimental - Apple HFS+ (read-only)
d190 1
a190 1
#options 	FFS_EI		# FFS Endian Independent support
d194 2
a195 1
#options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
d197 2
a198 2
#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
d200 1
d203 1
a203 1
#options 	GATEWAY		# packet forwarding
d206 3
a208 3
#options 	IPSEC		# IP security
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
d210 4
a213 4
#options 	MROUTING	# IP multicast routing
#options 	PIM		# Protocol Independent Multicast
#options 	ISO,TPIP	# OSI
#options 	EON		# OSI tunneling over IP
d221 1
a221 1
#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
d223 1
d225 12
a236 12
#options 	ALTQ		# Manipulate network interfaces' output queues
#options 	ALTQ_BLUE	# Stochastic Fair Blue
#options 	ALTQ_CBQ	# Class-Based Queueing
#options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
#options 	ALTQ_FIFOQ	# First-In First-Out Queue
#options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
#options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
#options 	ALTQ_LOCALQ	# Local queueing discipline
#options 	ALTQ_PRIQ	# Priority Queueing
#options 	ALTQ_RED	# Random Early Detection
#options 	ALTQ_RIO	# RED with IN/OUT
#options 	ALTQ_WFQ	# Weighted Fair Queueing
d244 2
a245 2
#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
#options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
d248 1
a248 1
#options 	PNPBIOSVERBOSE	# verbose PnP BIOS messages
d258 1
a258 1
#options 	WSEMUL_SUN		# sun terminal emulation
d262 4
a265 4
#options 	WS_DEFAULT_FG=WSCOL_WHITE
#options 	WS_DEFAULT_BG=WSCOL_BLACK
#options 	WS_DEFAULT_COLATTR="(0)"
#options 	WS_DEFAULT_MONOATTR="(0)"
d267 3
a269 3
#options 	WS_KERNEL_BG=WSCOL_BLACK
#options 	WS_KERNEL_COLATTR=""
#options 	WS_KERNEL_MONOATTR=""
d272 1
a272 1
#options 	WSDISPLAY_BORDER_COLOR=WSCOL_BLUE	# default color
d278 1
a278 1
#options 	WSKBD_EVENT_AUTOREPEAT		# auto repeat in event mode
d283 2
a284 2
#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver
d286 1
a286 1
#options 	WSDISPLAY_DEFAULTSCREENS=4
d290 1
a290 1
#options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
d292 3
a294 1
#options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
d318 1
a318 1
#p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
d333 1
a333 1
#ipmi0		at mainbus?
d342 1
a342 1
options 	ACPI_SCANPCI	# find PCI roots using ACPI
d346 2
a347 2
#options 	ACPI_ACTIVATE_DEV	# If set, activate inactive devices
#options 	ACPICA_PEDANTIC		# force strict conformance to the Spec.
a349 1
apm*		at acpi?		# ACPI apm emulation
d362 1
a362 1
aiboost*	at acpi?		# ASUS AI Booster Hardware Monitor
d364 2
a365 2
#com* 		at acpi?		# Serial communications interface
#fdc* 		at acpi?		# Floppy disk controller
d368 1
a368 1
#lpt* 		at acpi?		# Parallel port
d390 1
a390 1
#pnpbios*	at mainbus?
d393 4
a396 4
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# Yamaha OPL3-SA[23] audio
d403 1
a403 1
#com*		at pnpbios? index ?	# serial ports
d408 1
a408 1
#lpt*		at pnpbios? index ?	# parallel ports
d410 3
a412 3
#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller
#npx*		at pnpbios? index ?	# Math coprocessor
d415 1
a415 1
#pciide* 	at pnpbios? index ?
d423 5
a427 5
#options 	PCIBIOS			# PCI BIOS support
#options 	PCIBIOSVERBOSE		# PCI BIOS verbose info
#options 	PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
#options 	PCIBIOS_INTR_GUESS	# see pcibios(4)
#options 	PCIBIOS_LIBRETTO_FIXUP	# this code makes the Toshiba Libretto
d430 1
a430 1
#options 	PCIBIOS_SHARP_MM20_FIXUP # this code makes the Sharp MM 20
d436 3
a438 3
#options 	PCI_ADDR_FIXUP		# fixup PCI I/O addresses
#options 	PCI_BUS_FIXUP		# fixup PCI bus numbering
#options 	PCI_INTR_FIXUP		# fixup PCI interrupt routing
d443 2
d447 5
a451 5
#amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
#hpet* 	at amdpcib?
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
					# watchdog, SpeedStep and HPET
#hpet* 	at ichlpcib?
d453 5
a457 5
gpio* 	at gcscpcib?			# timecounter, watchdog and GPIO
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
#gscpcib* at pci? dev ? function ?	# NS Geode PCI-ISA w/ GPIO support
#viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
d474 1
a474 1
#isa0 	at amdpcib?
d476 4
a479 4
#isa0	at ichlpcib?
#isa0	at piixpcib?
#isa0	at gscpcib?
#isa0	at viapcib?
d526 1
a526 1
#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
d531 1
a531 1
#machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
d534 1
a534 1
#wsdisplay* 	at machfb? console ?
d539 8
a546 8
#options 	KVM86			# required for vesabios
#vesabios*	at vesabiosbus?
#vesafb* 	at vesabios?
#options 	VESAFB_WIDTH=640
#options 	VESAFB_HEIGHT=480
#options 	VESAFB_DEPTH=8
#options 	VESAFB_PM		# power management support
#wsdisplay*	at vesafb? console ?
d549 16
a564 2
#unichromefb* 	at pci? dev ? function ?
#wsdisplay* 	at unichromefb?
d594 18
a611 18
#com3	at isa? port 0x2e8 irq 9
#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
#com*	at ast? slave ?
#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
#boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
#boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
#com*	at boca? slave ?
#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
#com*	at tcom? slave ?
#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
#com*	at rtfps? slave ?
#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
#addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
#com*	at addcom? slave ?
#moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
#com*	at moxa? slave ?
#ioat*	at isa? port 0x220 irq 5	# BOCA IOAT66 6-port serial card
#com*	at ioat? slave ?
d630 1
a630 1
#iic*	at amdpm?			# sensors below are on this bus
d648 6
a653 3
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D
d656 1
a656 1
#aps0 	at isa? port 0x1600
d659 1
a659 1
#itesio0 	at isa? port 0x2e
d662 1
a662 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310
d665 1
a665 1
#smsc0	at isa? port 0x02e
d668 2
a669 2
#nsclpcsio*	at isa?
#gpio*		at nsclpcsio?
d672 1
a672 1
#ug0    at isa? port 0xe0
d675 1
a675 1
#viaenv*	at pci? dev ? function ?
d678 1
a678 4
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
d687 1
a687 1
#gpio*	at gscpcib?
d690 2
a691 2
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
#onewire*	at gpioow?
d694 1
a694 1
#owtemp* 	at onewire?			# Temperature sensors
d714 1
a714 1
#options 	SIOP_SYMLED		# drive the act. LED in software
d742 3
a744 3
#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
d771 2
d814 1
a814 1
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
d883 1
a883 1
#fd0	at fdc0 drive 0
d886 1
a886 1
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
d892 1
a892 1
#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
d975 1
a975 1
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
d997 2
a998 2
#depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
#le*	at depca?
d1001 1
a1001 1
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
a1017 1
ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g
d1020 1
d1074 3
a1076 3
ehci*	at cardbus? function ?		# Enhanced Host Controller
ohci*	at cardbus? function ?		# Open Host Controller
uhci*	at cardbus? function ?		# Universal Host Controller (Intel)
d1079 1
a1079 1
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
a1141 3
stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?

d1168 2
a1169 2
uchcom*	at uhub? port ?		# WinChipHead CH341/CH340 serial adapter
ucom*	at uchcom? portno ?
d1216 4
d1223 1
a1223 1
options UGEN_BULK_RA_WB
a1224 3
# USB generic serial port (e.g., data over cellular)
ugensa*	at uhub? port ?
ucom*	at ugensa?
d1275 2
a1276 2
#aria0	at isa? port 0x290 irq 10 		# Aria
#ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
d1283 1
a1283 1
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive
d1285 1
a1285 1
#cms0	at isa? port 0x220			# Creative Music System
d1288 1
a1288 1
#opl0	at isa? port 0x388	# use only if not attached to sound card
d1290 1
a1290 1
#opl*	at esl?
d1304 1
a1304 1
#mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
d1318 1
a1318 1
#spkr0	at pcppi?		# PC speaker
d1323 9
a1331 9
#az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
#az1	at isa? port 0x358
#rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
#rt1	at isa? port 0x284
#rt2	at isa? port 0x30c
#rt3	at isa? port 0x384
#rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
#rtii1	at isa? port 0x30c
#sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card
d1334 1
a1334 1
#gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d1337 5
a1341 5
#radio*	at az?
#radio*	at gtp?
#radio*	at rt?
#radio*	at rtii?
#radio*	at sf2r?
d1403 1
a1403 1
#joy*	at pnpbios? index ?		# Game port
d1410 1
a1410 1
#joy*	at eap?				# See CAVEATS in eap(4) before enabling
d1414 1
a1414 1
#joy0	at isa? port 0x201
d1423 1
a1423 1
#satlink0 at isa? port 0x300 drq 1
d1430 1
a1430 1
cinclude "arch/i386/conf/GENERIC.local"
a1438 1
pseudo-device	bio			# RAID control device driver
d1444 7
a1450 7
#options 	RF_INCLUDE_EVENODD=1
#options 	RF_INCLUDE_RAID5_RS=1
#options 	RF_INCLUDE_PARITYLOGGING=1
#options 	RF_INCLUDE_CHAINDECLUSTER=1
#options 	RF_INCLUDE_INTERDECLUSTER=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
d1458 1
d1460 1
a1460 1
#pseudo-device	carp			# Common Address Redundancy Protocol
d1472 1
a1472 1
#pseudo-device	faith			# IPv[46] tcp relay translation i/f
d1476 5
a1480 4
#options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
pseudo-device	agr			# IEEE 802.3ad link aggregation
#pseudo-device	pf			# PF packet filter
#pseudo-device	pflog			# PF log if
d1482 1
a1482 1
#pseudo-device	srt			# source-address-based routing
d1489 1
a1489 1
#options 	RND_COM			# use "com" randomness as well (BROKEN)
a1491 1
pseudo-device	lockstat		# lock profiling
d1505 4
a1508 2
# pseudo audio device driver
pseudo-device	pad
d1510 1
a1510 1
# userland interface to drivers, including autoconf and properties retrieval
d1513 17
a1529 1
options 	FILEASSOC		# fileassoc(9) - required for Veriexec
a1530 3
# Veriexec
pseudo-device	veriexec
#
d1542 3
a1544 2
options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
options 	PAX_ASLR=0		# PaX Address Space Layout Randomization
@


1.881
log
@Crank maxusers to 64.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.880 2008/01/21 22:12:00 ichiro Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.880 $"
d1419 1
a1419 1
include	"arch/i386/conf/GENERIC.local"
@


1.881.6.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a367 1
asus*		at acpi?		# ASUS hotkeys
a907 1
lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
d1419 1
a1419 1
cinclude "arch/i386/conf/GENERIC.local"
@


1.881.6.2
log
@Sync with HEAD.
@
text
@d35 2
d102 1
a102 1
options		MODULAR		# new style module framework
d104 1
d246 4
a249 4
#options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
#options 	EISAVERBOSE	# verbose EISA device autoconfig messages
#options 	MIIVERBOSE	# verbose PHY autoconfig messages
#options 	PCIVERBOSE	# verbose PCI device autoconfig messages
d253 1
a253 1
#options 	USBVERBOSE	# verbose USB device autoconfig messages
d256 1
a256 1
#options 	MCAVERBOSE	# verbose MCA device autoconfig messages
d316 5
d343 2
a357 1
acpidalb*	at acpi?		# ACPI Direct Application Launch Button
a371 1
hpqlb*		at acpi?		# HP Quick Launch Buttons
a426 1
pci*	at elansc? bus ?
d447 1
a447 1
elansc* at mainbus? bus ?		# AMD Elan SC520 System Controller
a449 3
# Temperatures
amdtemp* at pci? dev ? function ?	# AMD CPU Temperature sensors

a644 3
# Fintek Super I/O with hardware monitor
#finsio0 	at isa? port 0x4e

a809 1
siisata*	at pci? dev ? function ?	# SiI SteelVine controllers
a1180 3
# RIM BlackBerry
uberry*	at uhub? port ?

a1445 3
options		MEMORY_DISK_HOOKS	# enable root ramdisk
options		MEMORY_DISK_DYNAMIC	# loaded via kernel module

@


1.881.6.3
log
@Sync with HEAD.
@
text
@a1501 3
# cmos(4) pseudo-device
pseudo-device	cmos

@


1.881.6.4
log
@Sync with HEAD.
@
text
@d89 2
a197 1
options 	WAPBL		# File system journaling support - Experimental
d329 1
a329 1
ipmi0		at mainbus?
a341 1
options 	VGA_POST		# in-kernel support for VGA POST
a907 1
iwn*	at pci? dev ? function ?	# Intel PRO/Wireless 4965AGN
a1337 7
# Video capture devices

pseye* at uhub?			# Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub?		# USB Video Class capture devices
video* at videobus?


a1479 5
#
# accept filters
pseudo-device	accf_data		# "dataready" accept filter
pseudo-device	accf_http		# "httpready" accept filter

@


1.881.6.5
log
@Sync with HEAD.
@
text
@d1276 4
d1285 1
@


1.881.6.6
log
@Sync with HEAD.
@
text
@a31 6
# For GENERIC, we build the exec formats as modules by default.
no options	EXEC_AOUT       # exec a.out binaries
no options	EXEC_ELF32      # exec ELF binaries
no options	EXEC_SCRIPT     # exec #! scripts
no options	COREDUMP

a91 1
# Note: SysV IPC parameters could be changed dynamically, see sysctl(8).
d95 1
a95 2
#options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support
no options	AIO		# POSIX AIO, built as a module
d97 1
d99 1
d132 14
a145 14
# Compatibility options, built as modules by default
#options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
#options 	COMPAT_09	# NetBSD 0.9
#options 	COMPAT_10	# NetBSD 1.0
#options 	COMPAT_11	# NetBSD 1.1
#options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
#options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
#options 	COMPAT_14	# NetBSD 1.4
#options 	COMPAT_15	# NetBSD 1.5
#options 	COMPAT_16	# NetBSD 1.6
#options 	COMPAT_20	# NetBSD 2.0
#options 	COMPAT_30	# NetBSD 3.0
#options 	COMPAT_40	# NetBSD 4.0
#options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
d149 5
a153 5
#options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
#options 	COMPAT_LINUX	# binary compatibility with Linux
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
d168 21
a188 21
# File systems, built as modules by default
#file-system 	FFS		# UFS
#file-system 	EXT2FS		# second extended file system (linux)
#file-system 	LFS		# log-structured file system
#file-system 	MFS		# memory file system
#file-system 	NFS		# Network File System client
#file-system 	NTFS		# Windows/NT file system (experimental)
#file-system 	CD9660		# ISO 9660 + Rock Ridge file system
#file-system 	MSDOSFS		# MS-DOS file system
#file-system 	FDESC		# /dev/fd
#file-system 	KERNFS		# /kern
#file-system 	NULLFS		# loopback file system
#file-system 	OVERLAY		# overlay file system
#file-system 	PORTAL		# portal filesystem (still experimental)
#file-system 	PROCFS		# /proc
#file-system 	UMAPFS		# NULLFS + uid and gid remapping
#file-system 	UNION		# union file system
#file-system 	CODA		# Coda File System; also needs vcoda (below)
#file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
#file-system 	PTYFS		# /dev/ptm support
#file-system 	TMPFS		# Efficient memory file-system
d193 1
a193 1
#options 	QUOTA		# UFS quotas
d195 1
d197 2
d200 1
a200 1
#options 	NFSSERVER	# Network File System server
d218 2
a219 2
#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
#options 	PPP_DEFLATE	# Deflate compression support for PPP
d449 1
a449 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
d476 1
a476 1
isa0	at ichlpcib?
a527 1
options 	PMS_ELANTECH_TOUCHPAD	# Enable support for Elantech Touchpads
d634 3
a636 4
# dbCool Thermal monitor and fan controller
#dbcool* at iic? addr 0x2C		# Unknown other motherboard(s)
#dbcool* at iic? addr 0x2D		# Tyan S2881
#dbcool* at iic? addr 0x2E		# Tyan S2882-D
a908 1
jme*	at pci? dev ? function ?	# JMicron JMC2[56]0 ethernet
a1216 4
# USB 3G datacards
u3g*	at uhub? port ?
ucom*	at u3g?

a1256 1
gcscaudio* at pci? dev ? function ?	# AMD Geode CS5536 Companion Audio
d1484 3
a1486 3
# accept filters, built as modules by default
#pseudo-device	accf_data		# "dataready" accept filter
#pseudo-device	accf_http		# "httpready" accept filter
d1501 1
a1501 1
#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
d1504 1
a1504 1
#pseudo-device	nsmb			# experimental - SMB requester
@


1.881.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.884 2008/03/18 20:48:42 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.884 $"
d1419 1
a1419 1
cinclude "arch/i386/conf/GENERIC.local"
@


1.880
log
@enable 'uhmodem'
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.879 2008/01/16 09:37:05 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.879 $"
d27 1
a27 1
maxusers	32		# estimated number of users
@


1.879
log
@Remove options MATH_EMULATE.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.878 2008/01/09 14:28:54 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.878 $"
d1110 4
@


1.878
log
@Add gcscpcib(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.877 2008/01/07 08:39:03 martti Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.877 $"
a32 1
#options 	MATH_EMULATE	# floating point emulation
@


1.877
log
@Fixed indentation, it should be

option<space><tab>
makeoption<space><tab>
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.876 2008/01/03 07:21:21 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.876 $"
d454 4
a457 1
					# watchdog and SpeedStep support
d479 1
@


1.876
log
@Remove white-space.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.875 2007/12/31 15:31:56 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.875 $"
d29 1
a29 1
makeoptions	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
d50 1
a50 1
#options	VIA_PADLOCK
d83 1
a83 1
#options	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
d133 1
a133 1
#makeoptions	DEBUG="-g"	# compile full symbol table
@


1.875
log
@Remove systrace. Ok core@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.874 2007/12/30 13:15:22 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.874 $"
d1065 1
a1065 1
# PCMCIA USB controllers   
@


1.874
log
@Enable wedge autodiscovery and wedge support for GPT. Both MBR and BSD
disklabel support is *not* enabled, but documented.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.873 2007/12/29 06:09:04 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.873 $"
a95 1
#options 	SYSTRACE	# system call vetting via systrace(1)
@


1.873
log
@Update itesio(4) comments.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.872 2007/12/26 23:00:51 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.872 $"
d168 7
@


1.872
log
@Compile in by default (disabled) PaX ASLR for amd64 and i386.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.871 2007/12/26 16:28:15 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.871 $"
d635 1
a635 1
# iTE IT87xxF and compatible hardware monitors
@


1.871
log
@Add PHYSMEM_MAX_ADDR and PHYSMEM_MAX_SIZE options. This limit physical
memory based on overall size (useful for debugging to keep core dumps
small) or maximum address (when using devices with bus dma limits).
Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory
map and can therefore deal with fragmented memory.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.870 2007/12/25 01:03:32 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.870 $"
d1503 2
a1504 1
options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
@


1.870
log
@Make SMP the default on i386. For the time being the noacpi kernel does
not have it enabled.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.869 2007/12/21 15:20:13 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.869 $"
d79 7
@


1.869
log
@Add thinkpad at acpi
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.868 2007/12/17 04:36:16 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.868 $"
d97 3
@


1.868
log
@Add drvctl(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.867 2007/12/09 20:27:46 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.867 $"
d363 1
@


1.867
log
@Merge jmcneill-pm branch.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.866 2007/12/05 00:19:41 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.866 $"
d1473 3
@


1.867.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a78 7
# The following options limit the overall size of physical memory
# and/or the maximum address used by the system.
# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
# and can deal with holes in the memory layout.
#options	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
#options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)

d89 1
a96 3
options 	MULTIPROCESSOR	# SMP
options 	APM_NO_IDLE	# needed for SMP
options 	MPBIOS		# configure CPUs and APICs using MPBIOS
a157 7
# Wedge support
options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
# The following two options can break /etc/fstab, so handle with care
#options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
#options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges

a362 1
thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
d624 1
a624 1
# iTE IT87xxF Super I/O with watchdog and sensors support
a1472 3
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device	drvctl

d1489 1
a1489 2
options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
options 	PAX_ASLR=0		# PaX Address Space Layout Randomization
@


1.867.2.2
log
@Sync with HEAD
@
text
@d29 1
a29 1
makeoptions 	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
d50 1
a50 1
#options 	VIA_PADLOCK
d83 1
a83 1
#options 	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
d133 1
a133 1
#makeoptions 	DEBUG="-g"	# compile full symbol table
d1065 1
a1065 1
# PCMCIA USB controllers
@


1.867.2.3
log
@Sync with HEAD
@
text
@d454 1
a454 4
					# watchdog, SpeedStep and HPET
#hpet* 	at ichlpcib?
gcscpcib* at pci? dev ? function ?	# AMD CS5535/CS5536 PCI-ISA w/
gpio* 	at gcscpcib?			# timecounter, watchdog and GPIO
a475 1
isa0 	at gcscpcib?
@


1.867.2.4
log
@Sync with HEAD
@
text
@d33 1
@


1.867.2.5
log
@Sync with HEAD.
@
text
@a1109 4
# Huawei E220 3G/HSDPA modem
uhmodem* at uhub? port ? configuration ? interface ?
ucom*	at uhmodem? portno ?

@


1.866
log
@arc(4) -> arcmsr(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.865 2007/12/04 18:53:57 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.865 $"
d343 5
a347 1
acpiec* 	at acpi?		# ACPI Embedded Controller
@


1.866.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.866 2007/12/05 00:19:41 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.866 $"
d343 1
a343 5
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
acpiec* 	at acpi?		# ACPI Embedded Controller (late binding)
acpiecdt* 	at acpi?		# ACPI Embedded Controller (early binding)
@


1.865
log
@Enable arc(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.864 2007/12/02 05:19:13 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.864 $"
d740 1
a740 1
arc* 	at pci? dev ? function ?	# Areca SATA RAID controllers
@


1.864
log
@Add bcsp(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.863 2007/11/22 14:33:53 jnemeth Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.863 $"
d740 1
@


1.864.2.1
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.866 2007/12/05 00:19:41 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.866 $"
a739 1
arcmsr* at pci? dev ? function ?	# Areca SATA RAID controllers
@


1.864.2.2
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.864.2.1 2007/12/08 17:56:22 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.864.2.1 $"
a78 7
# The following options limit the overall size of physical memory
# and/or the maximum address used by the system.
# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
# and can deal with holes in the memory layout.
#options	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
#options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)

a96 3
options 	MULTIPROCESSOR	# SMP
options 	APM_NO_IDLE	# needed for SMP
options 	MPBIOS		# configure CPUs and APICs using MPBIOS
d343 1
a343 5
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
acpiec* 	at acpi?		# ACPI Embedded Controller (late binding)
acpiecdt* 	at acpi?		# ACPI Embedded Controller (early binding)
a358 1
thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
a1468 3
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device	drvctl

@


1.863
log
@comment out com*/lpt* at acpi? as they cause these ports to move from
their traditional location and imminent changes in -current will cause
them to move back
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.862 2007/11/15 12:58:29 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.862 $"
d1321 1
d1452 1
@


1.862
log
@Update for it(4) -> itesio(4) rename.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.861 2007/11/14 17:54:57 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.861 $"
d350 1
a350 1
com* 		at acpi?		# Serial communications interface
d354 1
a354 1
lpt* 		at acpi?		# Parallel port
@


1.861
log
@- Remove I486_CPU, I586_CPU, I686_CPU options. They buy us nothing and
  clutter the code significantly.
- Remove pccons.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.860 2007/11/11 17:56:10 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.860 $"
d621 1
a621 1
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00
@


1.860
log
@Enable pad(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.859 2007/11/04 14:34:22 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.859 $"
a28 6
# CPU support.  At least one is REQUIRED.
#options 	I386_CPU
options 	I486_CPU
options 	I586_CPU
options 	I686_CPU

a500 9
# ISA console
#pc0	at isa? port 0x60 irq 1		# pccons generic PC console driver
# Keyboard layout configuration for pccons
#options 	FRENCH_KBD
#options 	FINNISH_KBD
#options 	GERMAN_KBD
#options 	NORWEGIAN_KBD


@


1.859
log
@Remove System V semaphores and share memory options to set the limits:
SEMMNI, SEMMNS, SEMUME and SHMMAXPGS.

They can be tweaked via sysctl now. Ports that were setting values on
them weren't touched, I only removed the ones that were commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.858 2007/11/01 13:54:29 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.858 $"
d1478 3
@


1.859.2.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.862 2007/11/15 12:58:29 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.862 $"
d29 6
d507 9
d636 1
a636 1
#itesio0 	at isa? port 0x2e
a1477 3
# pseudo audio device driver
pseudo-device	pad

@


1.859.2.2
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.866 2007/12/05 00:19:41 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.866 $"
d350 1
a350 1
#com* 		at acpi?		# Serial communications interface
d354 1
a354 1
#lpt* 		at acpi?		# Parallel port
a739 1
arcmsr* at pci? dev ? function ?	# Areca SATA RAID controllers
a1320 1
bthub* at bcsp?
a1450 1
pseudo-device	bcsp			# BlueCore Serial Protocol
@


1.859.2.3
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.869 2007/12/21 15:20:13 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.869 $"
d343 1
a343 5
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
acpiec* 	at acpi?		# ACPI Embedded Controller (late binding)
acpiecdt* 	at acpi?		# ACPI Embedded Controller (early binding)
a358 1
thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
a1468 3
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device	drvctl

@


1.859.2.4
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.881 2008/01/30 19:58:19 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.881 $"
d27 1
a27 1
maxusers	64		# estimated number of users
d29 1
a29 1
makeoptions 	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
d33 1
d50 1
a50 1
#options 	VIA_PADLOCK
a78 7
# The following options limit the overall size of physical memory
# and/or the maximum address used by the system.
# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
# and can deal with holes in the memory layout.
#options 	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
#options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)

d89 1
a96 3
options 	MULTIPROCESSOR	# SMP
options 	APM_NO_IDLE	# needed for SMP
options 	MPBIOS		# configure CPUs and APICs using MPBIOS
d124 1
a124 1
#makeoptions 	DEBUG="-g"	# compile full symbol table
a157 7
# Wedge support
options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
# The following two options can break /etc/fstab, so handle with care
#options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
#options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges

d438 1
a438 4
					# watchdog, SpeedStep and HPET
#hpet* 	at ichlpcib?
gcscpcib* at pci? dev ? function ?	# AMD CS5535/CS5536 PCI-ISA w/
gpio* 	at gcscpcib?			# timecounter, watchdog and GPIO
a459 1
isa0 	at gcscpcib?
d625 1
a625 1
# iTE IT87xxF Super I/O with watchdog and sensors support
d1049 1
a1049 1
# PCMCIA USB controllers
a1090 4
# Huawei E220 3G/HSDPA modem
uhmodem* at uhub? port ? configuration ? interface ?
ucom*	at uhmodem? portno ?

d1493 1
a1493 2
options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
options 	PAX_ASLR=0		# PaX Address Space Layout Randomization
@


1.858
log
@Revert previous, thanks wikipedia :-)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.857 2007/11/01 13:48:52 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.857 $"
a98 4
#options 	SEMMNI=10	# number of semaphore identifiers
#options 	SEMMNS=60	# number of semaphores in system
#options 	SEMUME=10	# max number of undo entries per process
#options 	SEMMNU=30	# number of undo structures in system
a99 1
#options 	SHMMAXPGS=2048	# 2048 pages is the default
@


1.857
log
@Fix typo "iff" -> "if" reported by leot via freenode@@irc.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.856 2007/10/30 00:03:50 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.856 $"
d73 1
a73 1
#	you don't want the option below ON if you are using the
@


1.856
log
@options<space><tab>FOO
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.855 2007/10/29 00:47:17 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.855 $"
d73 1
a73 1
#	you don't want the option below ON iff you are using the
@


1.855
log
@Enable "options INTEL_CORETEMP".
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.854 2007/10/26 22:20:43 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.854 $"
d618 1
a618 1
options INTEL_CORETEMP
@


1.854
log
@- Add amdpcib(4) commented out.
- Comment out piixpcib(4) until the multiple PRs are fixed, this driver
  has been broken for long time in some machines.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.853 2007/10/17 19:54:42 garbled Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.853 $"
d59 1
a59 1
# options 	INTEL_ONDEMAND_CLOCKMOD
d617 3
@


1.853
log
@Merge the ppcoea-renovation branch to HEAD.

This branch was a major cleanup and rototill of many of the various OEA
cpu based PPC ports that focused on sharing as much code as possible
between the various ports to eliminate near-identical copies of files in
every tree.  Additionally there is a new PIC system that unifies the
interface to interrupt code for all different OEA ppc arches.  The work
for this branch was done by a variety of people, too long to list here.

TODO:
bebox still needs work to complete the transition to -renovation.
ofppc still needs a bunch of work, which I will be looking at.
ev64260 still needs to be renovated
amigappc was not attempted.

NOTES:
pmppc was removed as an arch, and moved to a evbppc target.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.824.2.3 2007/10/03 19:23:35 garbled Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.824.2.3 $"
d441 2
d445 1
a445 1
piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
d465 1
d467 1
a467 1
isa0	at piixpcib?
@


1.852
log
@Remove two \t at the end of DDB_VERBOSE_HELP, caught by Patrick Welche.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.851 2007/09/22 18:51:13 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.851 $"
@


1.852.2.1
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d59 1
a59 1
#options 	INTEL_ONDEMAND_CLOCKMOD
d99 4
d104 1
a440 2
#amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
#hpet* 	at amdpcib?
d443 1
a443 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a462 1
#isa0 	at amdpcib?
d464 1
a464 1
#isa0	at piixpcib?
a613 3
# Intel Core's on-die Thermal sensor
options 	INTEL_CORETEMP

a1476 3
# pseudo audio device driver
pseudo-device	pad

@


1.852.2.2
log
@Sync with HEAD
@
text
@d29 6
d507 9
d636 1
a636 1
#itesio0 	at isa? port 0x2e
@


1.852.2.3
log
@Sync with HEAD
@
text
@d350 1
a350 1
#com* 		at acpi?		# Serial communications interface
d354 1
a354 1
#lpt* 		at acpi?		# Parallel port
@


1.851
log
@options<tab><space>OPTION for previous.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.850 2007/09/22 18:40:22 martin Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.850 $"
d132 1
a132 1
#options 	DDB_VERBOSE_HELP		
@


1.851.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.851 2007/09/22 18:51:13 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.851 $"
d132 1
a132 1
#options 	DDB_VERBOSE_HELP
@


1.850
log
@Add a new option DDB_VERBOSE_HELP that adds online help to ddb.
From Adam Hamsik.
Minor modifications by me, all bugs are probably mine.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.849 2007/09/11 21:46:53 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.849 $"
d132 1
a132 1
#options		DDB_VERBOSE_HELP		
@


1.849
log
@New aps(4) driver for IBM Thinkpad Active Protection System.
Exports some sensors through the envsys(4) framework available
in some Thinkpad laptops.

Ported by Pierre Pronchery from OpenBSD, via PR port-i386/36852.

Tweaks, LKM and misc improvements by me. Added into i386/GENERIC
commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.848 2007/09/06 18:09:00 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.848 $"
d132 1
@


1.848
log
@Add some options and drivers only found in GENERIC_LAPTOP:
- add PMS_SYNAPTICS_TOUCHPAD
- add njata at cardbus
- add re at cardbus
- add stuirda at uhub
- add ugensa at uhub
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.847 2007/09/06 10:24:18 martti Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.847 $"
d630 3
@


1.847
log
@Fixed indentation (it should be <keyword><space><tab><name><tab><comment>).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.846 2007/09/06 00:31:08 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.846 $"
d522 1
a522 1
#options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
d807 1
a807 1
#njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
d991 1
d1110 3
d1192 3
@


1.846
log
@Enable CGD in GENERIC for amd64 and i386.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.845 2007/09/03 17:57:36 tshiozak Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.845 $"
d185 6
a190 6
file-system	CODA		# Coda File System; also needs vcoda (below)
file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system	PTYFS		# /dev/ptm support
file-system	TMPFS		# Efficient memory file-system
#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system	HFS		# experimental - Apple HFS+ (read-only)
@


1.845
log
@add support for WinChipHead CH341/340 USB-Serial bridge.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.844 2007/08/26 17:05:23 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.844 $"
d1403 1
a1403 1
#pseudo-device	cgd		4	# cryptographic disk devices
@


1.844
log
@Modify ichlpcib description, it has timecounter support too.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.843 2007/08/21 02:48:15 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.843 $"
d1135 3
@


1.844.2.1
log
@sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.859 2007/11/04 14:34:22 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.859 $"
d59 1
a59 1
#options 	INTEL_ONDEMAND_CLOCKMOD
d99 4
d104 1
a131 1
#options 	DDB_VERBOSE_HELP
d185 6
a190 6
file-system 	CODA		# Coda File System; also needs vcoda (below)
file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system 	PTYFS		# /dev/ptm support
file-system 	TMPFS		# Efficient memory file-system
#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system 	HFS		# experimental - Apple HFS+ (read-only)
a439 2
#amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
#hpet* 	at amdpcib?
d442 1
a442 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a461 1
#isa0 	at amdpcib?
d463 1
a463 1
#isa0	at piixpcib?
d522 1
a522 1
options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
a612 3
# Intel Core's on-die Thermal sensor
options 	INTEL_CORETEMP

a629 3
# IBM Thinkpad Active Protection System
#aps0 	at isa? port 0x1600

d807 1
a807 1
njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
a990 1
re*	at cardbus? function ?	# Realtek 8139C+/8169/8169S/8110S
a1108 3
stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?

a1134 3
uchcom*	at uhub? port ?		# WinChipHead CH341/CH340 serial adapter
ucom*	at uchcom? portno ?

a1184 3
# USB generic serial port (e.g., data over cellular)
ugensa*	at uhub? port ?
ucom*	at ugensa?
d1400 1
a1400 1
pseudo-device	cgd		4	# cryptographic disk devices
@


1.844.2.2
log
@sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.844.2.1 2007/11/06 23:17:10 matt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.844.2.1 $"
d29 7
a35 1
makeoptions 	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
d56 1
a56 1
#options 	VIA_PADLOCK
a84 7
# The following options limit the overall size of physical memory
# and/or the maximum address used by the system.
# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
# and can deal with holes in the memory layout.
#options 	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
#options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)

d95 1
a102 3
options 	MULTIPROCESSOR	# SMP
options 	APM_NO_IDLE	# needed for SMP
options 	MPBIOS		# configure CPUs and APICs using MPBIOS
d130 1
a130 1
#makeoptions 	DEBUG="-g"	# compile full symbol table
a163 7
# Wedge support
options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
# The following two options can break /etc/fstab, so handle with care
#options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
#options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges

d349 1
a349 5
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
acpiec* 	at acpi?		# ACPI Embedded Controller (late binding)
acpiecdt* 	at acpi?		# ACPI Embedded Controller (early binding)
d356 1
a356 1
#com* 		at acpi?		# Serial communications interface
d360 1
a360 1
#lpt* 		at acpi?		# Parallel port
a364 1
thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
d507 9
d635 2
a636 2
# iTE IT87xxF Super I/O with watchdog and sensors support
#itesio0 	at isa? port 0x2e
a754 1
arcmsr* at pci? dev ? function ?	# Areca SATA RAID controllers
d1058 1
a1058 1
# PCMCIA USB controllers
a1335 1
bthub* at bcsp?
a1465 1
pseudo-device	bcsp			# BlueCore Serial Protocol
a1477 6
# pseudo audio device driver
pseudo-device	pad

# userland interface to drivers, including autoconf and properties retrieval
pseudo-device	drvctl

d1494 1
a1494 2
options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
options 	PAX_ASLR=0		# PaX Address Space Layout Randomization
@


1.844.2.3
log
@sync with HEAD
@
text
@d1 1
a1 1
# GENERIC,v 1.844.2.2 2008/01/09 01:46:27 matt Exp
d25 1
a25 1
#ident 		"GENERIC-1.844.2.2"
d27 1
a27 1
maxusers	64		# estimated number of users
d33 1
d454 1
a454 4
					# watchdog, SpeedStep and HPET
#hpet* 	at ichlpcib?
gcscpcib* at pci? dev ? function ?	# AMD CS5535/CS5536 PCI-ISA w/
gpio* 	at gcscpcib?			# timecounter, watchdog and GPIO
a475 1
isa0 	at gcscpcib?
a1106 4
# Huawei E220 3G/HSDPA modem
uhmodem* at uhub? port ? configuration ? interface ?
ucom*	at uhmodem? portno ?

d1412 1
a1412 1
cinclude "arch/i386/conf/GENERIC.local"
@


1.843
log
@Add slhci at pcmcia.
 And reorder.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.842 2007/08/20 00:54:42 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.842 $"
d440 2
a441 2
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ watchdog and
					# SpeedStep support
@


1.842
log
@Add btbc(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.841 2007/08/18 11:35:55 tnn Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.841 $"
d1052 3
d1059 1
a1060 1
#usb*	at slhci?
@


1.841
log
@Enable spdmem(4) in ALL configuration. Add commented out entries to GENERIC
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.840 2007/08/06 21:26:55 adrianp Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.840 $"
d1312 1
d1319 1
@


1.840
log
@Remove iso(4) from GENERIC kernels, as discussed on tech-net@@
Ok'ed by core@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839 2007/07/28 11:06:23 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839 $"
d649 5
@


1.839
log
@Add ichsmb(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.838 2007/07/14 16:16:17 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.838 $"
d214 1
a214 1
options 	ISO,TPIP	# OSI
@


1.839.4.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.840 2007/08/06 21:26:55 adrianp Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.840 $"
d214 1
a214 1
#options 	ISO,TPIP	# OSI
@


1.839.4.2
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.844 2007/08/26 17:05:23 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.844 $"
d440 2
a441 2
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
					# watchdog and SpeedStep support
a648 5
# Serial Presence Detect capable memory modules
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
a1046 3
# PCMCIA USB controllers   
slhci*	at pcmcia? function ?		# ScanLogic SL811HS

a1050 1
usb*	at slhci?
d1052 1
a1306 1
btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
a1312 1
bthub* at btbc?
@


1.839.4.3
log
@Enable cgd by default on amd64 and i386.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.2 2007/09/03 16:47:21 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.2 $"
d1400 1
a1400 1
pseudo-device	cgd		4	# cryptographic disk devices
@


1.839.4.4
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.852 2007/09/25 17:14:11 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.852 $"
a131 1
#options 	DDB_VERBOSE_HELP
d185 6
a190 6
file-system 	CODA		# Coda File System; also needs vcoda (below)
file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system 	PTYFS		# /dev/ptm support
file-system 	TMPFS		# Efficient memory file-system
#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system 	HFS		# experimental - Apple HFS+ (read-only)
d522 1
a522 1
options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
a629 3
# IBM Thinkpad Active Protection System
#aps0 	at isa? port 0x1600

d807 1
a807 1
njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
a990 1
re*	at cardbus? function ?	# Realtek 8139C+/8169/8169S/8110S
a1108 3
stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?

a1134 3
uchcom*	at uhub? port ?		# WinChipHead CH341/CH340 serial adapter
ucom*	at uchcom? portno ?

a1184 3
# USB generic serial port (e.g., data over cellular)
ugensa*	at uhub? port ?
ucom*	at ugensa?
@


1.839.4.5
log
@Rewrite the ACPI Embedded Controller handler to use pure event driven
operation. On suspend a special flag is set to force explicit polling
as AcpiLeaveSleep accesses the interrupt before GPE handling is
restored. The driver uses a kernel thread to handle GPE queries and
mutex/condvar for synchronisation.

Split the ACPI EC into two drivers, one that is attached directly by
acpi.c for the ECDT driven attachment and the normal acpiec for late
attachment. Share almost all code between this two drivers. If acpiecdt
is attached, acpiec is returning. This was discussed with cube@@ and is
the best solution so far.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.4 2007/10/02 18:27:06 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.4 $"
d354 1
a354 5
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
acpiec* 	at acpi?		# ACPI Embedded Controller (late binding)
acpiecdt* 	at acpi?		# ACPI Embedded Controller (early binding)
@


1.839.4.6
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.5 2007/10/02 21:44:08 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.5 $"
a444 2
#amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
#hpet* 	at amdpcib?
d447 1
a447 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a466 1
#isa0 	at amdpcib?
d468 1
a468 1
#isa0	at piixpcib?
@


1.839.4.7
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.6 2007/10/28 20:10:37 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.6 $"
d59 1
a59 1
#options 	INTEL_ONDEMAND_CLOCKMOD
a620 3
# Intel Core's on-die Thermal sensor
options INTEL_CORETEMP

@


1.839.4.8
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.7 2007/10/29 02:57:20 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.7 $"
d622 1
a622 1
options 	INTEL_CORETEMP
@


1.839.4.9
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.859 2007/11/04 14:34:22 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.859 $"
d99 4
d104 1
@


1.839.4.10
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.9 2007/11/04 21:02:57 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.9 $"
a1481 3
# pseudo audio device driver
pseudo-device	pad

@


1.839.4.11
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.10 2007/11/14 19:04:08 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.10 $"
d29 6
d511 9
d640 1
a640 1
#itesio0 	at isa? port 0x2e
@


1.839.4.12
log
@Sync with HEAD. amd64 Xen support needs testing.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.11 2007/11/21 21:53:09 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.11 $"
d354 1
a354 1
#com* 		at acpi?		# Serial communications interface
d358 1
a358 1
#lpt* 		at acpi?		# Parallel port
@


1.839.4.13
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.839.4.12 2007/11/27 19:35:38 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.839.4.12 $"
a1324 1
bthub* at bcsp?
a1454 1
pseudo-device	bcsp			# BlueCore Serial Protocol
@


1.839.4.14
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.866 2007/12/05 00:19:41 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.866 $"
a743 1
arcmsr* at pci? dev ? function ?	# Areca SATA RAID controllers
@


1.838
log
@Alphabetical reorder.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.837 2007/07/11 08:01:50 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.837 $"
d613 4
@


1.838.4.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.840 2007/08/06 21:26:55 adrianp Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.840 $"
d214 1
a214 1
#options 	ISO,TPIP	# OSI
a612 4
# Intel ICH SMBus controller
ichsmb*	at pci? dev ? function ?
iic*	at ichsmb?

@


1.838.4.2
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.838.4.1 2007/08/15 13:47:21 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.838.4.1 $"
d440 2
a441 2
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
					# watchdog and SpeedStep support
a648 5
# Serial Presence Detect capable memory modules
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
a1046 3
# PCMCIA USB controllers   
slhci*	at pcmcia? function ?		# ScanLogic SL811HS

a1050 1
usb*	at slhci?
d1052 1
a1306 1
btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
a1312 1
bthub* at btbc?
@


1.838.4.3
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.838.4.2 2007/09/03 10:19:01 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.838.4.2 $"
d185 6
a190 6
file-system 	CODA		# Coda File System; also needs vcoda (below)
file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system 	PTYFS		# /dev/ptm support
file-system 	TMPFS		# Efficient memory file-system
#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system 	HFS		# experimental - Apple HFS+ (read-only)
d522 1
a522 1
options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
d807 1
a807 1
njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
a990 1
re*	at cardbus? function ?	# Realtek 8139C+/8169/8169S/8110S
a1108 3
stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?

a1134 3
uchcom*	at uhub? port ?		# WinChipHead CH341/CH340 serial adapter
ucom*	at uchcom? portno ?

a1184 3
# USB generic serial port (e.g., data over cellular)
ugensa*	at uhub? port ?
ucom*	at ugensa?
d1400 1
a1400 1
pseudo-device	cgd		4	# cryptographic disk devices
@


1.838.2.1
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.840 2007/08/06 21:26:55 adrianp Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.840 $"
d214 1
a214 1
#options 	ISO,TPIP	# OSI
a612 4
# Intel ICH SMBus controller
ichsmb*	at pci? dev ? function ?
iic*	at ichsmb?

@


1.837
log
@Add nfsmb(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.836 2007/07/08 03:01:19 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.836 $"
d618 4
a625 4
# Intel PIIX4 power management controllers
piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

@


1.836
log
@Enable gcscehci(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.835 2007/06/27 23:12:03 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.835 $"
d612 6
@


1.835
log
@Add gcscide(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.834 2007/06/16 12:35:55 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.834 $"
d1025 1
d1039 1
@


1.834
log
@-options I2OVERBOSE.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.833 2007/06/15 23:05:29 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.833 $"
d766 1
@


1.833
log
@Enable glxsb(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.832 2007/06/09 11:34:02 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.832 $"
a250 1
options 	I2OVERBOSE	# verbose I2O driver messages
@


1.832
log
@Add zyd(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.831 2007/06/04 08:55:21 martin Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.831 $"
d1333 1
@


1.831
log
@Add pseudo-device agr to all GENERIC kernels where it might make sense
(commented out in some).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.830 2007/06/01 14:26:36 blymn Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.830 $"
d1106 1
@


1.830
log
@Add smsc device
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.829 2007/05/29 21:37:07 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.829 $"
d1412 1
@


1.829
log
@Add COMPAT_40 for struct ifreq changes.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.828 2007/05/20 05:13:17 dogcow Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.828 $"
d627 3
@


1.828
log
@add uslsa USB-RS232 adapter
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.827 2007/05/15 17:53:44 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.827 $"
d151 1
@


1.827
log
@add jmide(4), a driver for the JMicron Technology JMB36x PCIe to SATA II/PATA
controllers. These controllers can be found on add-on PCIe cards, or
on some motherboards to provide the PATA connectivity (e.g. some intel
ICH8-based motherboards).

Thanks to JMicron Technology for providing me documentation and
different sample boards for this work.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.826 2007/05/08 16:55:54 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.826 $"
d1122 3
@


1.826
log
@Add "ug* at acpi?" following the current scheme in the files.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.825 2007/05/01 17:18:54 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.825 $"
d767 2
@


1.825
log
@Add bio(4) and associated bioctl(8) from OpenBSD, a driver control block
device controllers, and more specifically raid controllers.
Add a new sensor type, ENVSYS_DRIVE, to report drive status. From OpenBSD.
Add bio and sysmon support to mfi(4). This allow userland to query
status for drives and logical volumes attached to a mfi(4) controller. While
there fix some debug printfs in mfi so they compile.
Add bio(4) to amd64 and i386 GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.824 2007/04/26 17:11:36 dyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.824 $"
d369 1
@


1.824
log
@Add ATADEBUG for ease of debugging.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.823 2007/04/19 14:34:35 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.823 $"
d1364 1
@


1.824.2.1
log
@Update to HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.828 2007/05/20 05:13:17 dogcow Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.828 $"
a368 1
ug* 		at acpi?		# Abit uGuru Hardware monitor
a765 2
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
ahcisata* 	at jmide?
a1118 3
uslsa*	at uhub? port ?		# Silicon Labs USB-RS232 serial adapter
ucom*	at uslsa? portno ?

a1363 1
pseudo-device	bio			# RAID control device driver
@


1.824.2.2
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.834 2007/06/16 12:35:55 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.834 $"
a150 1
options 	COMPAT_40	# NetBSD 4.0
d250 1
a625 3
# SMSC LPC47B397 hardware monitor functions
#smsc0	at isa? port 0x02e

a1101 1
zyd*	at uhub? port ?		# Zydas ZD1211
a1327 1
glxsb*	at pci? dev ? function ?	# AMD Geode LX Security Block
a1407 1
pseudo-device	agr			# IEEE 802.3ad link aggregation
@


1.824.2.3
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.852 2007/09/25 17:14:11 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.852 $"
a131 1
#options 	DDB_VERBOSE_HELP
d185 6
a190 6
file-system 	CODA		# Coda File System; also needs vcoda (below)
file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system 	PTYFS		# /dev/ptm support
file-system 	TMPFS		# Efficient memory file-system
#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system 	HFS		# experimental - Apple HFS+ (read-only)
d214 1
a214 1
#options 	ISO,TPIP	# OSI
d440 2
a441 2
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
					# watchdog and SpeedStep support
d522 1
a522 1
options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
d612 3
a614 9

# Intel ICH SMBus controller
ichsmb*	at pci? dev ? function ?
iic*	at ichsmb?

# NVIDIA nForce2/3/4 SMBus controller
nfsmbc*	at pci? dev ? function ?
nfsmb*	at nfsmbc?
iic*	at nfsmb?
a619 7
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

# IBM Thinkpad Active Protection System
#aps0 	at isa? port 0x1600

a638 5
# Serial Presence Detect capable memory modules
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
a765 1
gcscide* 	at pci? dev ? function ? 	# AMD CS5535 Companion IDE controllers
d791 1
a791 1
njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
a974 1
re*	at cardbus? function ?	# Realtek 8139C+/8169/8169S/8110S
a1023 1
gcscehci* at pci? dev ? function ?	# Enhanced Host Controller (Geode CSC)
a1034 3
# PCMCIA USB controllers   
slhci*	at pcmcia? function ?		# ScanLogic SL811HS

a1036 1
usb*	at gcscehci?
a1037 1
usb*	at slhci?
d1039 1
a1087 3
stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?

a1113 3
uchcom*	at uhub? port ?		# WinChipHead CH341/CH340 serial adapter
ucom*	at uchcom? portno ?

a1163 3
# USB generic serial port (e.g., data over cellular)
ugensa*	at uhub? port ?
ucom*	at ugensa?
a1293 1
btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
a1299 1
bthub* at btbc?
d1377 1
a1377 1
pseudo-device	cgd		4	# cryptographic disk devices
@


1.823
log
@ALL: add ug(4).
GENERIC/GENERIC_LAPTOP: add ug(4) commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.822 2007/04/05 19:17:41 reed Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.822 $"
d796 1
@


1.822
log
@Add some tabs. Move one entry.
No real changes, just making it easier to diff with GENERIC_LAPTOP.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.821 2007/03/22 12:40:06 gdt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.821 $"
d629 3
@


1.821
log
@Add apm emulation via acpi.

Enable cardbus attachment for lots of devices.  The drivers were
already compiled in via pci attachment, and GENERIC supports cardbus,
so there's no reason not to attach.

With this, GENERIC.MP works well on a Thinkpad T60.

(proposed on port-i386, no objections received)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.820 2007/03/20 21:29:28 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.820 $"
d964 1
a965 1
ral*	at cardbus? function ?	# Ralink Technology
d1018 3
a1020 3
ehci*	at cardbus? function ?	# Enhanced Host Controller
ohci*	at cardbus? function ?	# Open Host Controller
uhci*	at cardbus? function ?	# Universal Host Controller (Intel)
@


1.820
log
@ALL: Enable INTEL_ONDEMAND_CLOCKMOD.
GENERIC: Add INTEL_ONDEMAND_CLOCKMOD disabled by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.819 2007/03/14 12:27:22 drochner Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.819 $"
d349 1
d567 1
a567 1
#com*	at cardbus? function ?	# Modems and serial cards
d705 3
a707 3
#adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
#ahc*	at cardbus? function ?	# Adaptec ADP-1480
#njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
d960 8
a967 8
#ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
#atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
#ex*	at cardbus? function ?	# 3Com 3C575TX
#fxp*	at cardbus? function ?	# Intel i8255x
#rtk*	at cardbus? function ?	# Realtek 8129/8139
#ral*	at cardbus? function ?	# Ralink Technology
#rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
#tlp*	at cardbus? function ?	# DECchip 21143
d1018 3
a1020 3
#ehci*	at cardbus? function ?	# Enhanced Host Controller
#ohci*	at cardbus? function ?	# Open Host Controller
#uhci*	at cardbus? function ?	# Universal Host Controller (Intel)
d1162 1
a1162 1
#fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
@


1.819
log
@It doesn't make sense to specify "configuration" and "interface"
locators for uhub because a hub can't have sub-devices.
This might be sanity-checked eventually.
Same for ubt now after the change to device attachment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.818 2007/03/13 23:49:38 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.818 $"
d58 3
@


1.819.2.1
log
@Pullup to -current
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.819 2007/03/14 12:27:22 drochner Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.819 $"
a57 3
# Intel(R) On Demand Clock Modulation (aka ODCM)
# options 	INTEL_ONDEMAND_CLOCKMOD

a345 1
apm*		at acpi?		# ACPI apm emulation
d563 1
a563 1
com*	at cardbus? function ?	# Modems and serial cards
d701 3
a703 3
adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc*	at cardbus? function ?	# Adaptec ADP-1480
njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
d956 8
a963 8
ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
ex*	at cardbus? function ?	# 3Com 3C575TX
fxp*	at cardbus? function ?	# Intel i8255x
rtk*	at cardbus? function ?	# Realtek 8129/8139
ral*	at cardbus? function ?	# Ralink Technology
rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
tlp*	at cardbus? function ?	# DECchip 21143
d1014 3
a1016 3
ehci*	at cardbus? function ?	# Enhanced Host Controller
ohci*	at cardbus? function ?	# Open Host Controller
uhci*	at cardbus? function ?	# Universal Host Controller (Intel)
d1158 1
a1158 1
fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
@


1.818
log
@ALL: add unichromefb.
GENERIC: add unichromefb (disabled by default).
GENERIC_LAPTOP: add unichromefb and vesafb (disabled by default).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.817 2007/03/13 04:09:28 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.817 $"
d1029 1
a1029 1
uhub*	at uhub? port ? configuration ? interface ?
d1278 1
a1278 1
ubt* at uhub? port ? configuration ? interface ?
@


1.817
log
@Add aiboost* at acpi, enabled by default on i386/GENERIC and disable
in the other ones (to follow current scheme).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816 2007/03/10 10:54:53 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816 $"
d538 4
@


1.816
log
@Comment out 'fdc* at acpi?' (it's likely that systems not supporting
fdc0 at isa? don't have a fdc at all). Because of the 'fdc0 at isa?', on
systems supporting ACPI the floppy controller would attach as fdc1. as fd(4)
looks for its type in nvram using the floppy controller index, it's looking for
the wrong controller and the default density isn't set (so /dev/fd0a doens't
work).
Problem analyzed by John Nemeth, thanks !
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.815 2007/03/08 15:16:04 njoly Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.815 $"
d354 1
@


1.816.4.1
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.837 2007/07/11 08:01:50 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.837 $"
a57 3
# Intel(R) On Demand Clock Modulation (aka ODCM)
# options 	INTEL_ONDEMAND_CLOCKMOD

a147 1
options 	COMPAT_40	# NetBSD 4.0
d247 1
a345 1
apm*		at acpi?		# ACPI apm emulation
a353 1
aiboost*	at acpi?		# ASUS AI Booster Hardware Monitor
a363 1
ug* 		at acpi?		# Abit uGuru Hardware monitor
a536 4
# VIA Unichrome framebuffer console
#unichromefb* 	at pci? dev ? function ?
#wsdisplay* 	at unichromefb?

d558 1
a558 1
com*	at cardbus? function ?	# Modems and serial cards
a601 6

# NVIDIA nForce2/3/4 SMBus controller
nfsmbc*	at pci? dev ? function ?
nfsmb*	at nfsmbc?
iic*	at nfsmb?

a615 3
# SMSC LPC47B397 hardware monitor functions
#smsc0	at isa? port 0x02e

a619 3
# Abit uGuru Hardware system monitor
#ug0    at isa? port 0xe0

d696 3
a698 3
adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc*	at cardbus? function ?	# Adaptec ADP-1480
njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
a749 1
gcscide* 	at pci? dev ? function ? 	# AMD CS5535 Companion IDE controllers
a753 2
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
ahcisata* 	at jmide?
a783 1
options	ATADEBUG
d951 8
a958 8
ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
ex*	at cardbus? function ?	# 3Com 3C575TX
fxp*	at cardbus? function ?	# Intel i8255x
ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g
rtk*	at cardbus? function ?	# Realtek 8129/8139
rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
tlp*	at cardbus? function ?	# DECchip 21143
a1004 1
gcscehci* at pci? dev ? function ?	# Enhanced Host Controller (Geode CSC)
d1009 3
a1011 3
ehci*	at cardbus? function ?		# Enhanced Host Controller
ohci*	at cardbus? function ?		# Open Host Controller
uhci*	at cardbus? function ?		# Universal Host Controller (Intel)
a1017 1
usb*	at gcscehci?
d1024 1
a1024 1
uhub*	at uhub? port ?
a1085 1
zyd*	at uhub? port ?		# Zydas ZD1211
a1105 3
uslsa*	at uhub? port ?		# Silicon Labs USB-RS232 serial adapter
ucom*	at uslsa? portno ?

d1153 1
a1153 1
fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
d1273 1
a1273 1
ubt* at uhub? port ?
a1308 1
glxsb*	at pci? dev ? function ?	# AMD Geode LX Security Block
a1350 1
pseudo-device	bio			# RAID control device driver
a1387 1
pseudo-device	agr			# IEEE 802.3ad link aggregation
@


1.816.2.1
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816 2007/03/10 10:54:53 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816 $"
a353 1
aiboost*	at acpi?		# ASUS AI Booster Hardware Monitor
@


1.816.2.2
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816.2.1 2007/03/13 16:49:58 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816.2.1 $"
a57 3
# Intel(R) On Demand Clock Modulation (aka ODCM)
# options 	INTEL_ONDEMAND_CLOCKMOD

a345 1
apm*		at acpi?		# ACPI apm emulation
a537 4
# VIA Unichrome framebuffer console
#unichromefb* 	at pci? dev ? function ?
#wsdisplay* 	at unichromefb?

d559 1
a559 1
com*	at cardbus? function ?	# Modems and serial cards
d697 3
a699 3
adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc*	at cardbus? function ?	# Adaptec ADP-1480
njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
d952 8
a959 8
ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
ex*	at cardbus? function ?	# 3Com 3C575TX
fxp*	at cardbus? function ?	# Intel i8255x
ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g
rtk*	at cardbus? function ?	# Realtek 8129/8139
rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
tlp*	at cardbus? function ?	# DECchip 21143
d1010 3
a1012 3
ehci*	at cardbus? function ?		# Enhanced Host Controller
ohci*	at cardbus? function ?		# Open Host Controller
uhci*	at cardbus? function ?		# Universal Host Controller (Intel)
d1025 1
a1025 1
uhub*	at uhub? port ?
d1154 1
a1154 1
fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
d1274 1
a1274 1
ubt* at uhub? port ?
@


1.816.2.3
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816.2.2 2007/04/10 13:23:01 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816.2.2 $"
a368 1
ug* 		at acpi?		# Abit uGuru Hardware monitor
a628 3
# Abit uGuru Hardware system monitor
#ug0    at isa? port 0xe0

a762 2
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
ahcisata* 	at jmide?
a792 1
options	ATADEBUG
a1114 3
uslsa*	at uhub? port ?		# Silicon Labs USB-RS232 serial adapter
ucom*	at uslsa? portno ?

a1359 1
pseudo-device	bio			# RAID control device driver
@


1.816.2.4
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816.2.3 2007/05/27 12:27:27 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816.2.3 $"
a150 1
options 	COMPAT_40	# NetBSD 4.0
a625 3
# SMSC LPC47B397 hardware monitor functions
#smsc0	at isa? port 0x02e

a1407 1
pseudo-device	agr			# IEEE 802.3ad link aggregation
@


1.816.2.5
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816.2.4 2007/06/09 23:55:06 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816.2.4 $"
d251 1
d613 3
a615 5

# NVIDIA nForce2/3/4 SMBus controller
nfsmbc*	at pci? dev ? function ?
nfsmb*	at nfsmbc?
iic*	at nfsmb?
a620 4
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

a766 1
gcscide* 	at pci? dev ? function ? 	# AMD CS5535 Companion IDE controllers
a1024 1
gcscehci* at pci? dev ? function ?	# Enhanced Host Controller (Geode CSC)
a1037 1
usb*	at gcscehci?
a1105 1
zyd*	at uhub? port ?		# Zydas ZD1211
a1331 1
glxsb*	at pci? dev ? function ?	# AMD Geode LX Security Block
@


1.816.2.6
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816.2.5 2007/07/15 13:16:07 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816.2.5 $"
d214 1
a214 1
#options 	ISO,TPIP	# OSI
a612 4
# Intel ICH SMBus controller
ichsmb*	at pci? dev ? function ?
iic*	at ichsmb?

a644 5
# Serial Presence Detect capable memory modules
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
a1302 1
btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
a1308 1
bthub* at btbc?
@


1.816.2.7
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816.2.6 2007/08/20 18:38:07 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816.2.6 $"
a131 1
#options 	DDB_VERBOSE_HELP
d185 6
a190 6
file-system 	CODA		# Coda File System; also needs vcoda (below)
file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system 	PTYFS		# /dev/ptm support
file-system 	TMPFS		# Efficient memory file-system
#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system 	HFS		# experimental - Apple HFS+ (read-only)
d440 2
a441 2
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
					# watchdog and SpeedStep support
d522 1
a522 1
options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
a629 3
# IBM Thinkpad Active Protection System
#aps0 	at isa? port 0x1600

d807 1
a807 1
njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
a990 1
re*	at cardbus? function ?	# Realtek 8139C+/8169/8169S/8110S
a1051 3
# PCMCIA USB controllers   
slhci*	at pcmcia? function ?		# ScanLogic SL811HS

a1055 1
usb*	at slhci?
d1057 1
a1105 3
stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?

a1131 3
uchcom*	at uhub? port ?		# WinChipHead CH341/CH340 serial adapter
ucom*	at uchcom? portno ?

a1181 3
# USB generic serial port (e.g., data over cellular)
ugensa*	at uhub? port ?
ucom*	at ugensa?
d1397 1
a1397 1
pseudo-device	cgd		4	# cryptographic disk devices
@


1.816.2.8
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816.2.7 2007/10/09 13:37:48 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816.2.7 $"
d29 6
d59 1
a59 1
#options 	INTEL_ONDEMAND_CLOCKMOD
d99 4
d104 1
d361 1
a361 1
#com* 		at acpi?		# Serial communications interface
d365 1
a365 1
#lpt* 		at acpi?		# Parallel port
a440 2
#amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
#hpet* 	at amdpcib?
d443 1
a443 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a462 1
#isa0 	at amdpcib?
d464 1
a464 1
#isa0	at piixpcib?
d509 9
a613 6
# Intel Core's on-die Thermal sensor
options 	INTEL_CORETEMP

# Intel Core's on-die Thermal sensor
options 	INTEL_CORETEMP

d635 1
a635 1
#itesio0 	at isa? port 0x2e
a1334 1
bthub* at bcsp?
a1464 1
pseudo-device	bcsp			# BlueCore Serial Protocol
a1476 6
# pseudo audio device driver
pseudo-device	pad

# pseudo audio device driver
pseudo-device	pad

@


1.816.2.9
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.816.2.8 2007/12/03 18:36:23 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.816.2.8 $"
d600 3
d1471 3
@


1.815
log
@Add hpet support to i386/amd64 kernels.
- `hpet* at acpi?' to kernels that already support ACPI.
- `hpet* at amdpcib?' (commented out) to amd64 GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.814 2007/03/07 22:23:14 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.814 $"
d356 1
a356 1
fdc* 		at acpi?		# Floppy disk controller
@


1.814
log
@Remove duplicate ACPIVERBOSE and ACPI_SCANPCI; pointed out by Nicolas Joly.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.813 2007/03/06 21:47:46 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.813 $"
d357 1
@


1.813
log
@For the benefit of modern hardware, enable ACPI by default in INSTALL and
GENERIC kernels. If ACPI is an issue on your hardware, 'boot -c' and
'disable acpi' should be a workaround. ACPI-enabled kernels works fine
on pre-acpi hardware.
for amd64:
- add ACPI to INSTALL and GENERIC, remove the *_ACPI config files.
- get rid of the bootfloppy-big.fs boot image, and got to a 3-floppy boot
  image
for i386:
- introduce INSTALL_LARGE which has ACPI and some devices with big firmware
- move some devices from INSTALL to INSTALL_LARGE
- Boot floppies still use INSTALL, and bootfloppy-big.fs is still there
  (for thoses who want to build el-torito floppy emulation boot CD) and use
  INSTALL.
For both, drop the 'iso-image' code in etc/ to make the iso bootable, we'll
use something else to build bootable CDs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.812 2007/03/06 11:28:46 dillo Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.812 $"
d237 1
a237 1
#options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
d338 1
a338 1
#options 	ACPI_SCANPCI	# find PCI roots using ACPI
a343 2
options		ACPIVERBOSE
options		ACPI_SCANPCI
@


1.812
log
@Complete rename of hfsp to hfs, requested by thorpej.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.811 2007/03/05 23:30:18 dillo Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.811 $"
d311 1
a311 1
#ioapic* at mainbus?
d340 1
a340 1
#acpi0 		at mainbus0
d344 2
d348 6
a353 6
#acpiacad* 	at acpi?		# ACPI AC Adapter
#acpibat* 	at acpi?		# ACPI Battery
#acpibut* 	at acpi?		# ACPI Button
#acpiec* 	at acpi?		# ACPI Embedded Controller
#acpilid* 	at acpi?		# ACPI Lid Switch
#acpitz* 	at acpi?		# ACPI Thermal Zone
d356 11
a366 11
#attimer*	at acpi?		# AT Timer
#com* 		at acpi?		# Serial communications interface
#fdc* 		at acpi?		# Floppy disk controller
#joy*		at acpi?		# Joystick/Game port
#lpt* 		at acpi?		# Parallel port
#mpu*		at acpi?		# Roland MPU-401 MIDI UART
#npx*		at acpi?		# Math coprocessor
#pckbc*  	at acpi?		# PC keyboard controller
#pcppi*		at acpi?                # AT-style speaker sound
#wss* 		at acpi?		# NeoMagic 256AV in wss mode
#ym* 		at acpi?		# Yamaha OPL3-SA[23] audio
d369 2
a370 2
#spic* 		at acpi?		# Sony Programmable I/O Controller
#wsmouse* 	at spic?
d373 1
a373 1
#sony* 		at acpi?		# Sony Miscellaneous Controller
d376 1
a376 1
#vald* at acpi?
@


1.811
log
@Add file-system HFSP (commented out) to GENERIC kernels of ports
on which Mac OS runs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.810 2007/03/01 14:57:38 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.810 $"
d186 1
a186 1
#file-system	HFSP		# experimental - Apple HFS+ (read-only)
@


1.810
log
@Add btuart(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.809 2007/02/18 18:05:52 dsl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.809 $"
d186 1
@


1.809
log
@Add commented out entries for SYSCALL_STATS and SYSCALL_TIMES
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.808 2007/02/17 00:28:23 daniel Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.808 $"
d1275 1
d1400 1
@


1.808
log
@Add an opencrypto provider for the AES xcrypt instructions found on VIA
C5P and later cores (also known as 'ACE', which is part of the VIA PadLock
security engine). Ported from OpenBSD.

Reviewed on tech-crypto and port-i386, no objections to commiting this.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.807 2007/02/09 21:55:04 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.807 $"
d132 3
@


1.808.2.1
log
@file GENERIC was added on branch yamt-idlelwp on 2007-02-20 21:48:43 +0000
@
text
@d1 1423
@


1.808.2.2
log
@General Common Scheduler Framework (CSF) patch import. Huge thanks for
Daniel Sieger <dsieger at TechFak.Uni-Bielefeld de> for this work.

Short abstract: Split the dispatcher from the scheduler in order to
make the scheduler more modular. Introduce initial API for other
schedulers' implementations.

Discussed in tech-kern@@
OK: yamt@@, ad@@

Note: further work will go soon.
@
text
@a0 1426
# $NetBSD: GENERIC,v 1.808.2.1 2007/02/20 21:48:43 rmind Exp $
#
# GENERIC machine description file
#
# This machine description file is used to generate the default NetBSD
# kernel.  The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
#
# The machine description file can be customised for your specific
# machine to reduce the kernel size and improve its performance.
#
# For further information on compiling NetBSD kernels, see the config(8)
# man page.
#
# For further information on hardware support for this architecture, see
# the intro(4) man page.  For further information about kernel options
# for this architecture, see the options(4) man page.  For an explanation
# of each device driver in this file see the section 4 man page for the
# device.

include 	"arch/i386/conf/std.i386"

options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

#ident 		"GENERIC-$Revision: 1.808.2.1 $"

maxusers	32		# estimated number of users

# CPU support.  At least one is REQUIRED.
#options 	I386_CPU
options 	I486_CPU
options 	I586_CPU
options 	I686_CPU

makeoptions	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
							# tune for more modern

# CPU-related options.
#options 	MATH_EMULATE	# floating point emulation
options 	VM86		# virtual 8086 emulation
options 	USER_LDT	# user-settable LDT; used by WINE
# insert delay no-ops in interrupts; recommended on very old machines
#options 	PIC_DELAY

# Enhanced SpeedStep Technology in the Pentium M
options 	ENHANCED_SPEEDSTEP
#options 	EST_FREQ_USERWRITE	# any user can set frequency

# AMD PowerNow! K7
options 	POWERNOW_K7

# AMD PowerNow! and Cool`n'Quiet technology
options 	POWERNOW_K8

# VIA PadLock
#options	VIA_PADLOCK

options 	MTRR		# memory-type range register syscall support
# doesn't work with MP just yet..
#options 	PERFCTRS	# performance-monitoring counters support

options 	MULTIBOOT	# Multiboot support (see multiboot(8))

# delay between "rebooting ..." message and hardware reset, in milliseconds
#options 	CPURESET_DELAY=2000

# This option allows you to force a serial console at the specified
# I/O address.   see console(4) for details.
#options 	CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
#	you don't want the option below ON iff you are using the
#	serial console option of the new boot strap code.
#options 	CONS_OVERRIDE	# Always use above! independent of boot info

# The following options override the memory sizes passed in from the boot
# block.  Use them *only* if the boot block is unable to determine the correct
# values.  Note that the BIOS may *correctly* report less than 640k of base
# memory if the extended BIOS data area is located at the top of base memory
# (as is the case on most recent systems).
#options 	REALBASEMEM=639		# size of base memory (in KB)
#options 	REALEXTMEM=15360	# size of extended memory (in KB)

# Standard system options

options 	INSECURE	# disable kernel security levels - X needs this

options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
options 	NTP		# NTP phase/frequency locked loop
#options 	NO_TSC_TIME	# Don't use TSC microtime, even if available.
				# Improves time behavior under VMware.

options 	KTRACE		# system call tracing via ktrace(1)
#options 	SYSTRACE	# system call vetting via systrace(1)

options 	SYSVMSG		# System V-like message queues
options 	SYSVSEM		# System V-like semaphores
#options 	SEMMNI=10	# number of semaphore identifiers
#options 	SEMMNS=60	# number of semaphores in system
#options 	SEMUME=10	# max number of undo entries per process
#options 	SEMMNU=30	# number of undo structures in system
options 	SYSVSHM		# System V-like memory sharing
#options 	SHMMAXPGS=2048	# 2048 pages is the default
options 	P1003_1B_SEMAPHORE	# p1003.1b semaphore support

options 	LKM		# loadable kernel modules

options 	USERCONF	# userconf(4) support
#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel

# Beep when it is safe to power down the system (requires sysbeep)
#options 	BEEP_ONHALT
# Some tunable details of the above feature (default values used below)
#options 	BEEP_ONHALT_COUNT=3	# Times to beep
#options 	BEEP_ONHALT_PITCH=1500	# Default frequency (in Hz)
#options 	BEEP_ONHALT_PERIOD=250	# Default duration (in msecs)

# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Likely stable but not yet the default.
#options 	BUFQ_READPRIO
#options 	BUFQ_PRIOCSCAN

# Scheduling algorithm
options	SCHED_4BSD

# Diagnostic/debugging support options
#options 	DIAGNOSTIC	# expensive kernel consistency checks
#options 	DEBUG		# expensive debugging checks/support
#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
options 	DDB		# in-kernel debugger
#options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
#options 	KGDB		# remote debugger
#options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions	DEBUG="-g"	# compile full symbol table

# Compatibility options
options 	COMPAT_NOMID	# NetBSD 0.8, 386BSD, and BSDI
options 	COMPAT_09	# NetBSD 0.9
options 	COMPAT_10	# NetBSD 1.0
options 	COMPAT_11	# NetBSD 1.1
options 	COMPAT_12	# NetBSD 1.2, 386BSD, and BSDI
options 	COMPAT_13	# NetBSD 1.3, 386BSD, and BSDI
options 	COMPAT_14	# NetBSD 1.4
options 	COMPAT_15	# NetBSD 1.5
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
options 	COMPAT_30	# NetBSD 3.0
options 	COMPAT_43	# 4.3BSD, 386BSD, and BSDI
#options 	COMPAT_386BSD_MBRPART # recognize old partition ID
#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.

options 	COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
options 	COMPAT_SVR4	# binary compatibility with SVR4
options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
options 	COMPAT_LINUX	# binary compatibility with Linux
options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
#options 	COMPAT_NDIS	# NDIS network driver
#options 	COMPAT_PECOFF	# kernel support to run Win32 apps
options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.

# File systems
file-system 	FFS		# UFS
file-system 	EXT2FS		# second extended file system (linux)
file-system 	LFS		# log-structured file system
file-system 	MFS		# memory file system
file-system 	NFS		# Network File System client
file-system 	NTFS		# Windows/NT file system (experimental)
file-system 	CD9660		# ISO 9660 + Rock Ridge file system
file-system 	MSDOSFS		# MS-DOS file system
file-system 	FDESC		# /dev/fd
file-system 	KERNFS		# /kern
file-system 	NULLFS		# loopback file system
file-system 	OVERLAY		# overlay file system
file-system 	PORTAL		# portal filesystem (still experimental)
file-system 	PROCFS		# /proc
file-system 	UMAPFS		# NULLFS + uid and gid remapping
file-system 	UNION		# union file system
file-system	CODA		# Coda File System; also needs vcoda (below)
file-system	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system	PTYFS		# /dev/ptm support
file-system	TMPFS		# Efficient memory file-system
#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system

# File system options
options 	QUOTA		# UFS quotas
#options 	FFS_EI		# FFS Endian Independent support
options 	SOFTDEP		# FFS soft updates support.
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
# It is not recommended for general use.
#options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
options 	NFSSERVER	# Network File System server
#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
				# immutable) behave as system flags.

# Networking options
#options 	GATEWAY		# packet forwarding
options 	INET		# IP + ICMP + TCP + UDP
options 	INET6		# IPV6
#options 	IPSEC		# IP security
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
#options 	IPSEC_DEBUG	# debug for IP security
#options 	MROUTING	# IP multicast routing
#options 	PIM		# Protocol Independent Multicast
options 	ISO,TPIP	# OSI
#options 	EON		# OSI tunneling over IP
options 	NETATALK	# AppleTalk networking protocols
options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP
options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
options 	PFIL_HOOKS	# pfil(9) packet filter hooks
options 	IPFILTER_LOG	# ipmon(8) log support
options 	IPFILTER_LOOKUP	# ippool(8) support
#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG

#options 	ALTQ		# Manipulate network interfaces' output queues
#options 	ALTQ_BLUE	# Stochastic Fair Blue
#options 	ALTQ_CBQ	# Class-Based Queueing
#options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
#options 	ALTQ_FIFOQ	# First-In First-Out Queue
#options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
#options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
#options 	ALTQ_LOCALQ	# Local queueing discipline
#options 	ALTQ_PRIQ	# Priority Queueing
#options 	ALTQ_RED	# Random Early Detection
#options 	ALTQ_RIO	# RED with IN/OUT
#options 	ALTQ_WFQ	# Weighted Fair Queueing

# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
#options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
options 	EISAVERBOSE	# verbose EISA device autoconfig messages
options 	MIIVERBOSE	# verbose PHY autoconfig messages
options 	PCIVERBOSE	# verbose PCI device autoconfig messages
#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
#options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
options 	SCSIVERBOSE	# human readable SCSI error messages
options 	USBVERBOSE	# verbose USB device autoconfig messages
#options 	PNPBIOSVERBOSE	# verbose PnP BIOS messages
#options 	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
options 	I2OVERBOSE	# verbose I2O driver messages
options 	MCAVERBOSE	# verbose MCA device autoconfig messages

options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM

#
# wscons options
#
# builtin terminal emulations
#options 	WSEMUL_SUN		# sun terminal emulation
options 	WSEMUL_VT100		# VT100 / VT220 emulation
# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
options 	WSDISPLAY_CUSTOM_OUTPUT	# color customization from wsconsctl(8)
#options 	WS_DEFAULT_FG=WSCOL_WHITE
#options 	WS_DEFAULT_BG=WSCOL_BLACK
#options 	WS_DEFAULT_COLATTR="(0)"
#options 	WS_DEFAULT_MONOATTR="(0)"
options 	WS_KERNEL_FG=WSCOL_GREEN
#options 	WS_KERNEL_BG=WSCOL_BLACK
#options 	WS_KERNEL_COLATTR=""
#options 	WS_KERNEL_MONOATTR=""
# customization of console border color
options 	WSDISPLAY_CUSTOM_BORDER	# custom border colors via wsconsctl(8)
#options 	WSDISPLAY_BORDER_COLOR=WSCOL_BLUE	# default color
# compatibility to other console drivers
options 	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
options 	WSDISPLAY_COMPAT_SYSCONS	# emulate some ioctls
options 	WSDISPLAY_COMPAT_USL		# VT handling
options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
#options 	WSKBD_EVENT_AUTOREPEAT		# auto repeat in event mode
#options 	WSKBD_USONLY			# strip off non-US keymaps
# don't attach pckbd as the console if no PS/2 keyboard is found
options 	PCKBD_CNATTACH_MAY_FAIL
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver
# allocate a number of virtual screens at autoconfiguration time
#options 	WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
options 	PCDISPLAY_SOFTCURSOR
# modify the screen type of the console; defaults to "80x25"
#options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
# work around a hardware bug that loaded fonts don't work; found on ATI cards
#options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
# console scrolling support.
options 	WSDISPLAY_SCROLLSUPPORT
# enable VGA raster mode capable of displaying multilingual text on console
#options 	VGA_RASTERCONSOLE
# enable splash screen support; requires hw driver support
#options 	SPLASHSCREEN
#options 	SPLASHSCREEN_PROGRESS

# Kernel root file system and dump configuration.
config		netbsd	root on ? type ?
#config		netbsd	root on sd0a type ffs
#config		netbsd	root on ? type nfs

#
# Device configuration
#

mainbus0 at root

cpu* at mainbus?
#ioapic* at mainbus?

# Doesn't do anything yet.
#p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC

#apm0	at mainbus0			# Advanced power management

# Tuning for power management, see apm(4) for more details.
#options 	APM_NO_IDLE		# Don't call BIOS CPU idle function
#options 	APM_V10_ONLY		# Use only the APM 1.0 calls
#options 	APM_NO_POWEROFF		# Don't power off on halt(8)
#options 	APM_POWER_PRINT		# Print stats on the console
#options 	APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts


# Basic Bus Support

#IPMI support
#ipmi0		at mainbus?

# Advanced Configuration and Power Interface

# This option can be used to retrieve CPU and APIC information.
# that I/O APICs can be used if ACPI is enabled below.
# To use the I/O APIC(s), enable the ioapic line above.
#options 	MPBIOS		# configure CPUs and APICs using MPBIOS
#options 	MPBIOS_SCANPCI	# find PCI roots using MPBIOS
#options 	ACPI_SCANPCI	# find PCI roots using ACPI

#acpi0 		at mainbus0

#options 	ACPI_ACTIVATE_DEV	# If set, activate inactive devices
#options 	ACPICA_PEDANTIC		# force strict conformance to the Spec.

# ACPI devices
#acpiacad* 	at acpi?		# ACPI AC Adapter
#acpibat* 	at acpi?		# ACPI Battery
#acpibut* 	at acpi?		# ACPI Button
#acpiec* 	at acpi?		# ACPI Embedded Controller
#acpilid* 	at acpi?		# ACPI Lid Switch
#acpitz* 	at acpi?		# ACPI Thermal Zone

# Mainboard devices
#attimer*	at acpi?		# AT Timer
#com* 		at acpi?		# Serial communications interface
#fdc* 		at acpi?		# Floppy disk controller
#joy*		at acpi?		# Joystick/Game port
#lpt* 		at acpi?		# Parallel port
#mpu*		at acpi?		# Roland MPU-401 MIDI UART
#npx*		at acpi?		# Math coprocessor
#pckbc*  	at acpi?		# PC keyboard controller
#pcppi*		at acpi?                # AT-style speaker sound
#wss* 		at acpi?		# NeoMagic 256AV in wss mode
#ym* 		at acpi?		# Yamaha OPL3-SA[23] audio

# Sony Vaio jog dial
#spic* 		at acpi?		# Sony Programmable I/O Controller
#wsmouse* 	at spic?

# Sony LCD brightness etc.
#sony* 		at acpi?		# Sony Miscellaneous Controller

# Toshiba Libretto devices
#vald* at acpi?

# Plug-and-Play BIOS and attached devices

#pnpbios*	at mainbus?

# mainboard audio chips
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# Yamaha OPL3-SA[23] audio

# com port
# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
# will be no com0.  A side effect is pcmcia (and other) com? previously
# starting at com3 may attach as com1 or com2.
#com*		at pnpbios? index ?	# serial ports

# parallel port
# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
# "printer interfaces".
#lpt*		at pnpbios? index ?	# parallel ports

#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller
#npx*		at pnpbios? index ?	# Math coprocessor

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide* 	at pnpbios? index ?

# PCI bus support
pci*	at mainbus? bus ?
pci*	at pchb? bus ?
pci*	at ppb? bus ?

# Configure PCI using BIOS information
#options 	PCIBIOS			# PCI BIOS support
#options 	PCIBIOSVERBOSE		# PCI BIOS verbose info
#options 	PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
#options 	PCIBIOS_INTR_GUESS	# see pcibios(4)
#options 	PCIBIOS_LIBRETTO_FIXUP	# this code makes the Toshiba Libretto
					# L2/L3 work, but should not be enabled
					# on anything else.
#options 	PCIBIOS_SHARP_MM20_FIXUP # this code makes the Sharp MM 20
					# work, but should not be enabled
					# on anything else.
#options 	PCIINTR_DEBUG		# super-verbose PCI interrupt fixup

# PCI fixups, for both PCIBIOS and ACPI
#options 	PCI_ADDR_FIXUP		# fixup PCI I/O addresses
#options 	PCI_BUS_FIXUP		# fixup PCI bus numbering
#options 	PCI_INTR_FIXUP		# fixup PCI interrupt routing

# System Controllers
elansc* at pci? dev ? function ?	# AMD Elan SC520 System Controller
gpio* 	at elansc?

# PCI bridges
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ watchdog and
					# SpeedStep support
piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
#gscpcib* at pci? dev ? function ?	# NS Geode PCI-ISA w/ GPIO support
#viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
pchb*	at pci? dev ? function ?	# PCI-Host bridges
pceb*	at pci? dev ? function ?	# PCI-EISA bridges
pcib*	at pci? dev ? function ?	# PCI-ISA bridges
pcmb*	at pci? dev ? function ?	# PCI-MCA bridges
ppb*	at pci? dev ? function ?	# PCI-PCI bridges
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc*	at pci? dev ? function ?	# PCI "universal" comm. cards

agp* 	at pchb?


# EISA bus support
eisa0	at mainbus?
eisa0	at pceb?

# ISA bus support
#isa0	at ichlpcib?
isa0	at piixpcib?
#isa0	at gscpcib?
#isa0	at viapcib?
isa0	at mainbus?
isa0	at pceb?
isa0	at pcib?

# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
pcmcia* at tcic? controller ? socket ?

# MCA bus support
mca0	at mainbus?

# ISA PCMCIA controllers
pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1	at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
tcic0	at isa? port 0x240 iomem 0xd0000 iosiz 0x10000

# PCI PCMCIA controllers
pcic0	at pci? dev? function ?

# ISA Plug-and-Play bus support
isapnp0 at isa?

# ISA Plug-and-Play PCMCIA controllers
pcic*	at isapnp?

# CardBus bridge support
cbb*		at pci? dev ? function ?
cardslot*	at cbb?

# CardBus bus support
cardbus*	at cardslot?
pcmcia* 	at cardslot?

# Coprocessor Support

# Math Coprocessor support
npx0	at isa? port 0xf0 irq 13	# x86 math coprocessor


# Console Devices

# ISA console
#pc0	at isa? port 0x60 irq 1		# pccons generic PC console driver
# Keyboard layout configuration for pccons
#options 	FRENCH_KBD
#options 	FINNISH_KBD
#options 	GERMAN_KBD
#options 	NORWEGIAN_KBD


# wscons
pckbc0		at isa?			# pc keyboard controller
pckbd*		at pckbc?		# PC keyboard
pms*		at pckbc?		# PS/2 mouse for wsmouse
#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
#options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
vga0		at isa?
vga*		at pci? dev ? function ?
pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
#machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
wsdisplay*	at vga? console ?
wsdisplay*	at pcdisplay? console ?
#wsdisplay* 	at machfb? console ?
wskbd*		at pckbd? console ?
wsmouse*	at pms? mux 0

# VESA framebuffer console
#options 	KVM86			# required for vesabios
#vesabios*	at vesabiosbus?
#vesafb* 	at vesabios?
#options 	VESAFB_WIDTH=640
#options 	VESAFB_HEIGHT=480
#options 	VESAFB_DEPTH=8
#options 	VESAFB_PM		# power management support
#wsdisplay*	at vesafb? console ?

attimer0	at isa?
pcppi0		at isa?
sysbeep0	at pcppi?

# Serial Devices

# PCI serial interfaces
com*	at puc? port ?			# 16x50s on "universal" comm boards
cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards

# ISA Plug-and-Play serial interfaces
com*	at isapnp?			# Modems and serial boards

# PCMCIA serial interfaces
com*	at pcmcia? function ?		# Modems and serial cards

pcmcom* at pcmcia? function ?		# PCMCIA multi-port serial cards
com*	at pcmcom? slave ?		# ...and the slave devices

# CardBus serial interfaces
#com*	at cardbus? function ?	# Modems and serial cards

# ISA serial interfaces
#options 	COM_HAYESP		# adds Hayes ESP serial board support
com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
com1	at isa? port 0x2f8 irq 3
com2	at isa? port 0x3e8 irq 5
#com3	at isa? port 0x2e8 irq 9
#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
#com*	at ast? slave ?
#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
#boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
#boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
#com*	at boca? slave ?
#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
#com*	at tcom? slave ?
#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
#com*	at rtfps? slave ?
#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
#addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
#com*	at addcom? slave ?
#moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
#com*	at moxa? slave ?
#ioat*	at isa? port 0x220 irq 5	# BOCA IOAT66 6-port serial card
#com*	at ioat? slave ?

# MCA serial interfaces
com*	at mca? slot ?			# 16x50s on comm boards

# Parallel Printer Interfaces

# PCI parallel printer interfaces
lpt*	at puc? port ?			# || ports on "universal" comm boards

# ISA parallel printer interfaces
lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
lpt1	at isa? port 0x278
lpt2	at isa? port 0x3bc

# Hardware monitors

# AMD 768 and 8111 power/ACPI controllers
amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
#iic*	at amdpm?			# sensors below are on this bus
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

# Intel PIIX4 power management controllers
piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

# iTE IT87xxF and compatible hardware monitors
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00

# LM7[89] and compatible hardware monitors
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310

# PC87366 hardware monitor
#nsclpcsio*	at isa?
#gpio*		at nsclpcsio?

# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
#viaenv*	at pci? dev ? function ?


# I2O devices
iop*	at pci? dev ? function ?	# I/O processor
iopsp*	at iop? tid ?			# SCSI/FC-AL ports
ld*	at iop? tid ?			# block devices
dpti*	at iop? tid 0			# DPT/Adaptec control interface

# GPIO devices
#gpio*	at gscpcib?

# 1-Wire support
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
#onewire*	at gpioow?

# 1-Wire devices
#owtemp* 	at onewire?			# Temperature sensors

# SCSI Controllers and Devices

# PCI SCSI controllers
adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
ahd*	at pci? dev ? function ?	# Adaptec 29320, 39320 (aic790x) SCSI
bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
mpt*	at pci? dev ? function ?	# LSI Fusion SCSI/FC
njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
esiop*	at pci? dev ? function ?	# Symbios 53c875 SCSI and newer
#options 	SIOP_SYMLED		# drive the act. LED in software
trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI

# EISA SCSI controllers
ahb*	at eisa? slot ?			# Adaptec 174[02] SCSI
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
bha*	at eisa? slot ?			# BusLogic 7xx SCSI
dpt*	at eisa? slot ?			# DPT EATA SCSI
uha*	at eisa? slot ?			# UltraStor 24f SCSI

# PCMCIA SCSI controllers
aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI
esp*	at pcmcia? function ?		# Qlogic ESP406/FAS408 SCSI
spc* 	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI

# ISA Plug-and-Play SCSI controllers
aha*	at isapnp? 			# Adaptec AHA-154[02
aic*	at isapnp?			# Adaptec AHA-1520B

# ISA SCSI controllers
adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02] SCSI
aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI
aha1	at isa? port 0x334 irq ? drq ?
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
bha1	at isa? port 0x334 irq ? drq ?
# The "nca" and "dpt" probes might give false hits or hang your machine.
#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
sea0	at isa? iomem 0xc8000 irq 5	# Seagate/Future Domain SCSI
uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI
uha1	at isa? port 0x340 irq ? drq ?
wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
wds1	at isa? port 0x358 irq 11 drq 5

# CardBus SCSI cards
#adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
#ahc*	at cardbus? function ?	# Adaptec ADP-1480
#njs*	at cardbus? function ?	# Workbit NinjaSCSI-32

# MCA SCSI cards
aha*	at mca? slot ?			# Adaptec AHA-1640

# SCSI bus support
scsibus* at scsi?

# SCSI devices
sd*	at scsibus? target ? lun ?	# SCSI disk drives
st*	at scsibus? target ? lun ?	# SCSI tape drives
cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
ch*	at scsibus? target ? lun ?	# SCSI autochangers
ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devices
ss*	at scsibus? target ? lun ?	# SCSI scanners
uk*	at scsibus? target ? lun ?	# SCSI unknown


# RAID controllers and devices
aac*	at pci? dev ? function ?	# Adaptec AAC family
amr*	at pci? dev ? function ?	# AMI/LSI Logic MegaRAID
cac*	at eisa? slot ?			# Compaq EISA array controllers
cac*	at pci? dev ? function ?	# Compaq PCI array controllers
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
mlx*	at eisa? slot ?			# Mylex DAC960 & DEC SWXCR family
twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers

ld*	at aac? unit ?			# logical disk devices
ld*	at amr? unit ?
ld*	at cac? unit ?
ld*	at icp? unit ?
ld*	at twa? unit ?
ld*	at twe? unit ?
ld*	at mlx? unit ?

icpsp*	at icp? unit ?			# SCSI pass-through

# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
# how to set up DMA modes for this chip. This may work, or may cause
# a machine hang with some controllers.
pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
acardide*	at pci? dev ? function ?	# Acard IDE controllers
aceride* 	at pci? dev ? function ?	# Acer Lab IDE controllers
ahcisata* 	at pci? dev ? function ?	# AHCI SATA controllers
artsata* 	at pci? dev ? function ?	# Intel i31244 SATA controller
cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
geodeide* 	at pci? dev ? function ?	# AMD Geode IDE controllers
hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
iteide* 	at pci? dev ? function ?	# IT Express IDE controllers
ixpide* 	at pci? dev ? function ?	# ATI IXP IDE controllers
optiide* 	at pci? dev ? function ?	# Opti IDE controllers
piixide* 	at pci? dev ? function ?	# Intel IDE controllers
pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
pdcsata*	at pci? dev ? function ?	# Promise SATA150 controllers
rccide* 	at pci? dev ? function ?	# ServerWorks IDE controllers
satalink*	at pci? dev ? function ?	# SiI SATALink controllers
siside* 	at pci? dev ? function ?	# SiS IDE controllers
slide*  	at pci? dev ? function ?	# Symphony Labs IDE controllers
svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
stpcide*	at pci? dev ? function ?	# STMicro STPC IDE controllers
viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers

# ISA Plug-and-Play IDE controllers
wdc*	at isapnp?

# PCMCIA IDE controllers
wdc*	at pcmcia? function ?

# CardBus IDE controllers
#njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32

# ISA ST506, ESDI, and IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
# fall back to 16bits I/O if 32bits I/O are not functional).
# Some controllers pass the initial 32bit test, but will fail later.
wdc0	at isa? port 0x1f0 irq 14 flags 0x00
wdc1	at isa? port 0x170 irq 15 flags 0x00

# ATA (IDE) bus support
atabus* at ata?

# IDE drives
# Flags are used only with controllers that support DMA operations
# and mode settings (e.g. some pciide controllers)
# The lowest order four bits (rightmost digit) of the flags define the PIO
# mode to use, the next set of four bits the DMA mode and the third set the
# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
# to use, and the last bit must be 1 for this setting to be used.
# For DMA and UDMA, 0xf (1111) means 'disable'.
# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
# (0xc=1100, 0xa=1010, 0xf=1111)
# 0x0000 means "use whatever the drive claims to support".
wd*	at atabus? drive ? flags 0x0000

# ATA RAID configuration support, as found on some Promise controllers.
pseudo-device	ataraid
ld*	at ataraid? vendtype ? unit ?

# ATAPI bus support
atapibus* at atapi?

# ATAPI devices
# flags have the same meaning as for IDE drives.
cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown


# Miscellaneous mass storage devices

# ISA floppy
fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
#fdc1	at isa? port 0x370 irq ? drq ?
fd*	at fdc? drive ?			# the drives themselves
# some machines need you to do this instead of fd*
#fd0	at fdc0 drive 0

# ISA CD-ROM devices
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives

# ISA tape devices
# note: the wt driver conflicts unpleasantly with SMC boards at the
# same I/O address. The probe reprograms their EEPROMs. Don't
# uncomment it unless you are actually using it.
#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives

# MCA ESDI devices
edc*	at mca? slot ?			# IBM ESDI Disk Controllers
ed*	at edc?


# Network Interfaces

# PCI network interfaces
an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11
atw*	at pci? dev ? function ?	# ADMtek ADM8211 (802.11)
bce* 	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
en*	at pci? dev ? function ?	# ENI/Adaptec ATM
ep*	at pci? dev ? function ?	# 3Com 3c59x
epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
esh*	at pci? dev ? function ?	# Essential HIPPI card
ex*	at pci? dev ? function ?	# 3Com 90x[BC]
fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
ipw*	at pci? dev ? function ?	# Intel PRO/Wireless 2100
iwi*	at pci? dev ? function ?	# Intel PRO/Wireless 2200BG
le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
#ndis* 	at pci? dev ? function ?	# Experimental - NDIS Network Driver
ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
ral*	at pci? dev ? function ?	# Ralink Technology RT25x0 802.11a/b/g
re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
rtk*	at pci? dev ? function ?	# Realtek 8129/8139
rtw*	at pci? dev ? function ?	# Realtek 8180L (802.11)
sf*	at pci? dev ? function ?	# Adaptec AIC-6915 Ethernet
sip*	at pci? dev ? function ?	# SiS 900/DP83815 Ethernet
skc*	at pci? dev ? function ?	# SysKonnect SK9821 Gigabit Ethernet
sk*	at skc?				# SysKonnect SK9821 Gigabit Ethernet
ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
txp*	at pci? dev ? function ?	# 3com 3cr990
vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet
wi*	at pci? dev ? function ?	# Intersil Prism Mini-PCI (802.11b)
wm*	at pci? dev ? function ?	# Intel 8254x gigabit
wpi*	at pci? dev ? function ?	# Intel PRO/Wireless 3945ABG
xge*	at pci? dev ? function ?	# Neterion (S2io) Xframe-I 10GbE

# EISA network interfaces
ep*	at eisa? slot ?			# 3Com 3c579 Ethernet
fea*	at eisa? slot ?			# DEC DEFEA FDDI
tlp*	at eisa? slot ?			# DEC DE-425 Ethernet

# ISA Plug-and-Play network interfaces
an*	at isapnp?			# Aironet 802.11
ep*	at isapnp?			# 3Com 3c509 Ethernet
fmv*	at isapnp?			# Fujitsu FMV-183
le*	at isapnp?			# AMD PCnet-ISA Ethernet
ne*	at isapnp?			# NE2000-compatible Ethernet
tr*	at isapnp?			# IBM/3COM TROPIC Token-Ring

# PCMCIA network interfaces
an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
awi*	at pcmcia? function ?		# BayStack 650/660 (802.11FH/DS)
cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer
cs*	at pcmcia? function ?		# CS89xx Ethernet
ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
mbe*	at pcmcia? function ?		# MB8696x based Ethernet
ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
ray*	at pcmcia? function ?		# Raytheon Raylink (802.11)
sm*	at pcmcia? function ?		# Megahertz Ethernet
# tr at pcmcia has problems with Cardbus bridges
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet
com*	at xirc?
xi*	at xirc?
mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
com*	at mhzc?
sm*	at mhzc?

# ISA network interfaces
ate0	at isa? port 0x2a0 irq ?		# AT1700
cs0	at isa? port 0x300 iomem ? irq ? drq ?	# CS8900 Ethernet
ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3Com 3c503 Ethernet
eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
ep*	at isa? port ? irq ?			# 3C509 ethernet cards
ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
fmv0	at isa? port 0x2a0 irq ?		# FMV-181/182
ix0	at isa? port 0x300 irq 10		# EtherExpress/16
iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
#depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
#le*	at depca?
nele0	at isa? port 0x320 irq 9 drq 7		# NE2100
le*	at nele?
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
bicc0	at isa? port 0x320 irq 10 drq 7		# BICC IsoLan
le*	at bicc?
ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
ne1	at isa? port 0x300 irq 10
sm0	at isa? port 0x300 irq 10		# SMC91C9x Ethernet
tr0	at isa? port 0xa20 iomem 0xd8000 irq ?	# IBM TROPIC based Token-Ring
tr1	at isa? port 0xa24 iomem 0xd0000 irq ?	# IBM TROPIC based Token-Ring
tr*	at isa? port ? irq ?			# 3COM TROPIC based Token-Ring
we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC Ethernet
we1	at isa? port 0x300 iomem 0xcc000 irq 10

# CardBus network cards
#ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
#atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
#ex*	at cardbus? function ?	# 3Com 3C575TX
#fxp*	at cardbus? function ?	# Intel i8255x
#rtk*	at cardbus? function ?	# Realtek 8129/8139
#ral*	at cardbus? function ?	# Ralink Technology
#rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
#tlp*	at cardbus? function ?	# DECchip 21143

# MCA network cards
elmc*	at mca? slot ?			# 3Com EtherLink/MC (3c523)
ep*	at mca? slot ?			# 3Com EtherLink III (3c529)
we*	at mca? slot ?			# WD/SMC Ethernet
ate*	at mca? slot ?			# Allied Telesis AT1720
ne*	at mca? slot ?			# Novell NE/2 and clones
tr*	at mca? slot ?			# IBM Token Ring adapter
tra*	at mca? slot ?			# Tiara LANCard/E and clones
le*	at mca? slot ?			# SKNET Personal/MC2+

# MII/PHY support
acphy*	at mii? phy ?			# Altima AC101 and AMD Am79c874 PHYs
amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
exphy*	at mii? phy ?			# 3Com internal PHYs
gentbi* at mii? phy ?			# Generic Ten-Bit 1000BASE-[CLS]X PHYs
glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
icsphy* at mii? phy ?			# Integrated Circuit Systems ICS189x
igphy*	at mii? phy ?			# Intel IGP01E1000
ikphy*	at mii? phy ?			# Intel 82563 PHYs
inphy*	at mii? phy ?			# Intel 82555 PHYs
iophy*	at mii? phy ?			# Intel 82553 PHYs
lxtphy* at mii? phy ?			# Level One LXT-970 PHYs
makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
nsphy*	at mii? phy ?			# NS83840 PHYs
nsphyter* at mii? phy ? 		# NS83843 PHYs
pnaphy* at mii? phy ?			# generic HomePNA PHYs
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
tlphy*	at mii? phy ?			# ThunderLAN PHYs
tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
ukphy*	at mii? phy ?			# generic unknown PHYs
urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs


# USB Controller and Devices

# PCI USB controllers
ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
ohci*	at pci?	dev ? function ?	# Open Host Controller
uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)

# CardBus USB controllers
#ehci*	at cardbus? function ?	# Enhanced Host Controller
#ohci*	at cardbus? function ?	# Open Host Controller
#uhci*	at cardbus? function ?	# Universal Host Controller (Intel)

# ISA USB controllers
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS

# USB bus support
usb*	at ehci?
usb*	at ohci?
usb*	at uhci?
#usb*	at slhci?

# USB Hubs
uhub*	at usb?
uhub*	at uhub? port ? configuration ? interface ?

# USB HID device
uhidev*	at uhub? port ? configuration ? interface ?

# USB Mice
ums*	at uhidev? reportid ?
wsmouse* at ums? mux 0

# USB eGalax touch-panel
uep*	at uhub? port ?
wsmouse* at uep? mux 0

# USB Keyboards
ukbd*	at uhidev? reportid ?
wskbd*	at ukbd? console ? mux 1

# USB serial adapter
ucycom*	at uhidev? reportid ?

# USB Generic HID devices
uhid*	at uhidev? reportid ?

# USB Printer
ulpt*	at uhub? port ? configuration ? interface ?

# USB Modem
umodem*	at uhub? port ? configuration ?
ucom*	at umodem?

# USB Mass Storage
umass*	at uhub? port ? configuration ? interface ?
wd*	at umass?

# USB audio
uaudio*	at uhub? port ? configuration ?

# USB MIDI
umidi* at uhub? port ? configuration ?

# USB IrDA
# USB-IrDA bridge spec
uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?

# SigmaTel STIr4200 USB/IrDA Bridge
ustir* at uhub? port ?
irframe* at ustir?

# USB Ethernet adapters
aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
axe*	at uhub? port ?		# ASIX AX88172 based adapters
cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
udav*	at uhub? port ?		# Davicom DM9601 based adapters
url*	at uhub? port ?		# Realtek RTL8150L based adapters

# USB 802.11 adapters
atu*	at uhub? port ?		# Atmel AT76C50XX based adapters
ral*	at uhub? port ?		# Ralink Technology RT25x0 802.11a/b/g
rum*	at uhub? port ?		# Ralink Technology RT2501/RT2601 802.11a/b/g

# Prolific PL2301/PL2302 host-to-host adapter
upl*	at uhub? port ?

# Serial adapters
ubsa*	at uhub? port ?		# Belkin serial adapter
ucom*	at ubsa? portno ?

uftdi*	at uhub? port ?		# FTDI FT8U100AX serial adapter
ucom*	at uftdi? portno ?

uipaq*	at uhub? port ?		# iPAQ PDAs
ucom*	at uipaq? portno ?

umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

uplcom* at uhub? port ? 	# I/O DATA USB-RSAQ2 serial adapter
ucom*	at uplcom? portno ?

uvscom* at uhub? port ? 	# SUNTAC Slipper U VS-10U serial adapter
ucom*	at uvscom? portno ?

# Diamond Multimedia Rio 500
urio*	at uhub? port ?

# USB Handspring Visor
uvisor*	at uhub? port ?
ucom*	at uvisor?

# Kyocera AIR-EDGE PHONE
ukyopon* at uhub? port ?
ucom*	at ukyopon? portno ?

# USB scanners
uscanner* at uhub? port ?

# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?

# Topfield TF5000PVR range of DVB recorders
utoppy*	at uhub? port ?

# Y@@P firmware loader
uyap* at uhub? port ?

# D-Link DSB-R100 USB radio
udsbr*	at uhub? port ?
radio*	at udsbr?

# USB Generic driver
ugen*	at uhub? port ?
# On ugen bulk endpoints, perform read-ahead and write-behind.
options UGEN_BULK_RA_WB


# IrDA and Consumer Ir devices

# Toshiba Oboe
oboe* 	at pci? dev ? function ?
irframe* at oboe?


# PCI IEEE1394 controllers
fwohci*	at pci? dev ? function ?	# IEEE1394 Open Host Controller

# CardBus IEEE1394 controllers
#fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller

ieee1394if* at fwohci?
fwip*	at ieee1394if?			# IP over IEEE1394
sbp*	at ieee1394if? euihi ? euilo ?	# SCSI over IEEE1394


# Audio Devices

# PCI audio devices
auacer* at pci? dev ? function ?	# ALi M5455 integrated AC'97 Audio
auich*	at pci? dev ? function ?	# Intel ICH integrated AC'97 Audio
auixp*	at pci? dev ? function ?	# ATI IXP AC'97 Audio
autri*	at pci? dev ? function ?	# Trident 4DWAVE based AC'97 Audio
auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
azalia*	at pci? dev ? function ?	# High Definition Audio
clcs*	at pci? dev ? function ?	# Cirrus Logic CS4280
clct*	at pci? dev ? function ?	# Cirrus Logic CS4281
cmpci*	at pci? dev ? function ?	# C-Media CMI8338/8738
eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
emuxki* at pci? dev ? function ?	# Creative SBLive! and PCI512
esa*	at pci? dev ? function ?	# ESS Allegro-1 / Maestro-3 PCI Audio
esm*	at pci? dev ? function ?	# ESS Maestro-1/2/2e PCI Audio Accelerator
eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
fms*	at pci? dev ? function ?	# Forte Media FM801
neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
sv*	at pci? dev ? function ?	# S3 SonicVibes
yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio

# ISA Plug-and-Play audio devices
ess*	at isapnp?			# ESS Tech ES1887, ES1888, ES888 audio
guspnp* at isapnp?			# Gravis Ultra Sound PnP audio
sb*	at isapnp?			# SoundBlaster-compatible audio
wss*	at isapnp?			# Windows Sound System
ym*	at isapnp?			# Yamaha OPL3-SA[23] audio

# ISA audio devices
# the "aria" probe might give false hits
#aria0	at isa? port 0x290 irq 10 		# Aria
#ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
sb0	at isa? port 0x220 irq 5 drq 1 drq2 5	# SoundBlaster
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System

# PCMCIA audio devices
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive

#cms0	at isa? port 0x220			# Creative Music System

# OPL[23] FM synthesizers
#opl0	at isa? port 0x388	# use only if not attached to sound card
opl*	at cmpci? flags 1
#opl*	at esl?
opl*	at eso?
opl*	at ess?
opl*	at fms?
opl*	at sb?
opl*	at sv?
opl*	at wss?
opl*	at yds?
opl*	at ym?

# Audio support
audio*	at audiobus?

# MPU 401 UARTs
#mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
mpu*	at isapnp?
mpu*	at cmpci?
mpu*	at eso?
mpu*	at fms?
mpu*	at sb?
mpu*	at yds?
mpu*	at ym?

# MIDI support
midi*	at midibus?
midi*	at pcppi?		# MIDI interface to the PC speaker

# The spkr driver provides a simple tone interface to the built in speaker.
#spkr0	at pcppi?		# PC speaker


# FM-Radio devices
# ISA radio devices
#az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
#az1	at isa? port 0x358
#rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
#rt1	at isa? port 0x284
#rt2	at isa? port 0x30c
#rt3	at isa? port 0x384
#rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
#rtii1	at isa? port 0x30c
#sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card

# PCI radio devices
#gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card

# Radio support
#radio*	at az?
#radio*	at gtp?
#radio*	at rt?
#radio*	at rtii?
#radio*	at sf2r?


# TV cards

# Brooktree 848/849/878/879 based TV cards
bktr* at pci? dev ? function ?
radio* at bktr?


# Bluetooth Controller and Device support

# Bluetooth PCMCIA Controllers
bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A

# Bluetooth USB Controllers
ubt* at uhub? port ? configuration ? interface ?

# Bluetooth Device Hub
bthub* at bt3c?
bthub* at ubt?

# Bluetooth HID support
bthidev* at bthub?

# Bluetooth Mouse
btms* at bthidev? reportid ?
wsmouse* at btms? mux 0

# Bluetooth Keyboard
btkbd* at bthidev? reportid ?
wskbd* at btkbd? console ? mux 1

# Bluetooth Audio support
btsco* at bthub?


# Mice

# ISA busmice
lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
lms1	at isa? port 0x238 irq 5
mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
mms1	at isa? port 0x238 irq 5
wsmouse*	at lms? mux 0
wsmouse*	at mms? mux 0


# Cryptographic Devices

# PCI cryptographic devices
hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x


# Joysticks

#joy*	at pnpbios? index ?		# Game port

# ISA Plug-and-Play joysticks
joy*	at isapnp?			# Game ports (usually on audio cards)

# PCI joysticks
joy*	at pci?				# Game ports (usually on audio cards)
#joy*	at eap?				# See CAVEATS in eap(4) before enabling
joy*	at eso?				# ESS Solo-1 on-board joystick

# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0	at isa? port 0x201


# Miscellaneous Devices
geodegcb*  at pci? dev ? function ?	# Geode GCB area
geodewdog* at geodegcb? 		# AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb? 		# AMD Geode SC1100 high res. counter

# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1

# Middle Digital, Inc. PCI-Weasel serial console board control
# devices (watchdog timer, etc.)
weasel* at pci?

# Pull in optional local configuration
include	"arch/i386/conf/GENERIC.local"


# Pseudo-Devices

pseudo-device 	crypto		# /dev/crypto device
pseudo-device	swcrypto	# software crypto implementation

# disk/mass storage pseudo-devices
pseudo-device	ccd		4	# concatenated/striped disk devices
#pseudo-device	cgd		4	# cryptographic disk devices
pseudo-device	raid		8	# RAIDframe disk driver
options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
# Options to enable various other RAIDframe RAID types.
#options 	RF_INCLUDE_EVENODD=1
#options 	RF_INCLUDE_RAID5_RS=1
#options 	RF_INCLUDE_PARITYLOGGING=1
#options 	RF_INCLUDE_CHAINDECLUSTER=1
#options 	RF_INCLUDE_INTERDECLUSTER=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
pseudo-device	fss		4	# file system snapshot device

pseudo-device	md		1	# memory disk device (ramdisk)
pseudo-device	vnd			# disk-like interface to files
options 	VND_COMPRESSION		# compressed vnd(4)

# network pseudo-devices
pseudo-device	bpfilter		# Berkeley packet filter
#pseudo-device	carp			# Common Address Redundancy Protocol
pseudo-device	ipfilter		# IP filter (firewall) and NAT
pseudo-device	loop			# network loopback
pseudo-device	ppp			# Point-to-Point Protocol
pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
pseudo-device	sl			# Serial Line IP
pseudo-device	strip			# Starmode Radio IP (Metricom)
pseudo-device	irframetty		# IrDA frame line discipline
pseudo-device	tap			# virtual Ethernet
pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith			# IPv[46] tcp relay translation i/f
pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
pseudo-device	vlan			# IEEE 802.1q encapsulation
pseudo-device	bridge			# simple inter-network bridging
#options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
#pseudo-device	pf			# PF packet filter
#pseudo-device	pflog			# PF log if
# srt is EXPERIMENTAL
#pseudo-device	srt			# source-address-based routing

# miscellaneous pseudo-devices
pseudo-device	pty			# pseudo-terminals
pseudo-device	sequencer	1	# MIDI sequencer
# rnd works; RND_COM does not on port i386 yet.
pseudo-device	rnd			# /dev/random and in-kernel generator
#options 	RND_COM			# use "com" randomness as well (BROKEN)
pseudo-device	clockctl		# user control of clock subsystem
pseudo-device	ksyms			# /dev/ksyms
pseudo-device	lockstat		# lock profiling

# a pseudo device needed for Coda	# also needs CODA (above)
pseudo-device	vcoda		4	# coda minicache <-> venus comm.

# a pseudo device needed for SMBFS
pseudo-device	nsmb			# experimental - SMB requester

# wscons pseudo-devices
pseudo-device	wsmux			# mouse & keyboard multiplexor
pseudo-device	wsfont

options 	FILEASSOC		# fileassoc(9) - required for Veriexec

# Veriexec
pseudo-device	veriexec
#
# Uncomment the fingerprint methods below that are desired. Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
options VERIFIED_EXEC_FP_RMD160
options VERIFIED_EXEC_FP_SHA256
options VERIFIED_EXEC_FP_SHA384
options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5

options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
@


1.808.2.3
log
@define SCHED_4BSD in conf/std for now.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.808.2.2 2007/02/21 11:57:28 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.808.2.2 $"
d122 3
@


1.808.2.4
log
@- sync with head.
- move sched_changepri back to kern_synch.c as it doesn't know PPQ anymore.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.808.2.3 2007/02/27 16:51:32 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.808.2.3 $"
a131 3
#options 	SYSCALL_STATS	# per syscall counts
#options 	SYSCALL_TIMES	# per syscall times
#options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
@


1.808.2.5
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.808.2.4 2007/03/12 05:48:19 rmind Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.808.2.4 $"
a185 1
#file-system	HFS		# experimental - Apple HFS+ (read-only)
d236 1
a236 1
options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
d310 1
a310 1
ioapic* at mainbus?
d337 1
a337 1
options 	ACPI_SCANPCI	# find PCI roots using ACPI
d339 1
a339 1
acpi0 		at mainbus0
d345 6
a350 6
acpiacad* 	at acpi?		# ACPI AC Adapter
acpibat* 	at acpi?		# ACPI Battery
acpibut* 	at acpi?		# ACPI Button
acpiec* 	at acpi?		# ACPI Embedded Controller
acpilid* 	at acpi?		# ACPI Lid Switch
acpitz* 	at acpi?		# ACPI Thermal Zone
d353 2
a354 2
attimer*	at acpi?		# AT Timer
com* 		at acpi?		# Serial communications interface
d356 8
a363 9
hpet* 		at acpi?		# High Precision Event Timer
joy*		at acpi?		# Joystick/Game port
lpt* 		at acpi?		# Parallel port
mpu*		at acpi?		# Roland MPU-401 MIDI UART
npx*		at acpi?		# Math coprocessor
pckbc*  	at acpi?		# PC keyboard controller
pcppi*		at acpi?                # AT-style speaker sound
wss* 		at acpi?		# NeoMagic 256AV in wss mode
ym* 		at acpi?		# Yamaha OPL3-SA[23] audio
d366 2
a367 2
spic* 		at acpi?		# Sony Programmable I/O Controller
wsmouse* 	at spic?
d370 1
a370 1
sony* 		at acpi?		# Sony Miscellaneous Controller
d373 1
a373 1
vald* at acpi?
a1274 1
bthub* at btuart?
a1398 1
pseudo-device	btuart			# Bluetooth HCI UART (H4)
@


1.808.2.6
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.808.2.5 2007/03/24 14:54:43 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.808.2.5 $"
a57 3
# Intel(R) On Demand Clock Modulation (aka ODCM)
# options 	INTEL_ONDEMAND_CLOCKMOD

a345 1
apm*		at acpi?		# ACPI apm emulation
a353 1
aiboost*	at acpi?		# ASUS AI Booster Hardware Monitor
a536 4
# VIA Unichrome framebuffer console
#unichromefb* 	at pci? dev ? function ?
#wsdisplay* 	at unichromefb?

d558 1
a558 1
com*	at cardbus? function ?	# Modems and serial cards
d696 3
a698 3
adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc*	at cardbus? function ?	# Adaptec ADP-1480
njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
d951 8
a958 8
ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
ex*	at cardbus? function ?	# 3Com 3C575TX
fxp*	at cardbus? function ?	# Intel i8255x
rtk*	at cardbus? function ?	# Realtek 8129/8139
ral*	at cardbus? function ?	# Ralink Technology
rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
tlp*	at cardbus? function ?	# DECchip 21143
d1009 3
a1011 3
ehci*	at cardbus? function ?	# Enhanced Host Controller
ohci*	at cardbus? function ?	# Open Host Controller
uhci*	at cardbus? function ?	# Universal Host Controller (Intel)
d1024 1
a1024 1
uhub*	at uhub? port ?
d1153 1
a1153 1
fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
d1273 1
a1273 1
ubt* at uhub? port ?
@


1.808.2.7
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.808.2.6 2007/04/15 16:02:46 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.808.2.6 $"
a963 1
ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g
d965 1
d1018 3
a1020 3
ehci*	at cardbus? function ?		# Enhanced Host Controller
ohci*	at cardbus? function ?		# Open Host Controller
uhci*	at cardbus? function ?		# Universal Host Controller (Intel)
@


1.808.2.8
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.808.2.7 2007/05/07 10:54:55 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.808.2.7 $"
a628 3
# Abit uGuru Hardware system monitor
#ug0    at isa? port 0xe0

a792 1
options	ATADEBUG
a1359 1
pseudo-device	bio			# RAID control device driver
@


1.808.2.9
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.808.2.8 2007/05/17 13:40:56 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.808.2.8 $"
a368 1
ug* 		at acpi?		# Abit uGuru Hardware monitor
a765 2
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
ahcisata* 	at jmide?
@


1.807
log
@Merge newlock2 to head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.806 2007/01/24 19:46:26 tls Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.806 $"
d55 3
@


1.806
log
@Remove option COMPAT_386BSD_MBRPART from default kernels.  NetBSD has
not used partition ID 0x165 for many, many years, and the presence of
this option in INSTALL kernels can cause overwriting of existing FreeBSD
installations when sysinst writes back the disklabel.  Those with very,
very old NetBSD installations may find that they must update their fdisk
partition tables to use partition ID 0x169 for their NetBSD partitions.

This seems like the best of a number of lousy choices for dealing with
this problem.  Sysinst should perhaps grow code that asks whether an
existing 0x165 partition should be converted.

~
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.805 2007/01/20 18:48:17 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.805 $"
d1392 1
@


1.805
log
@viaenv(4) does not need anymore viapm.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.804 2007/01/11 05:36:29 mouse Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.804 $"
d143 1
a143 1
options 	COMPAT_386BSD_MBRPART # recognize old partition ID
@


1.804
log
@Hook srt into the rest of the kernel build machinery, so it works to
just uncomment the pseudo-device line (which arguably should go into
other ports' GENERICs too, and at some point may).

OKed by perry.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.803 2006/12/17 23:02:06 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.803 $"
d612 2
a613 3
# VIA VT82C686A hardware monitor
#viapm*	at pci? dev ? function ?
#viaenv* at viapm?
@


1.803
log
@Add bnx(4), a driver for Broadcom NetXtreme II 10/100/1000 Ethernet device.
Ported from OpenBSD by cube@@, with some bus_dma fixes by me.
Tested on i386 and amd64.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.802 2006/12/17 22:57:15 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.802 $"
d1382 2
@


1.802
log
@Add mfi(4), a driver for LSI Logic & Dell MegaRAID SAS RAID controller.
Ported from OpenBSD, tested on i386 and amd64.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.801 2006/12/11 15:24:28 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.801 $"
d837 1
@


1.801
log
@- remove a static configuration, FILEASSOC_NHOOKS.  do it dynamically instead.
- make fileassoc_t a pointer and remove FILEASSOC_INVAL.
- clean up kern_fileassoc.c.  unify duplicated code.
- unexport fileassoc_init using RUN_ONCE(9).
- plug memory leaks in fileassoc_file_delete and fileassoc_table_delete.
- always call callbacks, regardless of the value of the associated data.

ok'ed by elad.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d644 1
@


1.800
log
@Add rtw at pci to the GENERIC kernel.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799 2006/11/30 21:01:16 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799 $"
a1400 1
#options 	FILEASSOC_NHOOKS=4	# Default number of storage slots
@


1.799
log
@Add ahcisata(4), a driver for AHCI 1.0 and 1.1 controllers. Tested on the sata
ports of a Intel 63xxESB chipset. Does not support NCQ yet.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.798 2006/11/28 16:15:36 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.798 $"
d861 1
@


1.799.2.1
log
@Pull up following revision(s) (requested by bouyer in ticket #286):
	sys/arch/i386/conf/INSTALL: revision 1.298
	sys/arch/i386/conf/GENERIC: revision 1.802
	sys/dev/pci/files.pci: revision 1.274
	sys/arch/amd64/conf/GENERIC: revision 1.122
	sys/dev/pci/mfi_pci.c: revision 1.1
	distrib/sets/lists/man/mi: revision 1.958
	sys/arch/amd64/conf/INSTALL: revision 1.61
	sys/arch/i386/conf/ALL: revision 1.75
	sys/dev/ic/mfireg.h: revision 1.1
	share/man/man4/Makefile: revision 1.416
	sys/dev/ic/mfi.c: revision 1.1
	sys/arch/i386/conf/XEN2_DOM0: revision 1.19
	sys/dev/ic/mfivar.h: revision 1.1
	sys/conf/files: revision 1.821
	share/man/man4/mfi.4: revision 1.1
Add mfi(4), a driver for LSI Logic & Dell MegaRAID SAS RAID controller.
Ported from OpenBSD, tested on i386 and amd64.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a643 1
mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
@


1.799.2.2
log
@Pull up following revision(s) (requested by bouyer in ticket #287):
	sys/arch/i386/conf/INSTALL: revision 1.299
	sys/arch/i386/conf/XEN2_DOM0: revision 1.20
	sys/arch/i386/conf/GENERIC: revision 1.803
	sys/dev/pci/files.pci: revision 1.275
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.218
	sys/arch/amd64/conf/GENERIC: revision 1.123
	sys/dev/pci/if_bnx.c: revision 1.1
	share/man/man4/bnx.4: revision 1.1
	distrib/sets/lists/man/mi: revision 1.959
	sys/arch/amd64/conf/INSTALL: revision 1.62
	sys/dev/microcode/bnx/bnxfw.h: revision 1.1
	sys/arch/i386/conf/ALL: revision 1.76
	sys/dev/pci/if_bnxreg.h: revision 1.1
	share/man/man4/Makefile: revision 1.417
	sys/arch/i386/conf/INSTALL_LAPTOP: revision 1.112
Add bnx(4), a driver for Broadcom NetXtreme II 10/100/1000 Ethernet device.
Ported from OpenBSD by cube@@, with some bus_dma fixes by me.
Tested on i386 and amd64.
@
text
@a836 1
bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
@


1.799.2.3
log
@Pull up following revision(s) (requested by tls in ticket #386):
	doc/CHANGES: revision 1.783 via patch
	sys/arch/i386/conf/INSTALL_TINY: revision 1.109
	sys/arch/i386/conf/INSTALL_XEN2_DOMU: revision 1.11
	sys/arch/i386/conf/INSTALL_SMALL: revision 1.132
	sys/arch/i386/conf/GENERIC: revision 1.806
	sys/arch/amd64/conf/GENERIC: revision 1.125
	sys/arch/i386/conf/INSTALL: revision 1.303
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.220
	sys/arch/i386/conf/GENERIC_TINY: revision 1.103
	sys/arch/i386/conf/INSTALL_LAPTOP: revision 1.114
Remove option COMPAT_386BSD_MBRPART from default kernels.  NetBSD has
not used partition ID 0x165 for many, many years, and the presence of
this option in INSTALL kernels can cause overwriting of existing FreeBSD
installations when sysinst writes back the disklabel.  Those with very,
very old NetBSD installations may find that they must update their fdisk
partition tables to use partition ID 0x169 for their NetBSD partitions.
This seems like the best of a number of lousy choices for dealing with
this problem.  Sysinst should perhaps grow code that asks whether an
existing 0x165 partition should be converted.
~
@
text
@d143 1
a143 1
#options 	COMPAT_386BSD_MBRPART # recognize old partition ID
@


1.799.2.4
log
@Pull up following revision(s) (requested by bouyer in ticket #494):
	sys/arch/i386/conf/GENERIC.MP: revision 1.9
	distrib/pc532/cdroms/installcd/Makefile: revision 1.1
	distrib/macppc/Makefile: revision 1.15
	distrib/ofppc/Makefile: revision 1.2
	distrib/ibmnws/Makefile: revision 1.2
	distrib/acorn32/Makefile: revision 1.18
	distrib/x68k/cdroms/installcd/Makefile: revision 1.1
	distrib/sparc/Makefile: revision 1.7
	distrib/sparc64/cdroms/Makefile: revision 1.1
	distrib/hp300/cdroms/Makefile: revision 1.1
	distrib/hpcsh/Makefile: revision 1.6
	distrib/ofppc/cdroms/installcd/Makefile: revision 1.1
	distrib/playstation2/Makefile: revision 1.13
	distrib/news68k/cdroms/installcd/Makefile: revision 1.1
	distrib/amiga/cdroms/installcd/Makefile: revision 1.1
	distrib/hp700/cdroms/installcd/Makefile: revision 1.1
	distrib/playstation2/cdroms/Makefile: revision 1.1
	distrib/amiga/cdroms/Makefile: revision 1.1
	etc/etc.mac68k/Makefile.inc: revision 1.18
	distrib/shark/cdroms/installcd/Makefile: revision 1.1
	distrib/hpcmips/Makefile: revision 1.28
	distrib/hpcmips/cdroms/Makefile: revision 1.1
	distrib/amd64/floppies/Makefile: revision 1.3
	sys/arch/amd64/conf/INSTALL_ACPI: file removal
	distrib/i386/cdroms/Makefile: revision 1.4
	distrib/acorn26/cdroms/installcd/Makefile: revision 1.1
	distrib/hpcsh/cdroms/Makefile: revision 1.1
	distrib/prep/cdroms/Makefile: revision 1.1
	distrib/pc532/Makefile: revision 1.4
	distrib/acorn32/cdroms/installcd/Makefile: revision 1.1
	distrib/sun2/Makefile: revision 1.8
	distrib/vax/Makefile: revision 1.17
	distrib/sparc64/cdroms/installcd/Makefile: revision 1.1
	distrib/pmax/cdroms/Makefile: revision 1.1
	distrib/mipsco/cdroms/installcd/Makefile: revision 1.1
	distrib/sun3/cdroms/installcd/Makefile: revision 1.1
	distrib/vax/cdroms/installcd/Makefile: revision 1.1
	distrib/hpcarm/cdroms/installcd/Makefile: revision 1.1
	distrib/mvme68k/Makefile: revision 1.4
	distrib/mvmeppc/cdroms/Makefile: revision 1.1
	distrib/newsmips/Makefile: revision 1.4
	sys/arch/i386/conf/GENERIC.MPACPI: file removal
	distrib/hpcarm/cdroms/Makefile: revision 1.1
	distrib/evbppc/cdroms/Makefile: revision 1.1
	sys/arch/i386/conf/INSTALL_LARGE: revision 1.1
	distrib/i386/cdroms/installcd/Makefile: revision 1.2
	distrib/i386/cdroms/installcd/Makefile: revision 1.3
	doc/CHANGES: revision 1.804
	distrib/hpcsh/cdroms/installcd/Makefile: revision 1.1
	distrib/i386/cdroms/bootcd/Makefile: revision 1.2
	distrib/mvmeppc/cdroms/installcd/Makefile: revision 1.1
	distrib/i386/cdroms/bootcd/Makefile: revision 1.3
	distrib/evbarm/Makefile: revision 1.8
	distrib/mvmeppc/Makefile: revision 1.3
	distrib/i386/cdroms/bootcd-com/Makefile: revision 1.2
	distrib/i386/cdroms/bootcd-com/Makefile: revision 1.3
	distrib/macppc/cdroms/installcd/Makefile: revision 1.1
	distrib/acorn26/cdroms/Makefile: revision 1.1
	distrib/alpha/cdroms/Makefile: revision 1.1
	distrib/hp300/cdroms/installcd/Makefile: revision 1.1
	distrib/amd64/floppies/bootfloppy/Makefile: revision 1.4
	distrib/pmppc/cdroms/installcd/Makefile: revision 1.1
	distrib/hp700/Makefile: revision 1.2
	distrib/pmppc/Makefile: revision 1.2
	distrib/arc/cdroms/Makefile: revision 1.1
	sys/arch/amd64/conf/INSTALL: revision 1.66
	distrib/sun3/cdroms/Makefile: revision 1.1
	distrib/mipsco/Makefile: revision 1.4
	distrib/sun3/Makefile: revision 1.9
	distrib/vax/cdroms/Makefile: revision 1.1
	distrib/pmppc/cdroms/Makefile: revision 1.1
	distrib/amd64/cdroms/Makefile.cdrom: revision 1.1
	distrib/atari/cdroms/installcd/Makefile: revision 1.1
	distrib/evbppc/cdroms/installcd/Makefile: revision 1.1
	distrib/newsmips/cdroms/installcd/Makefile: revision 1.1
	distrib/pmax/Makefile: revision 1.4
	Makefile: revision 1.247
	distrib/cats/cdroms/installcd/Makefile: revision 1.1
	sys/arch/amd64/conf/GENERIC: revision 1.130
	sys/arch/amd64/conf/GENERIC: revision 1.131
	distrib/sgimips/cdroms/installcd/Makefile: revision 1.1
	distrib/hp700/cdroms/Makefile: revision 1.1
	distrib/cats/cdroms/Makefile: revision 1.1
	distrib/evbmips/Makefile: revision 1.3
	distrib/evbmips/Makefile: revision 1.4
	sys/arch/amd64/conf/GENERIC_ACPI: file removal
	distrib/ews4800mips/Makefile: revision 1.2
	distrib/amd64/cdroms/bootcd-com/Makefile: revision 1.2
	distrib/i386/Makefile: revision 1.5
	distrib/amd64/cdroms/installcd/Makefile: revision 1.2
	distrib/mvme68k/cdroms/installcd/Makefile: revision 1.1
	distrib/alpha/cdroms/installcd/Makefile: revision 1.1
	etc/etc.amd64/Makefile.inc: revision 1.7
	distrib/i386/instkernel/Makefile: revision 1.6
	distrib/x68k/cdroms/Makefile: revision 1.1
	distrib/i386/cdroms/Makefile.cdrom: revision 1.1
	distrib/sandpoint/Makefile: revision 1.4
	distrib/i386/cdroms/Makefile.cdrom: revision 1.2
	distrib/amiga/Makefile: revision 1.3
	distrib/amd64/cdroms/bootcd/Makefile: revision 1.2
	distrib/news68k/Makefile: revision 1.4
	distrib/amd64/floppies/bootfloppy-com/Makefile: revision 1.5
	distrib/news68k/cdroms/Makefile: revision 1.1
	distrib/sparc/cdroms/Makefile: revision 1.1
	distrib/shark/cdroms/Makefile: revision 1.1
	etc/Makefile: revision 1.341
	distrib/amd64/instkernel/Makefile: revision 1.2
	distrib/sparc64/Makefile: revision 1.7
	distrib/dreamcast/cdroms/Makefile: revision 1.1
	distrib/shark/Makefile: revision 1.3
	distrib/ews4800mips/cdroms/Makefile: revision 1.1
	distrib/sun2/cdroms/installcd/Makefile: revision 1.1
	distrib/shark/Makefile: revision 1.4
	distrib/macppc/cdroms/Makefile: revision 1.1
	distrib/mvme68k/cdroms/Makefile: revision 1.1
	distrib/sun2/cdroms/Makefile: revision 1.1
	distrib/hpcarm/Makefile: revision 1.3
	distrib/arc/cdroms/installcd/Makefile: revision 1.1
	distrib/hpcmips/cdroms/installcd/Makefile: revision 1.1
	distrib/mipsco/cdroms/Makefile: revision 1.1
	distrib/Makefile.inc: revision 1.9
	distrib/playstation2/cdroms/installcd/Makefile: revision 1.1
	distrib/ibmnws/cdroms/installcd/Makefile: revision 1.1
	distrib/newsmips/cdroms/Makefile: revision 1.1
	distrib/arc/Makefile: revision 1.3
	distrib/sparc/cdroms/installcd/Makefile: revision 1.1
	distrib/evbmips/cdroms/installcd/Makefile: revision 1.1
	distrib/ews4800mips/cdroms/installcd/Makefile: revision 1.1
	distrib/prep/Makefile: revision 1.3
	distrib/ibmnws/cdroms/Makefile: revision 1.1
	distrib/sandpoint/cdroms/Makefile: revision 1.1
	distrib/atari/Makefile: revision 1.6
	distrib/sgimips/cdroms/Makefile: revision 1.1
	distrib/amd64/Makefile: revision 1.4
	distrib/atari/cdroms/Makefile: revision 1.1
	distrib/x68k/Makefile: revision 1.5
	distrib/x68k/Makefile: revision 1.6
	distrib/sandpoint/cdroms/installcd/Makefile: revision 1.1
	distrib/evbarm/cdroms/Makefile: revision 1.1
	distrib/acorn32/cdroms/Makefile: revision 1.1
	distrib/cats/Makefile: revision 1.3
	distrib/evbmips/cdroms/Makefile: revision 1.1
	distrib/pc532/cdroms/Makefile: revision 1.1
	distrib/Makefile: revision 1.14
	distrib/evbarm/cdroms/installcd/Makefile: revision 1.1
	distrib/ofppc/cdroms/Makefile: revision 1.1
	distrib/amd64/cdroms/Makefile: revision 1.3
	distrib/common/Makefile.bootcd: revision 1.8
	distrib/i386/cdroms/bootcd-laptop/Makefile: file removal
	sys/arch/i386/conf/GENERIC: revision 1.813
	distrib/hp300/Makefile: revision 1.17
	sys/arch/i386/conf/GENERIC: revision 1.814
	distrib/evbppc/Makefile: revision 1.2
	distrib/pmax/cdroms/installcd/Makefile: revision 1.1
	etc/etc.i386/Makefile.inc: revision 1.49
	distrib/sgimips/Makefile: revision 1.2
	distrib/prep/cdroms/installcd/Makefile: revision 1.1
	distrib/acorn26/Makefile: revision 1.4
	distrib/dreamcast/cdroms/installcd/Makefile: revision 1.1
	distrib/alpha/Makefile: revision 1.22
	distrib/dreamcast/Makefile: revision 1.2

Missed part of ticket #494 - distrib/i386/cdroms/Makefile.cdrom and
sys/arch/i386/conf/GENERIC:

Improve the use of makefs to build boot CDs, and make it truely MI:
- allow to specify the "instkernel" directory, and allow to put multiple
  kernels on the image
- allow to specify the directory where the image will be created
- only use bootxx_cd9660 if it exists
- search for second-stage boot as usr/mdec/boot.${MACHINE} in addition to
  usr/mdec/boot
- make 'installboot -e' optional
- use target 'release' or 'iso_image' depending on ${CDRELEASE}
- call some MD targets, which will eventually complete the file list or
  make the image bootable
For the benefit of modern hardware, enable ACPI by default in INSTALL and
GENERIC kernels. If ACPI is an issue on your hardware, 'boot -c' and
'disable acpi' should be a workaround. ACPI-enabled kernels works fine
on pre-acpi hardware.
for amd64:
- add ACPI to INSTALL and GENERIC, remove the *_ACPI config files.
- get rid of the bootfloppy-big.fs boot image, and got to a 3-floppy boot
  image
for i386:
- introduce INSTALL_LARGE which has ACPI and some devices with big firmware
- move some devices from INSTALL to INSTALL_LARGE
- Boot floppies still use INSTALL, and bootfloppy-big.fs is still there
  (for thoses who want to build el-torito floppy emulation boot CD) and use
  INSTALL.
For both, drop the 'iso-image' code in etc/ to make the iso bootable, we'll
use something else to build bootable CDs.
Add an iso_image target (iso-image as a target name doesn't play well with
bsd.subdirs.mk) in distrib/makefile, which builds an iso image for $MACHINE
with binary sets, stored in ${RELEASEDIR}/iso. The image is bootable for:
alpha, amd64, cats, i386, pmax, sgimips, sparc, sparc64, sun3, vax.
mac68k/macppc no there yet because of missing feature in makefs.
call iso_image in distrib/ for iso-image in the top Makefile.
Use the new common/Makefile.bootcd to make i386 and amd64 bootable ISO
images. amd64 gets a single kernel; i386 images gets 3 kernels:
- netbsd, copy from netbsd-INSTALL_LARGE.gz, loaded by default
- nbsd-l, copy from netbsd-INSTALL_LAPTOP.gz
- nbsd-i, copy from netbsd-INSTALL.gz for those who want the traditionnal
  non-ACPI kernel
- drop the bootcd-laptop image
both gets an installcd image, which is the same as bootcd but with the
binary sets in addition to kernels.
Make iso-image do nothing for all but mac68k, which still
relies on mkisofs to create bootable ISO image. macppc should also be there,
but it seems the code to make an iso bootable never got added in etc.macppc/
Fix typo in subdir name.
Revert local changes that went in accidentally with the "add ACPI" commit.
Note ACPI by default in i386/amd64, and the iso-image changes.
Fix SUBDIR in previous
Remove duplicate ACPIVERBOSE and ACPI_SCANPCI; pointed out by Nicolas Joly.
Correct typo: the directory is named cdroms, not cdrom.
Use nblaptop and nbnoacpi for the alternative kernel names; as suggected by
Alan Barrett. While there factor out the kernels in Makefile.cdrom.
@
text
@d230 1
a230 1
options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
d304 1
a304 1
ioapic* at mainbus?
d331 1
a331 1
options 	ACPI_SCANPCI	# find PCI roots using ACPI
d333 1
a333 1
acpi0 		at mainbus0
d339 6
a344 6
acpiacad* 	at acpi?		# ACPI AC Adapter
acpibat* 	at acpi?		# ACPI Battery
acpibut* 	at acpi?		# ACPI Button
acpiec* 	at acpi?		# ACPI Embedded Controller
acpilid* 	at acpi?		# ACPI Lid Switch
acpitz* 	at acpi?		# ACPI Thermal Zone
d347 11
a357 11
attimer*	at acpi?		# AT Timer
com* 		at acpi?		# Serial communications interface
fdc* 		at acpi?		# Floppy disk controller
joy*		at acpi?		# Joystick/Game port
lpt* 		at acpi?		# Parallel port
mpu*		at acpi?		# Roland MPU-401 MIDI UART
npx*		at acpi?		# Math coprocessor
pckbc*  	at acpi?		# PC keyboard controller
pcppi*		at acpi?                # AT-style speaker sound
wss* 		at acpi?		# NeoMagic 256AV in wss mode
ym* 		at acpi?		# Yamaha OPL3-SA[23] audio
d360 2
a361 2
spic* 		at acpi?		# Sony Programmable I/O Controller
wsmouse* 	at spic?
d364 1
a364 1
sony* 		at acpi?		# Sony Miscellaneous Controller
d367 1
a367 1
vald* at acpi?
@


1.799.2.5
log
@Pull up revision 1.816 (requested by bouyer in ticket #501).

Comment out 'fdc* at acpi?' (it's likely that systems not supporting
fdc0 at isa? don't have a fdc at all). Because of the 'fdc0 at isa?', on
systems supporting ACPI the floppy controller would attach as fdc1. as fd(4)
looks for its type in nvram using the floppy controller index, it's looking for
the wrong controller and the default density isn't set (so /dev/fd0a doens't
work).
Problem analyzed by John Nemeth, thanks !
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.4 2007/03/10 19:23:41 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.4 $"
d349 1
a349 1
#fdc* 		at acpi?		# Floppy disk controller
@


1.799.2.6
log
@Pull up following revision(s) (requested by bouyer in ticket #603):
	distrib/sets/lists/base/mi: revision 1.704
	distrib/sets/lists/comp/mi: revision 1.1022
	distrib/sets/lists/man/mi: revision 1.997
	doc/CHANGES: revision 1.839
	sbin/Makefile: patch
	sbin/bioctl/Makefile: revision 1.1
	sbin/bioctl/bioctl.8: revision 1.1
	sbin/bioctl/bioctl.c: revision 1.1
	sbin/bioctl/strtonum.c: revision 1.1
	sbin/bioctl/strtonum.h: revision 1.1
	share/man/man4/Makefile: revision 1.426
	share/man/man4/bio.4: revision 1.1
	sys/arch/amd64/conf/GENERIC: revision 1.139
	sys/arch/i386/conf/GENERIC: revision 1.825
	sys/arch/i386/conf/XEN2_DOM0: revision 1.25
	sys/conf/files: revision 1.839
	sys/conf/majors: patch
	sys/dev/Makefile: revision 1.25
	sys/dev/bio.c: patch
	sys/dev/biovar.h: patch
	sys/dev/ic/mfi.c: revision 1.4-1.5
	sys/dev/ic/mfivar.h: revision 1.4
	sys/sys/envsys.h: revision 1.11
	usr.sbin/envstat/envstat.c: revision 1.24
Add bio(4) and associated bioctl(8) from OpenBSD, a driver control block
device controllers, and more specifically raid controllers.
Add a new sensor type, ENVSYS_DRIVE, to report drive status. From OpenBSD.
Add bio and sysmon support to mfi(4). This allow userland to query
status for drives and logical volumes attached to a mfi(4) controller. While
there fix some debug printfs in mfi so they compile.
Add bio(4) to amd64 and i386 GENERIC.

note bio(4), envsys(4) DRIVE, and mfi(4) support for both.

tred->sensor is a u_int.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a1341 1
pseudo-device	bio			# RAID control device driver
@


1.799.2.7
log
@Pull up patch (requested by xtraeme in ticket #633):
	sys/arch/amd64/conf/GENERIC:			patch
	sys/arch/i386/conf/ALL:				patch
	sys/arch/i386/conf/GENERIC:			patch
	sys/conf/files:					patch
	sys/dev/acpi/files.acpi:			patch
	sys/dev/acpi/ug_acpi.c:				patch
	sys/dev/ic/ug.c:				patch
	sys/dev/ic/ugreg.h:				patch
	sys/dev/ic/ugvar.h:				patch
	sys/dev/isa/files.isa:				patch
	sys/dev/isa/ug_isa.c:				patch
	share/man/man4/ug.4:				patch
	doc/CHANGES:					patch
	sys/dev/isa/ug.c:				delete
	sys/dev/isa/ugvar.h:				delete

Add an acpi attachement for the ug hardware monitor driver.
@
text
@a355 1
#ug*		at acpi?		# Abit uGuru Hardware Monitor
@


1.799.2.7.2.1
log
@Sync w/ NetBSD-4-RC_1
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.12 2007/08/29 18:34:16 liamjfoy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.12 $"
d203 1
a203 1
#options 	ISO,TPIP	# OSI
a743 1
gcscide* 	at pci? dev ? function ? 	# AMD CS5535 Companion IDE controllers
a747 2
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
ahcisata* 	at jmide?
a863 1
rtw*	at pci? dev ? function ?	# Realtek 8180L (802.11)
a1300 1
glxsb*	at pci? dev ? function ?	# AMD Geode LX Security Block
a1380 1
pseudo-device	agr			# IEEE 802.3ad link aggregation
@


1.799.2.7.2.2
log
@Catch up on netbsd-4 as of a few days ago.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.7.2.1 2007/09/03 07:03:31 wrstuden Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.7.2.1 $"
a1102 3
uslsa*	at uhub? port ?		# Silicon Labs USB-RS232 serial adapter
ucom*	at uslsa? portno ?

@


1.799.2.7.2.3
log
@Catch up to netbsd-4.0 release.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.7.2.2 2007/09/30 03:39:01 wrstuden Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.7.2.2 $"
d348 1
a348 1
#com* 		at acpi?		# Serial communications interface
d351 1
a351 1
#lpt* 		at acpi?		# Parallel port
@


1.799.2.7.2.4
log
@Sync with netbsd-4.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.7.2.3 2008/01/06 05:00:56 wrstuden Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.7.2.3 $"
a712 1
arcmsr*	at pci? dev ? function ? 	# Areca SATA RAID controllers
a854 1
lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
@


1.799.2.8
log
@Pull up following revision(s) (requested by martin in ticket #699):
	sys/arch/hpcmips/conf/GENERIC: revision 1.196
	sys/arch/hp700/conf/GENERIC: revision 1.74
	sys/arch/i386/conf/GENERIC: revision 1.831
	sys/arch/next68k/conf/GENERIC: revision 1.108
	sys/arch/alpha/conf/GENERIC: revision 1.313
	sys/arch/arc/conf/GENERIC: revision 1.146
	sys/arch/cats/conf/GENERIC: revision 1.115
	sys/arch/ews4800mips/conf/GENERIC: revision 1.18
	sys/arch/landisk/conf/GENERIC: revision 1.8 via patch
	sys/arch/sparc64/conf/GENERIC: revision 1.85
	sys/arch/pmax/conf/GENERIC: revision 1.152
	sys/arch/iyonix/conf/GENERIC: revision 1.38 via patch
	sys/arch/amiga/conf/GENERIC: revision 1.245
	sys/arch/vax/conf/GENERIC: revision 1.157
	sys/arch/prep/conf/GENERIC: revision 1.135
	sys/arch/pc532/conf/GENERIC: revision 1.70
	sys/arch/sbmips/conf/GENERIC: revision 1.61
	sys/arch/mipsco/conf/GENERIC: revision 1.65
	sys/arch/cobalt/conf/GENERIC: revision 1.108
	sys/arch/ofppc/conf/GENERIC: revision 1.98
	sys/arch/amd64/conf/GENERIC: revision 1.148
	sys/arch/acorn26/conf/GENERIC: revision 1.50
	sys/arch/dreamcast/conf/GENERIC: revision 1.78
	sys/arch/mac68k/conf/GENERIC: revision 1.181
	sys/arch/hp300/conf/GENERIC: revision 1.139
	sys/arch/mmeye/conf/GENERIC: revision 1.88
	sys/arch/news68k/conf/GENERIC: revision 1.88
	sys/arch/mvme68k/conf/GENERIC: revision 1.71
	sys/arch/acorn32/conf/GENERIC: revision 1.79
	sys/arch/sparc/conf/GENERIC: revision 1.199
	sys/arch/luna68k/conf/GENERIC: revision 1.78
	sys/arch/bebox/conf/GENERIC: revision 1.105
	sys/arch/macppc/conf/GENERIC: revision 1.256 via patch
	sys/arch/x68k/conf/GENERIC: revision 1.134
	sys/arch/sun3/conf/GENERIC: revision 1.138
	sys/arch/newsmips/conf/GENERIC: revision 1.98
Add pseudo-device agr to all GENERIC kernels where it might make sense
(commented out in some).
@
text
@a1380 1
pseudo-device	agr			# IEEE 802.3ad link aggregation
@


1.799.2.9
log
@Pull up following revision(s) (requested by riz in ticket #734):
	sys/arch/i386/pci/glxsb.c: revision 1.1
	sys/arch/i386/conf/GENERIC: revision 1.833
	share/man/man4/man4.i386/glxsb.4: revision 1.1
	sys/arch/i386/conf/ALL: revision 1.104
	share/man/man4/man4.i386/Makefile: revision 1.66
	sys/arch/i386/conf/files.i386: revision 1.309
	distrib/sets/lists/man/mi: revision 1.1007
Import driver for the AMD Geode LX AES Security Block, from OpenBSD. The
glxsb(4) driver provides random numbers and AES acceleration.
Add man page for AMD Geode LX AES Security Block driver.
Enable glxsb(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.8 2007/06/05 20:49:58 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.8 $"
a1300 1
glxsb*	at pci? dev ? function ?	# AMD Geode LX Security Block
@


1.799.2.10
log
@Pull up following revision(s) (requested by dyoung in ticket #738):
	sys/arch/i386/conf/GENERIC: revision 1.800
Add rtw at pci to the GENERIC kernel.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.9 2007/06/19 09:26:30 liamjfoy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.9 $"
a863 1
rtw*	at pci? dev ? function ?	# Realtek 8180L (802.11)
@


1.799.2.11
log
@Pull up following revision(s) (requested by adrianp in ticket #820):
	sys/arch/hp300/conf/GENERIC: revision 1.141
	sys/arch/alpha/conf/GENERIC: revision 1.315
	sys/arch/amd64/conf/GENERIC: revision 1.154
	sys/arch/cats/conf/GENERIC: revision 1.116
	sys/arch/arc/conf/GENERIC: revision 1.148
	sys/arch/acorn32/conf/GENERIC: revision 1.80
	sys/arch/sparc/conf/GENERIC: revision 1.200
	sys/arch/sparc64/conf/GENERIC: revision 1.88
	sys/arch/atari/conf/GENERIC.in: revision 1.68
	sys/arch/amiga/conf/GENERIC: revision 1.248
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66
	sys/arch/i386/conf/GENERIC: revision 1.840
	sys/arch/amiga/conf/GENERIC.in: revision 1.61
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68
	sys/arch/mac68k/conf/GENERIC: revision 1.182
Remove iso(4) from GENERIC kernels, as discussed on tech-net@@
Ok'ed by core@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.10 2007/06/21 13:54:11 liamjfoy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.10 $"
d203 1
a203 1
#options 	ISO,TPIP	# OSI
@


1.799.2.12
log
@Pull up following (requested by xtraeme ticket #846):

Import i386/gcscide(4). A driver for the IDE Controller of the
AMD CS5535 Companion device found in the decTOP.

gcscide0 at pci0 dev 15 function 2
gcscide0: National Semiconductor/AMD CS5535 IDE Controller (rev. 0x00)

Supports Ultra DMA mode 4, Pio Mode 4 and MDMA mode 2.

"Go for it" jmcneill@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.11 2007/08/25 09:00:07 liamjfoy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.11 $"
a743 1
gcscide* 	at pci? dev ? function ? 	# AMD CS5535 Companion IDE controllers
@


1.799.2.13
log
@Pull up following revision(s) (requested by bouyer in ticket #678):
	distrib/sets/lists/man/mi: revision 1.1001
	doc/CHANGES: revision 1.853 via patch
	share/man/man4/Makefile: revision 1.428
	share/man/man4/jmide.4: revision 1.1
	sys/arch/amd64/conf/GENERIC: revision 1.143
	sys/arch/amd64/conf/INSTALL: revision 1.69
	sys/arch/i386/conf/GENERIC: revision 1.827
	sys/arch/i386/conf/INSTALL_LARGE: revision 1.2 via patch
	sys/arch/i386/conf/XEN2_DOM0: revision 1.26
	sys/conf/files: revision 1.844 via patch
	sys/dev/ic/ahcisata_core.c: revision 1.1 via patch
	sys/dev/ic/ahcisata_core.c: revision 1.3
	sys/dev/ic/ahcisatareg.h: revision 1.1
	sys/dev/ic/ahcisatavar.h: revision 1.1
	sys/dev/pci/ahcisata.c: delete
	sys/dev/pci/ahcisatareg.h: delete
	sys/dev/pci/ahcisata_pci.c: revision 1.1
	sys/dev/pci/files.pci: revision 1.287-1.288
	sys/dev/pci/jmide.c: revision 1.1-1.2
	sys/dev/pci/jmide_reg.h: revision 1.1
	sys/dev/pci/pcidevs: revision 1.878
Add JMicron Technology vendor ID, and their current PCIe SATA/PATA
controllers.

Split the ahcisata driver in pci front-end and bus-independant back-end.
add jmide(4), a driver for the JMicron Technology JMB36x PCIe to SATA II/PATA
controllers. These controllers can be found on add-on PCIe cards, or
on some motherboards to provide the PATA connectivity (e.g. some intel
ICH8-based motherboards).
Thanks to JMicron Technology for providing me documentation and
different sample boards for this work.

Move mapping of AHCI register so that jmide knows if it fails, and avoids
calling ahci_intr() (which would cause a panic).
Try to use the pciide function for SATA drives if attaching ahci fails (this
doesn't seems to work though, it may be BIOS dependant).
Thanks to Gary Duzan for testing multiple pacthes.

We're not ready to handle ATAPI yet so just claim there's no drive to the
upper layer. This should work around a NULL pointer dereference when
an ATAPI device is detected on a AHCI device.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.12 2007/08/29 18:34:16 liamjfoy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.12 $"
a748 2
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
ahcisata* 	at jmide?
@


1.799.2.14
log
@Pull up following revision(s) (requested by mlelstv in ticket #895):
	sys/dev/usb/uslsa.c: revision 1.1
	sys/dev/usb/uslsa.c: revision 1.2
	sys/dev/usb/uslsa.c: revision 1.3
	sys/dev/usb/usbdevs: revision 1.466 (via patch)
	share/man/man4/uslsa.4: revision 1.1
	share/man/man4/Makefile: revision 1.429
	sys/arch/i386/conf/GENERIC: revision 1.828
	distrib/sets/lists/man/mi: revision 1.1002
	sys/dev/usb/files.usb: revision 1.77
	sys/arch/i386/conf/ALL: revision 1.99

From PR kern/33496 - add uslsa(4), a CP210x USB-RS232 ucom driver.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.13 2007/08/31 20:09:27 pavel Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.13 $"
a1102 3
uslsa*	at uhub? port ?		# Silicon Labs USB-RS232 serial adapter
ucom*	at uslsa? portno ?

@


1.799.2.15
log
@Pull up following revision(s) (requested by jnemeth in ticket #998):
	sys/arch/amd64/conf/GENERIC: revision 1.176 (patch)
	sys/arch/i386/conf/GENERIC: revision 1.863
comment out com*/lpt* at acpi? as they cause these ports to move from
their traditional location and imminent changes in -current will cause
them to move back
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d348 1
a348 1
#com* 		at acpi?		# Serial communications interface
d351 1
a351 1
#lpt* 		at acpi?		# Parallel port
@


1.799.2.16
log
@Pull up following revision(s) (requested by christos in ticket #1037):
	sys/dev/pci/arcmsr.c: patch
	sys/dev/pci/arcmsrvar.h: patch
	sys/dev/pci/pcidevs: patch
	sys/dev/pci/files.pci: patch
	sys/arch/i386/conf/GENERIC: patch
	sys/arch/i386/conf/XEN2_DOM0: patch
	sys/arch/i386/conf/INSTALL_LARGE: patch
	sys/arch/amd64/conf/GENERIC: patch
	sys/arch/amd64/conf/INSTALL: patch
	share/man/man4/Makefile: patch
	share/man/man4/arcmsr.4: patch
	distrib/sets/lists/man/mi: patch

Add the Areca Technology Corporation SATA RAID controller driver, ported
from OpenBSD.
@
text
@a712 1
arcmsr*	at pci? dev ? function ? 	# Areca SATA RAID controllers
@


1.799.2.17
log
@Pull up following revision(s) (requested by sborrill in ticket #1128):
	sys/dev/pci/if_lii.c: revisions 1.1, 1.3 via patch
	sys/arch/i386/conf/ALL: revision 1.161 via patch
	share/man/man4/lii.4: revision 1.1 via patch
	sys/dev/pci/files.pci: revision 1.303 via patch
	sys/dev/DEVNAMES: revision 1.238 via patch
	sys/arch/i386/conf/GENERIC: revision 1.885 via patch
	distrib/sets/lists/man/mi: revisions 1.1062, 1.1063 via patch
	sys/arch/i386/conf/XEN2_DOM0: revision 1.43 via patch
	share/man/man4/Makefile: revision 1.460 via patch
	sys/arch/i386/conf/INSTALL: revision 1.323 via patch
	sys/dev/pci/if_liireg.h: revision 1.1 via patch
Add a driver for the Atheros/Attansic L2 Fast-Ethernet chip found on a
series of hardware that includes Asus's famous EeePC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.16 2008/01/11 17:03:17 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.16 $"
a855 1
lii*	at pci? dev ? function ?	# Atheros L2 Fast-Ethernet
@


1.799.2.18
log
@Pullup the following revisions (requested by msaitoh in ticket #1284):
	distrib/sets/lists/base/mi		1.706-707,1.797
	distrib/sets/lists/man/mi		1.1006
	etc/mtree/NetBSD.dist			1.340
	share/man/man4/Makefile			1.432
	sys/arch/amd64/conf/GENERIC		1.149 via patch
	sys/arch/i386/conf/ALL			1.103
	sys/arch/i386/conf/GENERIC		1.832
	sys/arch/i386/conf/GENERIC_LAPTOP	1.237
	sys/arch/macppc/conf/GENERIC		1.257
	sys/arch/sparc64/conf/GENERIC		1.86
	sys/dev/usb/usbdevs			1.468,1.479-480 via patch
	sys/dev/usb/usbdevs.h			regen
	sys/dev/usb/usbdevs_data.h		regen
	sys/dev/microcode/Makefile		1.7
	sys/dev/usb/files.usb			patch
	share/man/man4/zyd.4			1.1 via patch
	sys/dev/microcode/zyd/Makefile		1.1-1.2
	sys/dev/microcode/zyd/build.c		1.1
	sys/dev/microcode/zyd/microcode.h	1.1
	sys/dev/microcode/zyd/zd1211-license	1.1
	sys/dev/microcode/zyd/zyd-zd1211	1.1
	sys/dev/microcode/zyd/zyd-zd1211b	1.1
	sys/dev/usb/if_zyd.c			patch
	sys/dev/usb/if_zydreg.h			1.1-1.2

Add ZyDAS ZD1211/ZD1211B USB IEEE 802.11b/g wireless network device support
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.799.2.17 2008/04/19 15:57:56 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.799.2.17 $"
a1084 1
zyd*	at uhub? port ?		# Zydas ZD1211
@


1.798
log
@s/COPTS/CPUFLAGS/
s/-O2 //
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.797 2006/11/17 22:18:22 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.797 $"
d738 1
@


1.797
log
@COPTS should have -O2 otherwise we'll get no generic optimization.

XXX: I prefer CPUFLAGS, but there isn't any conclusion yet.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.796 2006/11/11 19:00:16 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.796 $"
d35 1
a35 1
makeoptions	COPTS="-O2 -march=i486 -mtune=pentiumpro" # Assume at least 486,
@


1.796
log
@Enable TMPFS by default.  OK'ed by core@@.

I'm leaving those platforms with few users and those whose machines are
not very powerful untouched per uwe@@'s suggestion.  The port masters or
the real users of those ports are better suited to make the decision of
enabling it.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.795 2006/11/11 18:47:10 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.795 $"
d35 1
a35 1
makeoptions	COPTS="-march=i486 -mtune=pentiumpro"	# Assume at least 486,
@


1.795
log
@Remove tmpfs's experimental status.  OK'ed by core@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.794 2006/11/01 19:33:41 tls Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.794 $"
d178 1
a178 1
#file-system	TMPFS		# Efficient memory file-system
@


1.794
log
@Change GENERIC, GENERIC.MP, GENERIC.MPACPI, GENERIC_LAPTOP, INSTALL,
INSTALL.MP, INSTALL_LAPTOP, and DISKLESS kernels so that they are
smaller and faster by removing support for actual i386 CPUs (which
lack write protection in supervisor mode, which requires a costly
workaround) and math coprocessor emulation.  Coprocessor emulation
is retained in the LAPTOP kernels, but not in the others.  Where
it is known that a configuration cannot be run with particular CPUs
(i486 in *MP kernels) remove that support as well.  Compile all
kernels with appropriate architecture and tuning flags (reduces
size, makes things faster).  Those requiring support for machines
with i386 CPU or lacking coprocessor can use the *SMALL or *TINY
kernels.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.793 2006/10/31 22:21:16 joerg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.793 $"
d178 1
a178 1
#file-system	TMPFS		# experimental - Efficient memory file-system
@


1.793
log
@Add rum(4) for newer USB Ralink devices. Obtained from OpenBSD.
Special thanks to Sepherosa Ziehau for helping debugging USB issues.
Hook up rum(4) for i386 config files.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.792 2006/10/27 17:37:44 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.792 $"
d30 1
a30 1
options 	I386_CPU
d35 3
d39 1
a39 1
options 	MATH_EMULATE	# floating point emulation
@


1.792
log
@fix a bit of trailing whitespace, and do the space tab dance for a
couple of options so that they work well when commented out
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.791 2006/10/26 11:48:38 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.791 $"
d1071 1
@


1.791
log
@Compile in Veriexec by default on some popular archs (amd64, i386, sparc64)
so it's more accessible and less of a hassle to put to use. Also enable
fileassoc(9) by default as a result, which for itself may open the door for
a lot of cool stuff. (stay tuned. :)

I recommend port masters of other archs to consider doing the same.
Personally I don't know which ports are considered more of a legacy than
in-production, so I'm leaving it for someone else for now...

No objections on tech-kern.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.790 2006/10/25 13:56:15 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.790 $"
d272 1
a272 1
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver 
d1124 1
a1124 1
options	UGEN_BULK_RA_WB
d1394 2
a1395 2
options		FILEASSOC		# fileassoc(9) - required for Veriexec 
#options	FILEASSOC_NHOOKS=4	# Default number of storage slots
@


1.790
log
@Remove the usage of Multiboot's "a.out kludge" to tell the boot loader to
reserve some more space for the BSS section than the binary says.  This
trick was used to leave room after the kernel's image to copy the symbol
table following the format required by ksyms_init.  (It was also used to
workaround a bug in the physical address fields of the binary, but this has
been long fixed.)  Yes, the MULTIBOOT_SYMTAB_SPACE option goes away; yay!

Instead, copy the required data after the kernel in a way that avoids having
to reserve space and use the new ksyms_init_explicit function to avoid the
need to construct a minimal ELF image.

Fixes ksyms when using an "unpatched" GRUB (one that does not contain the
fix to honour the "a.out kludge" for ELF images, even when present) -- i.e.
ddb and lkms.  As a side effect, the new code is much clearer to read and
digest.

Closes PR port-i386/32865.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.789 2006/10/22 16:26:27 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.789 $"
d1394 1
a1394 1
#options	FILEASSOC		# fileassoc(9) - required for Veriexec 
d1398 1
a1398 1
#pseudo-device	veriexec
d1404 6
a1409 6
#options VERIFIED_EXEC_FP_RMD160
#options VERIFIED_EXEC_FP_SHA256
#options VERIFIED_EXEC_FP_SHA384
#options VERIFIED_EXEC_FP_SHA512
#options VERIFIED_EXEC_FP_SHA1
#options VERIFIED_EXEC_FP_MD5
@


1.789
log
@Don't add ikphy twice; pointed out by Patrick Welche
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.788 2006/10/21 14:10:33 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.788 $"
a56 1
#options 	MULTIBOOT_SYMTAB_SPACE=1048576
@


1.788
log
@Add support for the Intel 80003 Gigabit Ethernet controller (found e.g. in
newer server chipsets) to wm(4), from the FreeBSD em(4) driver.
While there, add a few other Intel Ethernet controller that should work as
is.
Properly update the RX error and TX collision counters.
Add ikphy(4), a driver for the Intel i82563 Kumeran 10/100/1000 Ethernet PHYs
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.787 $"
a972 1
ikphy*	at mii? phy ?			# Intel 82563 PHYs
@


1.787
log
@Add ipmi(4) driver, from OpenBSD. This requires SMBios support, so add
SMBios detection and mapping to bios32.c, also from OpenBSD (for now this
is only compiled in if ipmi(4) is configured). The sensors and watchdog are
accessible though envsys(4).
Works on i386; some work is needed on amd64 to access the BIOS. It would
eventually work on Xen if the SMBios is accessible (to be tested).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.786 2006/10/01 09:53:08 itohy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.786 $"
d970 1
d973 1
@


1.786
log
@Use ATA timing, instead of busmaster wait, for adding waits.
Use default wait value 0x01.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.785 2006/09/27 23:58:50 hubertf Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.785 $"
d319 3
@


1.785
log
@Add (commented out) option WSKBD_USONLY
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.784 2006/09/26 14:30:26 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.784 $"
d759 1
a759 1
#njata*  at cardbus? function ? flags 0		# Workbit NinjaATA-32
@


1.784
log
@Oops! forgot "options" in previous commit. Pointed out by freza@@, thanks!
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.783 2006/09/26 14:08:19 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.783 $"
d268 1
@


1.783
log
@Make PaX mprotect(2) restrictions more accessible.

On amd64, sparc64, i386, and alpha, they will be compiled in and disabled
by default. That means that to use them you either enable the "global"
knob with sysctl, or use paxctl(1) to enable it on a per-program basis.

On sparc and macppc just include a commentd out line in the GENERIC kernel.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.782 2006/09/19 13:58:55 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.782 $"
d1407 1
a1407 1
PAX_MPROTECT=0				# PaX mprotect(2) restrictions
@


1.782
log
@Fix definition of some options to be 'options<space><tab>' for consistency.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.781 2006/09/10 15:45:56 plunky Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.781 $"
d1406 2
@


1.781
log
@update to bluetooth device attachment:

remove pseudo-device btdev(4) and inherent limitations

add bthub(4) which autoconfigures at bluetooth controllers as they
are enabled. bluetooth devices now attach here.

btdevctl(8) and its cache is updated to handle new semantics

etc/rc.d/btdevctl is updated to configure devices from a list
in /etc/bluetooth/btdevctl.conf
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.780 2006/09/10 02:28:33 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.780 $"
d50 1
a50 1
options         POWERNOW_K8
@


1.781.2.1
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.781 2006/09/10 15:45:56 plunky Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.781 $"
d50 1
a50 1
options 	POWERNOW_K8
a267 1
#options 	WSKBD_USONLY			# strip off non-US keymaps
a317 3
#IPMI support
#ipmi0		at mainbus?

d758 1
a758 1
#njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
a965 1
ikphy*	at mii? phy ?			# Intel 82563 PHYs
a967 1
ikphy*	at mii? phy ?			# Intel 82563 PHYs
a1405 2

options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
@


1.781.2.2
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.781.2.1 2006/10/22 06:04:43 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.781.2.1 $"
d30 1
a30 1
#options 	I386_CPU
a34 3
makeoptions	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
							# tune for more modern

d36 1
a36 1
#options 	MATH_EMULATE	# floating point emulation
d57 1
d176 1
a176 1
file-system	TMPFS		# Efficient memory file-system
d273 1
a273 1
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver
a735 1
ahcisata* 	at pci? dev ? function ?	# AHCI SATA controllers
a857 1
rtw*	at pci? dev ? function ?	# Realtek 8180L (802.11)
d973 1
a1072 1
rum*	at uhub? port ?		# Ralink Technology RT2501/RT2601 802.11a/b/g
d1126 1
a1126 1
options UGEN_BULK_RA_WB
d1396 2
a1397 2
options 	FILEASSOC		# fileassoc(9) - required for Veriexec
#options 	FILEASSOC_NHOOKS=4	# Default number of storage slots
d1400 1
a1400 1
pseudo-device	veriexec
d1406 6
a1411 6
options VERIFIED_EXEC_FP_RMD160
options VERIFIED_EXEC_FP_SHA256
options VERIFIED_EXEC_FP_SHA384
options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5
@


1.781.2.3
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.781.2.2 2006/12/10 07:16:02 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.781.2.2 $"
a643 1
mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
a835 1
bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
d1401 1
@


1.780
log
@Add msk and mskc.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.779 2006/09/07 14:23:44 itohy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.779 $"
d1256 3
a1258 2
# Bluetooth Devices
pseudo-device btdev	4
d1261 1
a1261 1
bthidev* at btdev?
d1272 1
a1272 1
btsco* at btdev?
@


1.779
log
@Add njata* at cardbus?
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.778 2006/08/26 20:26:45 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.778 $"
d843 2
@


1.779.2.1
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.796 2006/11/11 19:00:16 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.796 $"
d30 1
a30 1
#options 	I386_CPU
a34 3
makeoptions	COPTS="-march=i486 -mtune=pentiumpro"	# Assume at least 486,
							# tune for more modern

d36 1
a36 1
#options 	MATH_EMULATE	# floating point emulation
d50 1
a50 1
options 	POWERNOW_K8
d57 1
d176 1
a176 1
file-system	TMPFS		# Efficient memory file-system
a267 1
#options 	WSKBD_USONLY			# strip off non-US keymaps
d272 1
a272 1
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver
a317 3
#IPMI support
#ipmi0		at mainbus?

d758 1
a758 1
#njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
a842 2
mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
a963 1
ikphy*	at mii? phy ?			# Intel 82563 PHYs
a1064 1
rum*	at uhub? port ?		# Ralink Technology RT2501/RT2601 802.11a/b/g
d1118 1
a1118 1
options UGEN_BULK_RA_WB
d1254 2
a1255 3
# Bluetooth Device Hub
bthub* at bt3c?
bthub* at ubt?
d1258 1
a1258 1
bthidev* at bthub?
d1269 1
a1269 1
btsco* at bthub?
d1387 2
a1388 2
options 	FILEASSOC		# fileassoc(9) - required for Veriexec
#options 	FILEASSOC_NHOOKS=4	# Default number of storage slots
d1391 1
a1391 1
pseudo-device	veriexec
d1397 6
a1402 8
options VERIFIED_EXEC_FP_RMD160
options VERIFIED_EXEC_FP_SHA256
options VERIFIED_EXEC_FP_SHA384
options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5

options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
@


1.779.2.2
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.806 2007/01/24 19:46:26 tls Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.806 $"
d143 1
a143 1
#options 	COMPAT_386BSD_MBRPART # recognize old partition ID
d612 3
a614 2
# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
#viaenv*	at pci? dev ? function ?
@


1.779.2.3
log
@Add pseudo-device lockstat.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.779.2.2 2007/02/01 08:48:00 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.779.2.2 $"
a1385 1
pseudo-device	lockstat		# lock profiling
@


1.779.2.4
log
@Fix merge errors.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.779.2.3 2007/02/06 15:04:17 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.779.2.3 $"
d35 1
a35 1
makeoptions	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
a642 1
mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
a736 1
ahcisata* 	at pci? dev ? function ?	# AHCI SATA controllers
a833 1
bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
a858 1
rtw*	at pci? dev ? function ?	# Realtek 8180L (802.11)
a1376 2
# srt is EXPERIMENTAL
#pseudo-device	srt			# source-address-based routing
@


1.778
log
@PR/34283: Gene ENonymous: Add IPFILTER_LOOKUP to the default kernel options
Also remove CCITT,NS,NIP
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.777 2006/08/20 07:06:57 plunky Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.777 $"
d757 3
@


1.777
log
@Make btdev default count explicit
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.776 2006/08/14 09:34:43 itohy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.776 $"
a200 2
options 	NS		# XNS
#options 	NSIP		# XNS tunneling over IP
a202 1
options 	CCITT,LLC,HDLC	# X.25
d209 1
@


1.776
log
@ACPI frontend for Yamaha OPL3-SA[23].
Derived from PR kern/33991 by jasper at pointless dot net.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.775 2006/08/14 06:22:34 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.775 $"
d1254 1
a1254 1
pseudo-device btdev
@


1.775
log
@s/adpater/adapter/

Prompted by PR/34195
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.774 2006/08/13 02:27:32 simonb Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.774 $"
d353 1
d373 1
a373 1
#ym*		at pnpbios? index ?	# OPL3-SA3
d1165 1
a1165 1
ym*	at isapnp?			# Yamaha OPL3-SA3 audio
@


1.774
log
@Add wpi@@pci.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.773 2006/08/12 15:29:53 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.773 $"
d1019 1
a1019 1
# USB serial adpater
@


1.773
log
@Disable SYSTRACE by default on all kernels (discussed with core)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.772 2006/08/07 21:33:49 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.772 $"
d864 1
@


1.772
log
@Enable POWERNOW_K8, now that it's working.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.771 2006/08/03 00:19:21 hubertf Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.771 $"
d87 1
a87 1
options 	SYSTRACE	# system call vetting via systrace(1)
@


1.772.2.1
log
@Pull up following revision(s) (requested by elad in ticket #17):
	sys/arch/sparc/conf/KRUPS: revision 1.38
	sys/arch/i386/conf/XEN2_DOMU: revision 1.2
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.197
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.53
	sys/arch/evbsh5/conf/SIMULATOR: revision 1.12
	sys/arch/sparc/conf/MRCOFFEE: revision 1.17
	sys/arch/next68k/conf/GENERIC: revision 1.104
	sys/arch/i386/conf/VIRTUALPC: revision 1.44
	sys/arch/ews4800mips/conf/GENERIC: revision 1.11
	sys/arch/evbsh5/conf/CAYMAN: revision 1.23
	sys/arch/arc/conf/GENERIC: revision 1.141
	sys/arch/amd64/conf/GENERIC: revision 1.103
	sys/arch/sun3/conf/GENERIC3X: revision 1.90
	sys/arch/evbarm/conf/HDL_G: revision 1.3
	sys/arch/sun2/conf/GENERIC: revision 1.57
	sys/arch/news68k/conf/GENERIC_TINY: revision 1.51
	sys/arch/evbppc/conf/EXPLORA451: revision 1.27
	sys/arch/amiga/conf/GENERIC.in: revision 1.54
	sys/arch/mac68k/conf/GENERIC: revision 1.174
	sys/arch/acorn26/conf/GENERIC: revision 1.45
	sys/arch/shark/conf/GENERIC: revision 1.64
	sys/arch/cesfic/conf/GENERIC: revision 1.44
	sys/arch/mvme68k/conf/GENERIC: revision 1.68
	sys/arch/i386/conf/XEN2_DOM0: revision 1.4
	sys/arch/atari/conf/GENERIC.in: revision 1.63
	sys/arch/amiga/conf/GENERIC: revision 1.240
	sys/arch/i386/conf/LAMB: revision 1.65
	sys/arch/i386/conf/GENERIC: revision 1.773
	sys/arch/acorn32/conf/EB7500ATX: revision 1.26
	sys/arch/x68k/conf/GENERIC: revision 1.128
	sys/arch/vax/conf/GENERIC: revision 1.153
	sys/arch/atari/conf/ATARITT: revision 1.81
	sys/arch/mipsco/conf/GENERIC: revision 1.60
	sys/arch/cobalt/conf/GENERIC: revision 1.101
	sys/arch/evbarm/conf/ARMADILLO9: revision 1.13
	sys/arch/ofppc/conf/GENERIC: revision 1.93
	sys/arch/atari/conf/MILAN-PCIIDE: revision 1.51
	sys/arch/arc/conf/RPC44: revision 1.26
	sys/arch/sparc64/conf/GENERIC: revision 1.59
	sys/arch/i386/conf/XEN3_DOMU: revision 1.2
	sys/arch/hp700/conf/GENERIC: revision 1.68
	sys/arch/atari/conf/MILAN-ISAIDE: revision 1.47
	sys/arch/macppc/conf/GENERIC: revision 1.231
	sys/arch/dreamcast/conf/GENERIC: revision 1.72
	sys/arch/news68k/conf/GENERIC: revision 1.80
	sys/arch/hp300/conf/GENERIC: revision 1.133
	sys/arch/mmeye/conf/GENERIC: revision 1.82
	sys/arch/macppc/conf/MAMBO: revision 1.2
	sys/arch/cats/conf/GENERIC: revision 1.107
	sys/arch/atari/conf/FALCON: revision 1.79
	sys/arch/acorn32/conf/GENERIC: revision 1.71
	sys/arch/sparc/conf/GENERIC: revision 1.190
	sys/arch/news68k/conf/LIBERO: revision 1.40
	sys/arch/amiga/conf/DRACO: revision 1.114
	sys/arch/cobalt/conf/INSTALL: revision 1.23
	sys/arch/luna68k/conf/GENERIC: revision 1.73
	sys/arch/bebox/conf/GENERIC: revision 1.100
	sys/arch/pmax/conf/GENERIC: revision 1.147
	sys/arch/amiga/conf/WSCONS: revision 1.52
	sys/arch/macppc/conf/POWERMAC_G5: revision 1.2
	sys/arch/alpha/conf/ALPHA: revision 1.218
	sys/arch/sun3/conf/GENERIC: revision 1.133
	sys/arch/prep/conf/GENERIC: revision 1.124
	sys/arch/alpha/conf/GENERIC: revision 1.291
	sys/arch/atari/conf/HADES: revision 1.71
	sys/arch/newsmips/conf/GENERIC: revision 1.93
	sys/arch/netwinder/conf/GENERIC: revision 1.82
	sys/arch/hpcmips/conf/GENERIC: revision 1.190
	sys/arch/amiga/conf/AMIGA: revision 1.98
	sys/arch/sbmips/conf/GENERIC: revision 1.54
	sys/arch/pc532/conf/GENERIC: revision 1.64
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.53
Disable SYSTRACE by default on all kernels (discussed with core)
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d87 1
a87 1
#options 	SYSTRACE	# system call vetting via systrace(1)
@


1.772.2.2
log
@Pull up following revision(s) (requested by plunky in ticket #161):
	sys/dev/bluetooth/btdev.h: revision 1.4
	distrib/sets/lists/comp/mi: revision 1.922
	usr.sbin/postinstall/postinstall: revision 1.25
	sys/netbt/hci_unit.c: revision 1.3
	sys/netbt/hci_ioctl.c: revision 1.4
	usr.sbin/sdpd/profile.c: revision 1.2
	usr.sbin/btdevctl/btdevctl.c: revision 1.2
	share/man/man4/Makefile: revision 1.405
	distrib/sets/lists/man/mi: revision 1.930
	distrib/sets/lists/etc/mi: revision 1.176
	usr.sbin/sdpd/profile.c: revision 1.3
	usr.sbin/btdevctl/btdevctl.c: revision 1.3
	etc/MAKEDEV.tmpl: revision 1.62
	distrib/sets/lists/base/mi: revision 1.650
	usr.sbin/btdevctl/btdevctl.h: revision 1.2
	usr.bin/sdpquery/sdpquery.1: revision 1.4
	sys/netbt/rfcomm_session.c: revision 1.2
	usr.sbin/btdevctl/btdevctl.8: revision 1.3
	usr.bin/sdpquery/search.c: revision 1.2
	usr.sbin/sdpd/Makefile: revision 1.2
	sys/dev/bluetooth/Makefile: revision 1.3
	usr.sbin/btdevctl/cfg.c: file removal
	sys/netbt/files.netbt: revision 1.4
	usr.sbin/btdevctl/sdp.c: revision 1.1
	sys/dev/bluetooth/bthidev.c: revision 1.3
	etc/bluetooth/Makefile: revision 1.3
	sys/dev/pcmcia/files.pcmcia: revision 1.51
	sys/dev/bluetooth/bthidev.c: revision 1.4
	sys/dev/bluetooth/bthidev.h: revision 1.3
	usr.sbin/btdevctl/dev.c: file removal
	sys/dev/bluetooth/files.bluetooth: revision 1.10
	sys/arch/i386/conf/GENERIC: revision 1.777
	share/man/man4/ubt.4: revision 1.6
	share/man/man4/bthub.4: revision 1.3
	sys/netbt/hci.h: revision 1.5
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.202
	lib/libsdp/sdp.h: revision 1.2
	usr.sbin/btdevctl/print.c: revision 1.1
	share/man/man4/bthidev.4: revision 1.5
	share/man/man4/btdev.4: file removal
	usr.sbin/btdevctl/print.c: revision 1.2
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.205
	usr.sbin/btdevctl/Makefile: revision 1.2
	sys/dev/usb/files.usb: revision 1.70
	sys/netbt/l2cap_signal.c: revision 1.2
	sys/netbt/hci_link.c: revision 1.4
	sys/dev/bluetooth/bthub.c: revision 1.3
	share/man/man4/btsco.4: revision 1.5
	sys/netbt/hci_link.c: revision 1.5
	share/man/man4/btdev.4: revision 1.4
	sys/dev/bluetooth/btkbd.c: revision 1.3
	sys/dev/bluetooth/btdev.c: file removal
	sys/netbt/hci_event.c: revision 1.2
	sys/dev/bluetooth/btsco.h: revision 1.2
	etc/mtree/special: revision 1.101
	sys/dev/bluetooth/btsco.c: revision 1.3
	sys/conf/majors: revision 1.27
	usr.sbin/sdpd/hf.c: revision 1.1
	sys/dev/bluetooth/btsco.c: revision 1.4
	share/man/man5/rc.conf.5: revision 1.107
	sys/dev/bluetooth/btdev.c: revision 1.2
	etc/rc.d/btdevctl: revision 1.2
	usr.sbin/btdevctl/db.c: revision 1.1
	etc/rc.d/btdevctl: revision 1.3
	etc/bluetooth/btdevctl.conf: revision 1.1
	usr.sbin/btdevctl/hid.c: file removal
	sys/arch/i386/conf/GENERIC: revision 1.781
	sys/dev/bluetooth/btdev.h: revision 1.3
Make btdev default count explicit
Fix typo in variable name
update to bluetooth device attachment:
remove pseudo-device btdev(4) and inherent limitations
add bthub(4) which autoconfigures at bluetooth controllers as they
are enabled. bluetooth devices now attach here.
btdevctl(8) and its cache is updated to handle new semantics
etc/rc.d/btdevctl is updated to configure devices from a list
in /etc/bluetooth/btdevctl.conf
also include service name in dictionary being sent to kernel.
(this is not used just yet, but it might be in the future and it will
be easier if we dont have to provide code to handle its absence)
clarify the CAVEAT section somewhat
Add service discovery support for the Handsfree profile
Replace static 'FreeBSD' string with operating system name gleaned
from uname(3)
Halt the callout on detach
btsco.c:
 - sco_getopt(..., SO_SCO_MTU, ...) expects the address of a uint16_t,
   not an int. So change sc_mtu's type to uint16_t.
 - Try a little harder to ensure btsco_round_blocksize() does not
   return zero. Prevents a subsequent panic in audio_init_ringbuffer().
	from scw@@
Endian issues:
hci_event.c:
 - Convert memo->response.clock_offset to host-endian.
hci_ioctl.c:
 - printf format tweak (size_t)
hci_link.c:
 - Convert memo->response.clock_offset from host-endian.
 - Tweak a DIAGNOSTIC message.
l2cap_signal.c:
 - In l2cap_recv_config_req(), rp->scid is little-endian so make sure
   we convert from host-endian.
	from scw@@
hci_link.c:
 - In hci_link_free(), do not unlink items from a LIST queue within
   a LIST_FOREACH() iterator.
rfcomm_session.c:
 - In rfcomm_session_recv_mcc_nsc(), do not unlink items from a LIST
   queue within a LIST_FOREACH() iterator.
	from scw@@
guard against a possible situation where the list of l2cap channels is changed
when the bluetooth code is not expecting it to be. During a disconnect, we can
detach the channel that is being disconnected, but its not really safe to detach
any others.
Print explicit 64-bit types using the format macros from int_fmtio.h.
Unbreaks the build for our LP64 ports, where "long long" typically is
not 64 bits.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.772.2.1 2006/08/14 13:41:26 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.772.2.1 $"
d1251 2
a1252 3
# Bluetooth Device Hub
bthub* at bt3c?
bthub* at ubt?
d1255 1
a1255 1
bthidev* at bthub?
d1266 1
a1266 1
btsco* at bthub?
@


1.772.2.3
log
@Pull up following revision(s) (requested by riz in ticket #153):
	sys/arch/amd64/conf/INSTALL: revision 1.56
	sys/arch/amd64/conf/GENERIC: revision 1.107
	sys/arch/i386/conf/XEN2_DOM0: revision 1.7
	sys/arch/i386/conf/INSTALL: revision 1.289
	sys/arch/i386/conf/GENERIC: revision 1.780
Add msk and mskc.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a840 2
mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
@


1.772.2.4
log
@Pull up following revision(s) (requested by jmmv in ticket #180):
	sys/arch/i386/conf/XEN2_DOM0: revision 1.8
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.207
	sys/arch/i386/conf/GENERIC: revision 1.782
Fix definition of some options to be 'options<space><tab>' for consistency.
@
text
@d50 1
a50 1
options 	POWERNOW_K8
@


1.771
log
@Add commented-out "joy* at eap?" & point people at eap.4 before enabling.
Per discussion with drochner@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.770 2006/08/02 16:24:29 reed Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.770 $"
d47 4
a50 1
#options 	POWERNOW_K7
@


1.770
log
@Fix comment, removed some periods at end of a couple comments (not all),
and alphabetize "ral" before "re".

This will make it easier to diff with GENERIC_LAPTOP.

No real changes.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.769 2006/07/31 23:29:54 hubertf Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.769 $"
d1293 1
@


1.769
log
@spc(4) can also attach to pcmcia(4), as was already in hpcmips/GENERIC
for quite some time. Add it to all systems that have pcmcia SCSI.

Pointed out by Björn Johannesson <rherdware@@yahoo.com> in private mail,
OK'd by matt@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.768 2006/07/31 22:23:09 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.768 $"
d422 1
a422 1
#viapcib* at pci? dev ? function ?	# VT8235 PCI-ISA w/ SMBus support
d595 1
a595 1
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00.
d598 1
a598 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310.
d844 1
a845 1
ral*	at pci? dev ? function ?	# ralink wifi
@


1.768
log
@Sort twa before twe.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.767 2006/07/30 17:53:50 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.767 $"
d655 1
@


1.767
log
@Add twa(4) and ld at twa where it makes sense.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.766 2006/07/26 15:34:39 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.766 $"
d708 1
a709 1
twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
d715 1
a716 1
ld*	at twa? unit ?
@


1.766
log
@deprecate "options VERIFIED_EXEC"
veriexec pseudo-device doesn't need a count anymore too

XXX: port masters should propagate this to their ports
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.765 2006/07/26 10:43:02 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.765 $"
d709 1
d716 1
@


1.765
log
@Bluetooth fixes by Iain Hibbert:
Remove bthset(4) device and add btsco(4) in its place. This is an
improved version which is not just for headsets, as it can receive
incoming connections (eg for Hands Free Profile). Update bthset(1)
control utlitiy to relate to new device.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.764 2006/07/26 10:31:00 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.764 $"
d1381 1
a1381 4
#options VERIFIED_EXEC
#
# a pseudo device needed for veriexec
#pseudo-device	veriexec		1
@


1.764
log
@Bluetooth fixes by Iain Hibbert:
Change the way in which bluetooth devices attach to system. The
new way is for devices to attach directly to a btdevN device via
its own control file /dev/btdevN.
- bthub(4) is replaced by btdev(4).
- /dev/bthubctl is replaced by /dev/btdevN.
- configuration now uses proplib(3) property lists.
- btcontrol(8) updated to use new API, and now uses private
- XML config file /var/db/btdev.xml.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.763 2006/07/24 14:24:48 gdt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.763 $"
d1260 1
a1260 1
bthset* at btdev?
@


1.763
log
@Add UGEN_BULK_RA_WB, which allows users of ugen(4) to request read
ahead and write behind, improving performance for the Universal
Software Radio Peripheral (USRP) used with GNU Radio.

Enable UGEN_BULK_RA_WB in GENERIC and GENERIC_LAPTOP; behavior is
unchanged unless the new ioctl is called.

This code was written by Joanne Mikkelson under funding from DARPA's
ACERT program.

ok'd by christos@@, tested by Berndt Josef Wulf
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.762 2006/07/15 07:55:20 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.762 $"
d1245 2
a1246 2
# Bluetooth remote device 'hub'
pseudo-device bthub
d1249 1
a1249 1
bthidev* at bthub?
d1260 1
a1260 1
bthset* at bthub?
@


1.762
log
@add (commented out) fileassoc(9) kernel options on some popular archs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.761 2006/07/12 18:45:51 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.761 $"
d1108 2
@


1.761
log
@Note that people should not be using UFS_DIRHASH.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.760 2006/07/04 00:30:22 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.760 $"
d1375 3
@


1.760
log
@Apply fvdl's acpi pci interrupt configuration code.
- MPACPI is no more.
- MPACPI_SCANPCI -> ACPI_SCANPCI
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.759 2006/06/28 15:19:28 liamjfoy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.759 $"
d180 2
@


1.759
log
@Add CARP to GENERIC kernel configs. CARP is not enabled by default.

ok: christos
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.758 2006/06/19 15:44:44 gdamore Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.758 $"
d322 1
a322 3
#options 	MPACPI		# configure CPUs and APICs using ACPI
				# (acpi at mainbus must also be enabled)
#options 	MPACPI_SCANPCI	# find PCI roots using MPACPI
@


1.758
log
@Initial import of bluetooth stack on behalf of Iain Hibbert.  (plunky@@,
NetBSD Foundation Membership still pending.)  This stack was written by
Iain under sponsorship from Itronix Inc.

The stack includes support for rfcomm networking (networking via your
bluetooth enabled cell phone), hid devices (keyboards/mice), and headsets.

Drivers for both PCMCIA and USB bluetooth controllers are included.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.757 2006/06/16 22:13:35 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.757 $"
d1336 1
@


1.757
log
@Enable the piixpcib(4) device driver by default. This enabled speedstep as
well as sufficient powerhooks to resume from ACPI S3 suspend.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.756 2006/06/16 06:41:13 simonb Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.756 $"
d1235 26
@


1.756
log
@Move ksyms to the "miscellaneous pseudo-devices" - it's not a wscons
thing.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.755 2006/06/13 17:17:15 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.755 $"
d420 1
a420 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
d441 1
a441 1
#isa0	at piixpcib?
@


1.755
log
@edit a couple of new items so that they fit on a line and do the tab
to space dance so that they can be cleanly commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.754 2006/06/07 22:37:57 kardel Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.754 $"
d1336 1
a1346 1
pseudo-device	ksyms			# /dev/ksyms
@


1.755.2.1
log
@Merge from HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.761 2006/07/12 18:45:51 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.761 $"
a179 2
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
# It is not recommended for general use.
d322 3
a324 1
#options 	ACPI_SCANPCI	# find PCI roots using ACPI
d420 1
a420 1
piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
d441 1
a441 1
isa0	at piixpcib?
a1234 26
# Bluetooth Controller and Device support

# Bluetooth PCMCIA Controllers
bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A

# Bluetooth USB Controllers
ubt* at uhub? port ? configuration ? interface ?

# Bluetooth remote device 'hub'
pseudo-device bthub

# Bluetooth HID support
bthidev* at bthub?

# Bluetooth Mouse
btms* at bthidev? reportid ?
wsmouse* at btms? mux 0

# Bluetooth Keyboard
btkbd* at bthidev? reportid ?
wskbd* at btkbd? console ? mux 1

# Bluetooth Audio support
bthset* at bthub?


a1309 1
#pseudo-device	carp			# Common Address Redundancy Protocol
a1335 1
pseudo-device	ksyms			# /dev/ksyms
d1346 1
@


1.754
log
@convert to timecounters (from branch simonb-timecounters)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.753 2006/06/04 15:48:08 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.753 $"
d1270 2
a1271 2
geodewdog* at geodegcb?			# AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb?			# AMD Geode SC1100 high resolution counter
@


1.753
log
@convert a tab to a space so commenting out of piixpm is cleaner
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.752 2006/05/14 21:55:11 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.752 $"
d1269 3
a1271 2

geodewdog* at pci? dev ? function ?	# AMD Geode SC1100 watchdog timer
@


1.752
log
@integrate kauth.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d591 1
a591 1
piixpm*	at pci? dev ? function ?	# PIIX4 compatible PM controller
@


1.752.2.1
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.757 2006/06/16 22:13:35 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.757 $"
d420 1
a420 1
piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
d441 1
a441 1
isa0	at piixpcib?
d591 1
a591 1
piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
d1269 2
a1270 3
geodegcb*  at pci? dev ? function ?	# Geode GCB area
geodewdog* at geodegcb? 		# AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb? 		# AMD Geode SC1100 high res. counter
a1334 1
pseudo-device	ksyms			# /dev/ksyms
d1345 1
@


1.752.2.2
log
@Complete a sync sys/ with head.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a1234 26
# Bluetooth Controller and Device support

# Bluetooth PCMCIA Controllers
bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A

# Bluetooth USB Controllers
ubt* at uhub? port ? configuration ? interface ?

# Bluetooth remote device 'hub'
pseudo-device bthub

# Bluetooth HID support
bthidev* at bthub?

# Bluetooth Mouse
btms* at bthidev? reportid ?
wsmouse* at btms? mux 0

# Bluetooth Keyboard
btkbd* at bthidev? reportid ?
wskbd* at btkbd? console ? mux 1

# Bluetooth Audio support
bthset* at bthub?


@


1.751
log
@Driver for iTE IT87xxF and compatibles hardware monitor. Add
commented out entries on GENERIC and GENERIC_LAPTOP.

Adapted from OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.750 2006/05/07 01:38:54 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.750 $"
@


1.750
log
@Add piixpm
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.749 2006/05/06 15:49:38 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.749 $"
d594 3
d598 1
a598 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310, 0xc00
@


1.749
log
@Add piixpcib(4), commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.748 2006/05/04 19:09:41 rpaulo Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.748 $"
d590 4
@


1.748
log
@PR 33421: add ral at cardbus. From Pierrick Brossin.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.747 2006/04/20 15:58:52 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.747 $"
d420 1
d441 1
@


1.747
log
@some rewording and reformatting to fit some lines in 80 colums,
especially when commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.746 2006/04/19 10:31:44 drochner Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.746 $"
d919 1
@


1.746
log
@adjust comments for the new location of wskbdmap_mfii.c,
addresses PR kern/33290 by henry nelson
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.745 2006/04/18 17:03:18 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.745 $"
d257 1
a257 1
options 	WSDISPLAY_CUSTOM_BORDER	# border customization from wsconsctl(8)
d610 1
a610 1
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bus bitbanging via gpio
d953 1
a953 1
rgephy*	at mii? phy ?			# Realtek 8169S/8110S internal PHYs
@


1.745
log
@options<space><tab>FOO
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.744 2006/04/18 16:49:19 rittera Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.744 $"
d267 1
a267 1
# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
@


1.744
log
@A number of minor changes for NDIS.  (OK'd by phil)

1. Removed the makeoptions line from arch/i386/conf/GENERIC.  Now
ndis_driver_data.h is simply copied into the kernel build directory instead
of editing the config file to specify its location.

2. Uncommented lines in files.i386 and files.pci related to NDIS.  NDIS will
not be compiled into the kernel unless the two lines are uncommented from
GENERIC (I checked using nm), so there is no reason for this to be commented
out.

3. Added ndiscvt to usr.sbin/Makefile.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.743 2006/04/15 17:48:23 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.743 $"
d47 1
a47 1
#options	POWERNOW_K7
@


1.743
log
@Remove the getwschar and putwschar accessops from wsdisplay drivers as
requested by uwe@@.  These were wrong because they were receiving an
emulcookie yet they were accessops (thus having to receive an accesscookie).
Instead, just handle the WSDISPLAYIO_{GET,PUT}WSCHAR ioctls from the
driver's ioctl accessop.

As this reduces the amount of code needed to handle these operations to
two small functions in each driver, remove the WSDISPLAY_CHARFUNCS kernel
option.

Reviewed by, at least, uwe@@ and macallan@@.  No objections in tech-kern@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.742 2006/04/13 00:30:19 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.742 $"
d149 1
a149 2
#options		COMPAT_NDIS	# NDIS network driver
#makeoptions	CFLAGS+="-DNDIS_DRV_DATA=\"ndis_data\""
@


1.742
log
@Fix the MPU attachment on Aztech 1020 that has a separate mpu pnp device
instead of having the mpu in io[1]. From doomwarriorx at gmail dot com.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.741 2006/04/12 03:41:51 martti Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.741 $"
a278 4
# the following enables some functions to get mouse console support.
# if you want a really secure system, it may be better not to enable them,
# see wsmoused(8), section SECURITY CONSIDERATIONS for more info.
#options 	WSDISPLAY_CHARFUNCS		# mouse console support
@


1.741
log
@Added ciss(4). Tested by Joseph Dacuma on HP DL-380 G3 with Smart Array 5i.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.740 2006/04/07 18:55:22 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.740 $"
d1184 1
@


1.740
log
@Dallas Semiconductor 1-Wire bus support, from OpenBSD.  Currently includes
gpioow(4), attaching a bit-banging driver via a GPIO pin.  Also,
owtemp(4) which supports some of the 1-Wire temperature sensors, including
the DS18b20 and DS1920 - temperatures are returned via the envsys(4)
framework.

Original drivers by Alexander Yurchenko (grange@@openbsd), with envsys(4)
support and a fix to the 1-wire search algorithm (for discovering
devices on the bus) by me.

As discussed on tech-kern earlier this week.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.739 2006/04/03 16:08:49 scw Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.739 $"
d700 1
@


1.739
log
@Add utoppy* at uhub?
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.738 2006/03/31 00:03:57 rittera Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.738 $"
d614 6
@


1.738
log
@Updated to the latest NDIS code.  I added commented out lines in the files
arch/i386/conf/GENERIC, arch/i386/conf/files.i386 and dev/pci/files.pci which
can simply be uncommented to compile NDIS into the kernel.  I'll write some
documentation on this soon.

Note that NDIS is still somewhat experimental.  It is currently tested and
functions relatively well on on two cards:
1. Dell (Broadcom) TrueMobile 1400 Dual Band WLAN Mini-PCI
2. Intel EtherExpress Pro/100
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.737 2006/03/28 20:58:40 pavel Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.737 $"
d1084 3
@


1.737
log
@Add stf to all kernel configs which have INET6 and gif, except the INSTALL
ones and those for specific machines of developers. PR 32304.

OK'ed by rpaulo.

N.B. stf is a cloning device, so it still must be enabled by
"ifconfig stf0 create".
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.736 2006/03/25 17:44:29 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.736 $"
d149 2
d825 1
@


1.736
log
@Enable rgephy(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.735 2006/03/17 12:25:01 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.735 $"
d1302 1
a1302 1
#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
@


1.735
log
@Add 'iic* at viapcib?', commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.734 2006/03/17 12:22:14 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.734 $"
d948 1
@


1.734
log
@Add (commented out) definitions of viapcib attachments.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.733 2006/03/12 22:57:01 chs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.733 $"
d425 1
@


1.733
log
@add nfe.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.732 2006/03/06 18:35:24 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.732 $"
d424 1
d443 1
@


1.733.2.1
log
@Merge 2006-03-28 NetBSD-current into the "peter-altq" branch.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.736 2006/03/25 17:44:29 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.736 $"
a423 2
#viapcib* at pci? dev ? function ?	# VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
a441 1
#isa0	at viapcib?
a944 1
rgephy*	at mii? phy ?			# Realtek 8169S/8110S internal PHYs
@


1.733.2.2
log
@Merge 2006-03-31 NetBSD-current into the "peter-altq" branch.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a148 2
#options		COMPAT_NDIS	# NDIS network driver
#makeoptions	CFLAGS+="-DNDIS_DRV_DATA=\"ndis_data\""
a822 1
#ndis* 	at pci? dev ? function ?	# Experimental - NDIS Network Driver
d1302 1
a1302 1
pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
@


1.733.2.3
log
@Merge 2006-05-24 NetBSD-current into the "peter-altq" branch.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.752 2006/05/14 21:55:11 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.752 $"
d47 1
a47 1
#options 	POWERNOW_K7
d149 2
a150 1
#options 	COMPAT_NDIS	# NDIS network driver
d258 1
a258 1
options 	WSDISPLAY_CUSTOM_BORDER	# custom border colors via wsconsctl(8)
d268 1
a268 1
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
d279 4
a424 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a444 1
#isa0	at piixpcib?
a592 7
# Intel PIIX4 power management controllers
piixpm*	at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

# iTE IT87xxF and compatible hardware monitors
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00.

d594 1
a594 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310.
a613 6
# 1-Wire support
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
#onewire*	at gpioow?

# 1-Wire devices
#owtemp* 	at onewire?			# Temperature sensors
a693 1
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
a916 1
#ral*	at cardbus? function ?	# Ralink Technology
d951 1
a951 1
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
a1083 3
# Topfield TF5000PVR range of DVB recorders
utoppy*	at uhub? port ?

a1173 1
mpu*	at isapnp?
@


1.732
log
@Add svwsata(4), a driver for Serverworks K2 SATA controllers. From
OpenBSD via Joerg Sonnenberger.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731 2006/02/25 01:33:15 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731 $"
d821 1
@


1.732.2.1
log
@sync with head - hopefully this will work
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.743 2006/04/15 17:48:23 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.743 $"
a148 2
#options		COMPAT_NDIS	# NDIS network driver
#makeoptions	CFLAGS+="-DNDIS_DRV_DATA=\"ndis_data\""
d277 4
a423 2
#viapcib* at pci? dev ? function ?	# VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
a441 1
#isa0	at viapcib?
a608 6
# 1-Wire support
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bus bitbanging via gpio
#onewire*	at gpioow?

# 1-Wire devices
#owtemp* 	at onewire?			# Temperature sensors
a688 1
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
a819 1
#ndis* 	at pci? dev ? function ?	# Experimental - NDIS Network Driver
a820 1
nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
a943 1
rgephy*	at mii? phy ?			# Realtek 8169S/8110S internal PHYs
a1075 3
# Topfield TF5000PVR range of DVB recorders
utoppy*	at uhub? port ?

a1165 1
mpu*	at isapnp?
d1297 1
a1297 1
pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
@


1.732.2.2
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.732.2.1 2006/04/19 02:32:44 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.732.2.1 $"
d47 1
a47 1
#options 	POWERNOW_K7
d149 2
a150 1
#options 	COMPAT_NDIS	# NDIS network driver
d258 1
a258 1
options 	WSDISPLAY_CUSTOM_BORDER	# custom border colors via wsconsctl(8)
d268 1
a268 1
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
a420 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a440 1
#isa0	at piixpcib?
a588 4
# Intel PIIX4 power management controllers
piixpm*	at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

d611 1
a611 1
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
a919 1
#ral*	at cardbus? function ?	# Ralink Technology
d954 1
a954 1
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
@


1.731
log
@remove vinum
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.730 2006/02/24 10:20:32 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.730 $"
d726 1
@


1.731.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731 2006/02/25 01:33:15 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731 $"
a725 1
svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
a819 1
nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
@


1.731.2.2
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731.2.1 2006/03/13 09:06:53 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731.2.1 $"
a148 2
#options		COMPAT_NDIS	# NDIS network driver
#makeoptions	CFLAGS+="-DNDIS_DRV_DATA=\"ndis_data\""
a423 2
#viapcib* at pci? dev ? function ?	# VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
a441 1
#isa0	at viapcib?
a819 1
#ndis* 	at pci? dev ? function ?	# Experimental - NDIS Network Driver
a944 1
rgephy*	at mii? phy ?			# Realtek 8169S/8110S internal PHYs
d1298 1
a1298 1
pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
@


1.731.2.3
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731.2.2 2006/04/01 12:06:18 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731.2.2 $"
a613 6
# 1-Wire support
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bus bitbanging via gpio
#onewire*	at gpioow?

# 1-Wire devices
#owtemp* 	at onewire?			# Temperature sensors
a1083 3
# Topfield TF5000PVR range of DVB recorders
utoppy*	at uhub? port ?

@


1.731.2.4
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731.2.3 2006/04/11 11:53:27 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731.2.3 $"
d47 1
a47 1
#options 	POWERNOW_K7
d149 2
a150 1
#options 	COMPAT_NDIS	# NDIS network driver
d258 1
a258 1
options 	WSDISPLAY_CUSTOM_BORDER	# custom border colors via wsconsctl(8)
d268 1
a268 1
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
d279 4
a424 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a444 1
#isa0	at piixpcib?
a592 7
# Intel PIIX4 power management controllers
piixpm*	at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

# iTE IT87xxF and compatible hardware monitors
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00.

d594 1
a594 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310.
d615 1
a615 1
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
a699 1
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
a922 1
#ral*	at cardbus? function ?	# Ralink Technology
d957 1
a957 1
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
a1182 1
mpu*	at isapnp?
@


1.731.2.5
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731.2.4 2006/05/24 10:56:51 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731.2.4 $"
d420 1
a420 1
piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
d441 1
a441 1
isa0	at piixpcib?
d591 1
a591 1
piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
a1234 26
# Bluetooth Controller and Device support

# Bluetooth PCMCIA Controllers
bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A

# Bluetooth USB Controllers
ubt* at uhub? port ? configuration ? interface ?

# Bluetooth remote device 'hub'
pseudo-device bthub

# Bluetooth HID support
bthidev* at bthub?

# Bluetooth Mouse
btms* at bthidev? reportid ?
wsmouse* at btms? mux 0

# Bluetooth Keyboard
btkbd* at bthidev? reportid ?
wskbd* at btkbd? console ? mux 1

# Bluetooth Audio support
bthset* at bthub?


d1269 2
a1270 3
geodegcb*  at pci? dev ? function ?	# Geode GCB area
geodewdog* at geodegcb? 		# AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb? 		# AMD Geode SC1100 high res. counter
a1334 1
pseudo-device	ksyms			# /dev/ksyms
d1345 1
@


1.731.2.6
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731.2.5 2006/06/26 12:44:38 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731.2.5 $"
d47 1
a47 4
options 	POWERNOW_K7

# AMD PowerNow! and Cool`n'Quiet technology
options         POWERNOW_K8
a179 2
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
# It is not recommended for general use.
d322 3
a324 1
#options 	ACPI_SCANPCI	# find PCI roots using ACPI
d422 1
a422 1
#viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
d595 1
a595 1
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00
d598 1
a598 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310
a654 1
spc* 	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI
a707 1
twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
a713 1
ld*	at twa? unit ?
a840 1
ral*	at pci? dev ? function ?	# Ralink Technology RT25x0 802.11a/b/g
d842 1
a1107 2
# On ugen bulk endpoints, perform read-ahead and write-behind.
options	UGEN_BULK_RA_WB
d1243 2
a1244 2
# Bluetooth Devices
pseudo-device btdev
d1247 1
a1247 1
bthidev* at btdev?
d1258 1
a1258 1
btsco* at btdev?
a1287 1
#joy*	at eap?				# See CAVEATS in eap(4) before enabling
a1335 1
#pseudo-device	carp			# Common Address Redundancy Protocol
a1373 3
#options	FILEASSOC		# fileassoc(9) - required for Veriexec 
#options	FILEASSOC_NHOOKS=4	# Default number of storage slots

d1375 4
a1378 1
#pseudo-device	veriexec
@


1.731.2.7
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731.2.6 2006/08/11 15:41:53 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731.2.6 $"
d87 1
a87 1
#options 	SYSTRACE	# system call vetting via systrace(1)
d201 2
d205 1
a211 1
options 	IPFILTER_LOOKUP	# ippool(8) support
a352 1
#ym* 		at acpi?		# Yamaha OPL3-SA[23] audio
d372 1
a372 1
#ym*		at pnpbios? index ?	# Yamaha OPL3-SA[23] audio
a863 1
wpi*	at pci? dev ? function ?	# Intel PRO/Wireless 3945ABG
d1018 1
a1018 1
# USB serial adapter
d1163 1
a1163 1
ym*	at isapnp?			# Yamaha OPL3-SA[23] audio
d1252 1
a1252 1
pseudo-device btdev	4
@


1.731.2.8
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.731.2.7 2006/09/03 15:22:58 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.731.2.7 $"
a756 3
# CardBus IDE controllers
#njata*  at cardbus? function ? flags 0		# Workbit NinjaATA-32

a839 2
mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
d1251 2
a1252 3
# Bluetooth Device Hub
bthub* at bt3c?
bthub* at ubt?
d1255 1
a1255 1
bthidev* at bthub?
d1266 1
a1266 1
btsco* at bthub?
@


1.730
log
@Repeat previous for SPLASHSCREEN* options.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.729 2006/02/24 10:05:41 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.729 $"
a1277 4
# Vinum
# pseudo-device	vinum		8	# Vinum
# options 	VINUMDEBUG

@


1.729
log
@Use 'options<space><tab>' in the recently added vesafb stuff so that
uncommenting those lines leaves them properly aligned.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.728 2006/02/19 21:41:18 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.728 $"
d286 2
a287 2
#options	SPLASHSCREEN
#options	SPLASHSCREEN_PROGRESS
@


1.728
log
@Add screenblanking support. Not enabled by default, as in some cases it
might cause the system to hang. Where it does work, it works well. Enabled
by setting options VESAFB_PM.

Tested on ATI Radeon M9 (failed), NeoMagic 256AV (passed).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.727 2006/02/19 02:55:21 tls Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.727 $"
d510 1
a510 1
#options	KVM86			# required for vesabios
d512 5
a516 5
#vesafb*	at vesabios?
#options	VESAFB_WIDTH=640
#options	VESAFB_HEIGHT=480
#options	VESAFB_DEPTH=8
#options	VESAFB_PM		# power management support
@


1.727
log
@Add amdpm -- without this, we're throwing away a good hardware random
number source on a huge set of machines.  Also, now that amdpm has
support for the SMBus controller, add (commented-out, since we don't
always know what address the sensors are at) iic at amdpm and adt7463c
at iic, which is the configuration used on the Tyan S2881 and S2882-D
server boards.  This should work in either 64-bit or 32-bit mode; it's
been tested in 64-bit mode.  Addresses PR kern/32463 submitted by
Anil Gopinath.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.726 2006/02/18 19:15:19 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.726 $"
d510 1
a510 1
#options	KVM86	# required for vesabios
d516 1
@


1.726
log
@Document vesafb and splash screen configuration options. Both are disabled
by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.725 2006/02/05 05:01:55 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.725 $"
d580 7
@


1.725
log
@Remove 'count' argument for pseudo-devices that ignore it
(vnd, bpfilter, ppp, gif, gre, tun, sl, strip, faith, stf).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.724 2006/02/04 03:09:40 rpaulo Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.724 $"
d285 3
d509 9
@


1.724
log
@bpfilter doesn't accept count anymore.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.723 2006/02/03 11:08:23 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.723 $"
d1263 1
a1263 1
pseudo-device	vnd		4	# disk-like interface to files
d1270 1
a1270 1
pseudo-device	ppp		2	# Point-to-Point Protocol
d1272 2
a1273 2
pseudo-device	sl		2	# Serial Line IP
pseudo-device	strip		2	# Starmode Radio IP (Metricom)
d1276 5
a1280 5
pseudo-device	tun		2	# network tunneling over tty
pseudo-device	gre		2	# generic L3 over IP tunnel
pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
@


1.723
log
@Implement support for 'The Multiboot Specification' so that i386 kernels
can be booted directly from Multiboot-compliant boot loaders (e.g. GRUB).
See the added multiboot(8) manual page for more information.

No objections in tech-kern@@; only positive comments.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.722 2006/02/02 21:32:09 reinoud Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.722 $"
d1267 1
a1267 1
pseudo-device	bpfilter	8	# Berkeley packet filter
@


1.723.2.1
log
@Move watchdog timer support code out of geode.c in to its
own file, leaving geode.c to just set up GDB mappings.
Add support for CGB high resolution counter as a time counter.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.723 2006/02/03 11:08:23 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.723 $"
d1224 2
a1225 3
geodegcb*  at pci? dev ? function ?	# Geode GCB area
geodewdog* at geodegcb?			# AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb?			# AMD Geode SC1100 high resolution counter
@


1.723.2.2
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.747 2006/04/20 15:58:52 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.747 $"
d47 1
a47 1
#options 	POWERNOW_K7
a148 1
#options 	COMPAT_NDIS	# NDIS network driver
d256 1
a256 1
options 	WSDISPLAY_CUSTOM_BORDER	# custom border colors via wsconsctl(8)
d266 1
a266 1
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
d277 4
a284 3
# enable splash screen support; requires hw driver support
#options 	SPLASHSCREEN
#options 	SPLASHSCREEN_PROGRESS
a420 2
#viapcib* at pci? dev ? function ?	# VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
a438 1
#isa0	at viapcib?
a505 10
# VESA framebuffer console
#options 	KVM86			# required for vesabios
#vesabios*	at vesabiosbus?
#vesafb* 	at vesabios?
#options 	VESAFB_WIDTH=640
#options 	VESAFB_HEIGHT=480
#options 	VESAFB_DEPTH=8
#options 	VESAFB_PM		# power management support
#wsdisplay*	at vesafb? console ?

a567 7
# AMD 768 and 8111 power/ACPI controllers
amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
#iic*	at amdpm?			# sensors below are on this bus
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

a588 6
# 1-Wire support
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
#onewire*	at gpioow?

# 1-Wire devices
#owtemp* 	at onewire?			# Temperature sensors
a668 1
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
a705 1
svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
a798 1
#ndis* 	at pci? dev ? function ?	# Experimental - NDIS Network Driver
a799 1
nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
a922 1
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
a1054 3
# Topfield TF5000PVR range of DVB recorders
utoppy*	at uhub? port ?

a1144 1
mpu*	at isapnp?
d1259 4
d1264 1
a1264 1
pseudo-device	vnd			# disk-like interface to files
d1268 1
a1268 1
pseudo-device	bpfilter		# Berkeley packet filter
d1271 1
a1271 1
pseudo-device	ppp			# Point-to-Point Protocol
d1273 2
a1274 2
pseudo-device	sl			# Serial Line IP
pseudo-device	strip			# Starmode Radio IP (Metricom)
d1277 5
a1281 5
pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith			# IPv[46] tcp relay translation i/f
pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
@


1.723.2.3
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.723.2.2 2006/04/22 11:37:32 simonb Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.723.2.2 $"
a419 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a439 1
#isa0	at piixpcib?
a587 7
# Intel PIIX4 power management controllers
piixpm*	at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

# iTE IT87xxF and compatible hardware monitors
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00.

d589 1
a589 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310.
a918 1
#ral*	at cardbus? function ?	# Ralink Technology
@


1.723.2.4
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.723.2.3 2006/06/01 22:34:33 kardel Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.723.2.3 $"
d591 1
a591 1
piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
@


1.722
log
@Add commented out UDF file-system entry in all GENERIC configurations.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.721 2006/01/31 16:42:09 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.721 $"
d53 3
@


1.721
log
@GENERIC: add ral(4) at uhub.
GENERIC_LAPTOP: add ral(4) at cardbus/pci/uhub.
XEN0: add ral(4) at pci/uhub.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.720 2006/01/31 09:31:01 kochi Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.720 $"
d170 1
@


1.721.2.1
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.779 2006/09/07 14:23:44 itohy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.779 $"
d47 1
a47 4
options 	POWERNOW_K7

# AMD PowerNow! and Cool`n'Quiet technology
options         POWERNOW_K8
a52 3
options 	MULTIBOOT	# Multiboot support (see multiboot(8))
#options 	MULTIBOOT_SYMTAB_SPACE=1048576

d81 1
a81 1
#options 	SYSTRACE	# system call vetting via systrace(1)
a145 1
#options 	COMPAT_NDIS	# NDIS network driver
a169 1
#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
a174 2
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
# It is not recommended for general use.
d191 2
d195 1
a201 1
options 	IPFILTER_LOOKUP	# ippool(8) support
d252 1
a252 1
options 	WSDISPLAY_CUSTOM_BORDER	# custom border colors via wsconsctl(8)
d262 1
a262 1
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
d273 4
a280 3
# enable splash screen support; requires hw driver support
#options 	SPLASHSCREEN
#options 	SPLASHSCREEN_PROGRESS
d318 3
a320 1
#options 	ACPI_SCANPCI	# find PCI roots using ACPI
a345 1
#ym* 		at acpi?		# Yamaha OPL3-SA[23] audio
d365 1
a365 1
#ym*		at pnpbios? index ?	# Yamaha OPL3-SA[23] audio
a415 1
piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a416 2
#viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
a433 1
isa0	at piixpcib?
a434 1
#isa0	at viapcib?
a501 10
# VESA framebuffer console
#options 	KVM86			# required for vesabios
#vesabios*	at vesabiosbus?
#vesafb* 	at vesabios?
#options 	VESAFB_WIDTH=640
#options 	VESAFB_HEIGHT=480
#options 	VESAFB_DEPTH=8
#options 	VESAFB_PM		# power management support
#wsdisplay*	at vesafb? console ?

a563 14
# AMD 768 and 8111 power/ACPI controllers
amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
#iic*	at amdpm?			# sensors below are on this bus
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

# Intel PIIX4 power management controllers
piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

# iTE IT87xxF and compatible hardware monitors
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00

d565 1
a565 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310
a584 6
# 1-Wire support
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
#onewire*	at gpioow?

# 1-Wire devices
#owtemp* 	at onewire?			# Temperature sensors
a615 1
spc* 	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI
a664 1
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
a667 1
twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
a673 1
ld*	at twa? unit ?
a701 1
svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
a710 3
# CardBus IDE controllers
#njata*  at cardbus? function ? flags 0		# Workbit NinjaATA-32

a794 1
#ndis* 	at pci? dev ? function ?	# Experimental - NDIS Network Driver
a795 1
nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
a797 1
ral*	at pci? dev ? function ?	# Ralink Technology RT25x0 802.11a/b/g
d799 1
a814 1
wpi*	at pci? dev ? function ?	# Intel PRO/Wireless 3945ABG
a884 1
#ral*	at cardbus? function ?	# Ralink Technology
a918 1
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
d967 1
a967 1
# USB serial adapter
a1050 3
# Topfield TF5000PVR range of DVB recorders
utoppy*	at uhub? port ?

a1059 2
# On ugen bulk endpoints, perform read-ahead and write-behind.
options	UGEN_BULK_RA_WB
d1107 1
a1107 1
ym*	at isapnp?			# Yamaha OPL3-SA[23] audio
a1140 1
mpu*	at isapnp?
a1185 26
# Bluetooth Controller and Device support

# Bluetooth PCMCIA Controllers
bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A

# Bluetooth USB Controllers
ubt* at uhub? port ? configuration ? interface ?

# Bluetooth Devices
pseudo-device btdev	4

# Bluetooth HID support
bthidev* at btdev?

# Bluetooth Mouse
btms* at bthidev? reportid ?
wsmouse* at btms? mux 0

# Bluetooth Keyboard
btkbd* at bthidev? reportid ?
wskbd* at btkbd? console ? mux 1

# Bluetooth Audio support
btsco* at btdev?


a1212 1
#joy*	at eap?				# See CAVEATS in eap(4) before enabling
d1220 2
a1221 3
geodegcb*  at pci? dev ? function ?	# Geode GCB area
geodewdog* at geodegcb? 		# AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb? 		# AMD Geode SC1100 high res. counter
d1254 4
d1259 1
a1259 1
pseudo-device	vnd			# disk-like interface to files
d1263 1
a1263 2
pseudo-device	bpfilter		# Berkeley packet filter
#pseudo-device	carp			# Common Address Redundancy Protocol
d1266 1
a1266 1
pseudo-device	ppp			# Point-to-Point Protocol
d1268 2
a1269 2
pseudo-device	sl			# Serial Line IP
pseudo-device	strip			# Starmode Radio IP (Metricom)
d1272 5
a1276 5
pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith			# IPv[46] tcp relay translation i/f
pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
a1289 1
pseudo-device	ksyms			# /dev/ksyms
d1300 1
a1300 3

#options	FILEASSOC		# fileassoc(9) - required for Veriexec 
#options	FILEASSOC_NHOOKS=4	# Default number of storage slots
d1303 4
a1306 1
#pseudo-device	veriexec
@


1.720
log
@remove ACPI_DISABLE_ON_POWEROFF option, which was there just for
compatibility of our old driver behavior, which is not necessary.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.719 2006/01/29 11:32:01 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.719 $"
d1008 1
a1008 1
# USB 802.11b adapters
d1010 1
@


1.719
log
@Add more cardbus USB controllers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.718 2006/01/05 10:24:11 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.718 $"
a325 1
#options 	ACPI_DISABLE_ON_POWEROFF	# disable acpi on power off
@


1.718
log
@Comment out "options POWERNOW_K7" until the problems are resolved.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.717 2006/01/04 23:40:45 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.717 $"
d938 1
@


1.717
log
@Enable rlphy(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.716 2006/01/04 20:44:26 dsl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.716 $"
d47 1
a47 1
options		POWERNOW_K7
@


1.716
log
@add ral* at pci? - They exist....
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.715 2005/12/31 17:55:55 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.715 $"
d920 1
@


1.715
log
@AMD PowerNow K7 driver written by Martin Vegiard via PR port-i386/26239.

Enabled by default on GENERIC and GENERIC_LAPTOP.

Imported 1 year later... but it's here finally.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.714 2005/12/20 05:35:28 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.714 $"
d800 1
@


1.714
log
@Remove the tablet line discipline.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.713 2005/12/11 02:11:50 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.713 $"
d46 3
@


1.714.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.714 2005/12/20 05:35:28 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.714 $"
a45 3
# AMD PowerNow! K7
#options	POWERNOW_K7

a796 1
ral*	at pci? dev ? function ?	# ralink wifi
a915 1
rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
@


1.714.2.2
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.714.2.1 2006/01/15 10:02:37 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.714.2.1 $"
d326 1
a937 1
#uhci*	at cardbus? function ?	# Universal Host Controller (Intel)
d1008 1
a1008 1
# USB 802.11 adapters
a1009 1
ral*	at uhub? port ?		# Ralink Technology RT25x0 802.11a/b/g
@


1.714.2.3
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.714.2.2 2006/02/01 14:51:28 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.714.2.2 $"
a52 3
options 	MULTIBOOT	# Multiboot support (see multiboot(8))
#options 	MULTIBOOT_SYMTAB_SPACE=1048576

a169 1
#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
d1259 1
a1259 1
pseudo-device	vnd			# disk-like interface to files
d1263 1
a1263 1
pseudo-device	bpfilter		# Berkeley packet filter
d1266 1
a1266 1
pseudo-device	ppp			# Point-to-Point Protocol
d1268 2
a1269 2
pseudo-device	sl			# Serial Line IP
pseudo-device	strip			# Starmode Radio IP (Metricom)
d1272 5
a1276 5
pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith			# IPv[46] tcp relay translation i/f
#pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
@


1.714.2.4
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.714.2.3 2006/02/18 15:38:35 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.714.2.3 $"
a284 3
# enable splash screen support; requires hw driver support
#options 	SPLASHSCREEN
#options 	SPLASHSCREEN_PROGRESS
a505 10
# VESA framebuffer console
#options 	KVM86			# required for vesabios
#vesabios*	at vesabiosbus?
#vesafb* 	at vesabios?
#options 	VESAFB_WIDTH=640
#options 	VESAFB_HEIGHT=480
#options 	VESAFB_DEPTH=8
#options 	VESAFB_PM		# power management support
#wsdisplay*	at vesafb? console ?

a567 7
# AMD 768 and 8111 power/ACPI controllers
amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
#iic*	at amdpm?			# sensors below are on this bus
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

d1258 4
@


1.713
log
@Add a small device to control brightness on the Sony VAIOs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.712 2005/12/10 11:32:14 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.712 $"
a1278 1
pseudo-device	tb		1	# tablet line discipline
@


1.712
log
@Apparently the i386 GENERIC kernel config already have some Veriexec
options and pseudo-device scattered in the file; remove duplicates.

Pointed out by xtraeme@@, thanks. :)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.711 2005/12/09 23:34:02 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.711 $"
d349 3
@


1.711
log
@Add (commented out) Veriexec options and pseudo-device to GENERIC kernels,
and remove the i386 GENERIC_VERIEXEC config.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.710 2005/12/07 09:10:14 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.710 $"
a214 14
# These options control the verified exec feature
#options VERIFIED_EXEC
#
# Uncomment the fingerprint methods below that are desired.  Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
#options VERIFIED_EXEC_FP_RMD160
#options VERIFIED_EXEC_FP_SHA256
#options VERIFIED_EXEC_FP_SHA384
#options VERIFIED_EXEC_FP_SHA512
#options VERIFIED_EXEC_FP_SHA1
#options VERIFIED_EXEC_FP_MD5

a1288 3
# a pseudo device needed for veriexec
#pseudo-device veriexec		1

@


1.710
log
@Adjust comments for options FFS_NO_SNAPSHOT.

XXX: This option should be mentioned in options(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.709 2005/11/25 16:41:31 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.709 $"
d1303 1
a1303 1
# a pseudo device needed for verified exec
d1310 17
@


1.709
log
@swcr -> swcrypto
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.708 2005/11/25 16:35:11 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.708 $"
d174 1
a174 1
#options 	FFS_NO_SNAPSHOT	# ffs snapshots
@


1.708
log
@"pseudo-device crypto" really refers to the /dev/crypto API to the
opencrypto framework, not the framework itself.  Update the comment
accordingly.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.707 2005/11/25 16:30:23 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.707 $"
d1242 1
a1242 1
pseudo-device	swcr		# software crypto implementation
@


1.707
log
@Add "pseudo-device swcr" (commented out if "pseudo-device crypto" is also
commented out).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.706 2005/10/07 15:59:49 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.706 $"
d1241 1
a1241 1
pseudo-device 	crypto		# opencrypto framework
@


1.706
log
@Add support for the gpio(4) framework to the elansc(4) system controller.

From Alexander Yurchenko (grange@@openbsd), via OpenBSD.
Approved by jmcneill.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.705 2005/10/07 08:18:13 abs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.705 $"
d1242 1
@


1.706.6.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.706 2005/10/07 15:59:49 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.706 $"
d1241 1
a1241 2
pseudo-device 	crypto		# /dev/crypto device
pseudo-device	swcrypto	# software crypto implementation
@


1.705
log
@At least ASUS also put the ITE8712F at 0xc00 - noted by Juan RP
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.704 2005/09/27 02:57:47 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.704 $"
d420 1
@


1.704
log
@Add (commented out) definition of gpio attachment to nsclpcsio
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.703 2005/09/27 02:57:02 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.703 $"
d573 1
a573 1
#lm0	at isa?	port 0x290		# other common ports: 0x280, 0x310
@


1.703
log
@Add (commented out) definition of isa at gscpcib
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.702 2005/09/27 02:47:42 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.702 $"
d577 1
@


1.702
log
@Add (commented out) definitions for gscpcib and the equivalent gpio
attachment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.701 2005/09/22 07:09:35 dyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.701 $"
d442 1
@


1.701
log
@Add a driver for the watchdog timer on the AMD Geode SC1100.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.700 2005/09/14 08:22:24 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.700 $"
d424 1
d588 3
@


1.700
log
@Add 10 Gigabit Ethernet drivers dge(4) and xge(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.699 2005/09/10 19:20:49 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.699 $"
d1219 2
@


1.699
log
@Initial addition of tmpfs, an efficient memory file-system.  This project
was developed as part of Google's Summer of Code 2005 program.  This
change adds the kernel code, the mount_tmpfs utility, a regression test
suite and does all other related changes to integrate these.

The file-system is still *experimental*.  Therefore, it is disabled by
default in all kernels.  However, as typically done, a commented-out
entry is added in them to ease its setup.

Note that I haven't commited the required mountd(8) changes to be able
to export tmpfs file-systems because NFS support is still very unstable
and because, before enabling it, I'd like to do some other changes.

OK'ed by my project mentor, William Studenmund (wrstuden@@).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.698 2005/09/09 16:26:19 drochner Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.698 $"
d782 1
d816 1
@


1.698
log
@remove "dev" locators from cardbus device definitions, it doesn't
make sense technically and might be removed
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.697 2005/09/06 02:03:52 dogcow Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.697 $"
d166 1
@


1.697
log
@after discussion with dyoung, add rtw* at cardbus
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.696 2005/08/19 05:19:50 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.696 $"
d528 1
a528 1
#com*	at cardbus? dev ? function ?	# Modems and serial cards
d641 3
a643 3
#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
#njs*	at cardbus? dev ? function ?	# Workbit NinjaSCSI-32
d878 7
a884 7
#ath*	at cardbus? dev ? function ?	# Atheros 5210/5211/5212 802.11
#atw*	at cardbus? dev ? function ?	# ADMtek ADM8211 (802.11)
#ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
#fxp*	at cardbus? dev ? function ?	# Intel i8255x
#rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
#rtw*	at cardbus? dev ? function ?	# Realtek 8180L (802.11)
#tlp*	at cardbus? dev ? function ?	# DECchip 21143
d932 2
a933 2
#ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
#ohci*	at cardbus? dev ? function ?	# Open Host Controller
d1068 1
a1068 1
#fwohci*	at cardbus? dev ? function ?	# IEEE1394 Open Host Controller
@


1.696
log
@Enable ptyfs by default on the non-install and non small/tiny/ramdisk kernels
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.695 2005/08/19 02:03:51 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.695 $"
d883 1
@


1.695
log
@64 bit inode changes.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.694 2005/08/18 15:57:00 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.694 $"
d165 1
a165 1
#file-system	PTYFS		# experimental - /dev/ptm support
@


1.694
log
@change a tab to a space tab in front of UFS_DIRHASH
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.693 2005/08/05 09:23:16 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.693 $"
d130 1
@


1.693
log
@Add (commented out) ucycom to various kernel configs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.692 2005/07/31 04:04:32 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.692 $"
d170 1
a170 1
#options	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
@


1.692
log
@revert "defflag VMSWAP" changes for now.
there seems to be far more people who don't want to edit
their kernel config files than i thought.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.691 2005/07/30 06:35:36 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.691 $"
d961 3
@


1.691
log
@add "options VMSWAP" to non INSTALL kernels.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.690 2005/07/29 14:57:30 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.690 $"
a1291 2

options	VMSWAP			# Swap device/file support
@


1.690
log
@VERIFIED_EXEC_DEUBG{,_VERBOSE} is obsolete.

XXX: Too bad we can't have some MI config file. :)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.689 2005/07/18 12:02:21 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.689 $"
d1292 2
@


1.689
log
@Add uipaq driver.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.688 2005/07/17 00:08:28 hubertf Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.688 $"
a225 3
#
#options VERIFIED_EXEC_DEBUG
#options VERIFIED_EXEC_DEBUG_VERBOSE
@


1.688
log
@Add support for reading cloop2 compressed filesystem image,
enable by putting VND_COMPRESSION into kernel config file.
Written by Cliff Wright, polished up slightly by me.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.687 2005/07/16 23:20:00 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.687 $"
d1015 3
d1061 1
d1072 1
@


1.687
log
@Remove duplicate IPSEC_NAT_T line introduced in previous.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.686 2005/07/16 22:54:34 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.686 $"
d1245 1
@


1.686
log
@Say what sbp is.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.685 2005/07/11 15:37:04 kiyohara Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.685 $"
a183 1
#options 	IPSEC_NAT_T	# nat traversal
@


1.685
log
@ieee1394 import from FreeBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.684 2005/07/07 17:05:47 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.684 $"
d184 1
d1067 1
a1067 1
sbp*	at ieee1394if? euihi ? euilo ?
@


1.684
log
@Add (commented out) IPSEC_NAT_T option.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683 2005/07/03 19:23:29 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683 $"
d1059 1
a1059 1
fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
d1062 1
a1062 1
#fwohci* at cardbus? dev ? function ?	# IEEE1394 Open Host Controller
d1064 3
a1066 6
fw*	at fwbus?			# IP over 1394

# IEEE1394 nodes
fwnode* at fwbus? idhi ? idlo ?
sbpscsi* at fwnode?
scsibus* at sbpscsi?
@


1.683
log
@Remove 'scsibus* at umass?'.  It shouldn't be needed, as umass correctly
defines the scsi attribute.  So if a device doesn't work without that
attachment, it means there is a bug elsewhere we have to fix.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.682 2005/07/02 11:19:23 rpaulo Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.682 $"
d182 1
@


1.683.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683 2005/07/03 19:23:29 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683 $"
a45 3
# AMD PowerNow! K7
#options 	POWERNOW_K7

a49 3
options 	MULTIBOOT	# Multiboot support (see multiboot(8))
#options 	MULTIBOOT_SYMTAB_SPACE=1048576

a129 1
options 	COMPAT_30	# NetBSD 3.0
a141 1
#options 	COMPAT_NDIS	# NDIS network driver
d164 1
a164 3
file-system	PTYFS		# /dev/ptm support
#file-system	TMPFS		# experimental - Efficient memory file-system
#file-system	UDF		# experimental - OSTA UDF CD/DVD file-system
d170 1
a170 1
#options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
d172 1
a172 1
#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
a181 1
#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
d212 17
d263 1
a263 1
options 	WSDISPLAY_CUSTOM_BORDER	# custom border colors via wsconsctl(8)
d273 1
a273 1
# see dev/pckbport/wskbdmap_mfii.c for implemented layouts
d284 4
a291 3
# enable splash screen support; requires hw driver support
#options 	SPLASHSCREEN
#options 	SPLASHSCREEN_PROGRESS
d337 1
a362 3
# Sony LCD brightness etc.
#sony* 		at acpi?		# Sony Miscellaneous Controller

a419 1
gpio* 	at elansc?
a423 4
piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
#gscpcib* at pci? dev ? function ?	# NS Geode PCI-ISA w/ GPIO support
#viapcib* at pci? dev ? function ?	# VT8235 PCI-ISA w/ SMBus support
#iic*	at viapcib?
a440 3
isa0	at piixpcib?
#isa0	at gscpcib?
#isa0	at viapcib?
a507 10
# VESA framebuffer console
#options 	KVM86			# required for vesabios
#vesabios*	at vesabiosbus?
#vesafb* 	at vesabios?
#options 	VESAFB_WIDTH=640
#options 	VESAFB_HEIGHT=480
#options 	VESAFB_DEPTH=8
#options 	VESAFB_PM		# power management support
#wsdisplay*	at vesafb? console ?

d529 1
a529 1
#com*	at cardbus? function ?	# Modems and serial cards
a569 14
# AMD 768 and 8111 power/ACPI controllers
amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
#iic*	at amdpm?			# sensors below are on this bus
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

# Intel PIIX4 power management controllers
piixpm* at pci? dev ? function ?	# PIIX4 compatible PM controller
iic*	at piixpm?			# SMBus on PIIX4

# iTE IT87xxF and compatible hardware monitors
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00.

d571 1
a571 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310.
a574 1
#gpio*		at nsclpcsio?
a586 9
# GPIO devices
#gpio*	at gscpcib?

# 1-Wire support
#gpioow* 	at gpio? offset 6 mask 0x1	# 1-wire bitbanging via gpio
#onewire*	at gpioow?

# 1-Wire devices
#owtemp* 	at onewire?			# Temperature sensors
d642 3
a644 3
#adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
#ahc*	at cardbus? function ?	# Adaptec ADP-1480
#njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
a666 1
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
a703 1
svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
a781 1
dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
a795 1
#ndis* 	at pci? dev ? function ?	# Experimental - NDIS Network Driver
a796 1
nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
a799 1
ral*	at pci? dev ? function ?	# ralink wifi
a814 1
xge*	at pci? dev ? function ?	# Neterion (S2io) Xframe-I 10GbE
d879 6
a884 8
#ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
#atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
#ex*	at cardbus? function ?	# 3Com 3C575TX
#fxp*	at cardbus? function ?	# Intel i8255x
#rtk*	at cardbus? function ?	# Realtek 8129/8139
#ral*	at cardbus? function ?	# Ralink Technology
#rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
#tlp*	at cardbus? function ?	# DECchip 21143
a916 2
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
d932 2
a933 3
#ehci*	at cardbus? function ?	# Enhanced Host Controller
#ohci*	at cardbus? function ?	# Open Host Controller
#uhci*	at cardbus? function ?	# Universal Host Controller (Intel)
a962 3
# USB serial adpater
ucycom*	at uhidev? reportid ?

d1001 1
a1001 1
# USB 802.11 adapters
a1002 1
ral*	at uhub? port ?		# Ralink Technology RT25x0 802.11a/b/g
a1013 3
uipaq*	at uhub? port ?		# iPAQ PDAs
ucom*	at uipaq? portno ?

a1039 3
# Topfield TF5000PVR range of DVB recorders
utoppy*	at uhub? port ?

a1056 1

d1058 1
a1058 1
fwohci*	at pci? dev ? function ?	# IEEE1394 Open Host Controller
d1061 1
a1061 1
#fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
d1063 1
a1063 3
ieee1394if* at fwohci?
fwip*	at ieee1394if?			# IP over IEEE1394
sbp*	at ieee1394if? euihi ? euilo ?	# SCSI over IEEE1394
d1065 4
a1130 1
mpu*	at isapnp?
a1175 26
# Bluetooth Controller and Device support

# Bluetooth PCMCIA Controllers
bt3c* at pcmcia? function ?		# 3Com 3CRWB6096-A

# Bluetooth USB Controllers
ubt* at uhub? port ? configuration ? interface ?

# Bluetooth remote device 'hub'
pseudo-device bthub

# Bluetooth HID support
bthidev* at bthub?

# Bluetooth Mouse
btms* at bthidev? reportid ?
wsmouse* at btms? mux 0

# Bluetooth Keyboard
btkbd* at bthidev? reportid ?
wskbd* at btkbd? console ? mux 1

# Bluetooth Audio support
bthset* at bthub?


a1209 3
geodegcb*  at pci? dev ? function ?	# Geode GCB area
geodewdog* at geodegcb? 		# AMD Geode SC1100 watchdog timer
geodecntr* at geodegcb? 		# AMD Geode SC1100 high res. counter
d1224 1
a1224 2
pseudo-device 	crypto		# /dev/crypto device
pseudo-device	swcrypto	# software crypto implementation
d1241 4
d1246 1
a1246 2
pseudo-device	vnd			# disk-like interface to files
options 	VND_COMPRESSION		# compressed vnd(4)
d1249 1
a1249 1
pseudo-device	bpfilter		# Berkeley packet filter
d1252 1
a1252 1
pseudo-device	ppp			# Point-to-Point Protocol
d1254 2
a1255 2
pseudo-device	sl			# Serial Line IP
pseudo-device	strip			# Starmode Radio IP (Metricom)
d1258 5
a1262 5
pseudo-device	tun			# network tunneling over tty
pseudo-device	gre			# generic L3 over IP tunnel
pseudo-device	gif			# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith			# IPv[46] tcp relay translation i/f
pseudo-device	stf			# 6to4 IPv6 over IPv4 encapsulation
d1271 1
a1276 1
pseudo-device	ksyms			# /dev/ksyms
d1284 3
d1290 1
a1290 17

# Veriexec
#options VERIFIED_EXEC
#
# a pseudo device needed for veriexec
#pseudo-device	veriexec		1
#
# Uncomment the fingerprint methods below that are desired. Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
#options VERIFIED_EXEC_FP_RMD160
#options VERIFIED_EXEC_FP_SHA256
#options VERIFIED_EXEC_FP_SHA384
#options VERIFIED_EXEC_FP_SHA512
#options VERIFIED_EXEC_FP_SHA1
#options VERIFIED_EXEC_FP_MD5
@


1.683.2.2
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.1 2006/06/21 14:52:09 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.1 $"
d30 1
a30 1
#options 	I386_CPU
a34 3
makeoptions	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
							# tune for more modern

d36 1
a36 1
#options 	MATH_EMULATE	# floating point emulation
d47 1
a47 4
options 	POWERNOW_K7

# AMD PowerNow! and Cool`n'Quiet technology
options 	POWERNOW_K8
d54 1
d84 1
a84 1
#options 	SYSTRACE	# system call vetting via systrace(1)
d173 1
a173 1
file-system	TMPFS		# Efficient memory file-system
a179 2
# Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
# It is not recommended for general use.
d196 2
d200 1
a206 1
options 	IPFILTER_LOOKUP	# ippool(8) support
a264 1
#options 	WSKBD_USONLY			# strip off non-US keymaps
d269 1
a269 1
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver
a314 3
#IPMI support
#ipmi0		at mainbus?

d322 3
a324 1
#options 	ACPI_SCANPCI	# find PCI roots using ACPI
a349 1
#ym* 		at acpi?		# Yamaha OPL3-SA[23] audio
d369 1
a369 1
#ym*		at pnpbios? index ?	# Yamaha OPL3-SA[23] audio
d422 1
a422 1
#viapcib* at pci? dev ? function ?	# VIA VT8235 PCI-ISA w/ SMBus support
d595 1
a595 1
#it0	at isa? port 0x290		# other ports: 0xc00, 0xd00
d598 1
a598 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310
a635 1
mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
a654 1
spc* 	at pcmcia? function ?		# Fujitsu MB87030/MB89352 SCSI
a707 1
twa*	at pci? dev ? function ?	# 3ware Escalade 95xx RAID controllers
a713 1
ld*	at twa? unit ?
a726 1
ahcisata* 	at pci? dev ? function ?	# AHCI SATA controllers
a751 3
# CardBus IDE controllers
#njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32

a820 1
bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
a834 2
mskc*	at pci? dev ? function ?	# Marvell Yukon 2 Gigabit Ethernet
msk*	at mskc?			# Marvell Yukon 2 Gigabit Ethernet
a840 1
ral*	at pci? dev ? function ?	# Ralink Technology RT25x0 802.11a/b/g
d842 1
a843 1
rtw*	at pci? dev ? function ?	# Realtek 8180L (802.11)
a857 1
wpi*	at pci? dev ? function ?	# Intel PRO/Wireless 3945ABG
a954 1
ikphy*	at mii? phy ?			# Intel 82563 PHYs
d1012 1
a1012 1
# USB serial adapter
a1055 1
rum*	at uhub? port ?		# Ralink Technology RT2501/RT2601 802.11a/b/g
a1107 2
# On ugen bulk endpoints, perform read-ahead and write-behind.
options UGEN_BULK_RA_WB
d1155 1
a1155 1
ym*	at isapnp?			# Yamaha OPL3-SA[23] audio
d1243 2
a1244 3
# Bluetooth Device Hub
bthub* at bt3c?
bthub* at ubt?
d1258 1
a1258 1
btsco* at bthub?
a1287 1
#joy*	at eap?				# See CAVEATS in eap(4) before enabling
a1335 1
#pseudo-device	carp			# Common Address Redundancy Protocol
a1373 2
options 	FILEASSOC		# fileassoc(9) - required for Veriexec

d1375 4
a1378 1
pseudo-device	veriexec
d1384 6
a1389 8
options VERIFIED_EXEC_FP_RMD160
options VERIFIED_EXEC_FP_SHA256
options VERIFIED_EXEC_FP_SHA384
options VERIFIED_EXEC_FP_SHA512
options VERIFIED_EXEC_FP_SHA1
options VERIFIED_EXEC_FP_MD5

options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
@


1.683.2.3
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.2 2006/12/30 20:46:04 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.2 $"
a54 3
# VIA PadLock
#options	VIA_PADLOCK

a128 3
#options 	SYSCALL_STATS	# per syscall counts
#options 	SYSCALL_TIMES	# per syscall times
#options 	SYSCALL_TIMES_HASCOUNTER	# use 'broken' rdtsc (soekris)
d143 1
a143 1
#options 	COMPAT_386BSD_MBRPART # recognize old partition ID
d612 3
a614 2
# VIA VT82C686A/VT8231 Hardware Monitor and Power Management Timer
#viaenv*	at pci? dev ? function ?
a1381 2
# srt is EXPERIMENTAL
#pseudo-device	srt			# source-address-based routing
a1390 1
pseudo-device	lockstat		# lock profiling
@


1.683.2.4
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.3 2007/02/26 09:06:50 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.3 $"
a57 3
# Intel(R) On Demand Clock Modulation (aka ODCM)
# options 	INTEL_ONDEMAND_CLOCKMOD

a147 1
options 	COMPAT_40	# NetBSD 4.0
a185 1
#file-system	HFS		# experimental - Apple HFS+ (read-only)
d209 1
a209 1
#options 	ISO,TPIP	# OSI
d236 1
a236 1
options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
d246 1
d310 1
a310 1
ioapic* at mainbus?
d337 1
a337 1
options 	ACPI_SCANPCI	# find PCI roots using ACPI
d339 1
a339 1
acpi0 		at mainbus0
d345 6
a350 7
apm*		at acpi?		# ACPI apm emulation
acpiacad* 	at acpi?		# ACPI AC Adapter
acpibat* 	at acpi?		# ACPI Battery
acpibut* 	at acpi?		# ACPI Button
acpiec* 	at acpi?		# ACPI Embedded Controller
acpilid* 	at acpi?		# ACPI Lid Switch
acpitz* 	at acpi?		# ACPI Thermal Zone
d353 2
a354 3
aiboost*	at acpi?		# ASUS AI Booster Hardware Monitor
attimer*	at acpi?		# AT Timer
com* 		at acpi?		# Serial communications interface
d356 8
a363 10
hpet* 		at acpi?		# High Precision Event Timer
joy*		at acpi?		# Joystick/Game port
lpt* 		at acpi?		# Parallel port
mpu*		at acpi?		# Roland MPU-401 MIDI UART
npx*		at acpi?		# Math coprocessor
pckbc*  	at acpi?		# PC keyboard controller
pcppi*		at acpi?                # AT-style speaker sound
ug* 		at acpi?		# Abit uGuru Hardware monitor
wss* 		at acpi?		# NeoMagic 256AV in wss mode
ym* 		at acpi?		# Yamaha OPL3-SA[23] audio
d366 2
a367 2
spic* 		at acpi?		# Sony Programmable I/O Controller
wsmouse* 	at spic?
d370 1
a370 1
sony* 		at acpi?		# Sony Miscellaneous Controller
d373 1
a373 1
vald* at acpi?
d432 2
a433 2
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ timecounter,
					# watchdog and SpeedStep support
a534 4
# VIA Unichrome framebuffer console
#unichromefb* 	at pci? dev ? function ?
#wsdisplay* 	at unichromefb?

d556 1
a556 1
com*	at cardbus? function ?	# Modems and serial cards
d600 3
a602 9

# Intel ICH SMBus controller
ichsmb*	at pci? dev ? function ?
iic*	at ichsmb?

# NVIDIA nForce2/3/4 SMBus controller
nfsmbc*	at pci? dev ? function ?
nfsmb*	at nfsmbc?
iic*	at nfsmb?
a607 4
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

a613 3
# SMSC LPC47B397 hardware monitor functions
#smsc0	at isa? port 0x02e

a617 3
# Abit uGuru Hardware system monitor
#ug0    at isa? port 0xe0

a620 5
# Serial Presence Detect capable memory modules
#spdmem* at iic? addr 0x50
#spdmem* at iic? addr 0x51
#spdmem* at iic? addr 0x52
#spdmem* at iic? addr 0x53
d694 3
a696 3
adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc*	at cardbus? function ?	# Adaptec ADP-1480
njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
a747 1
gcscide* 	at pci? dev ? function ? 	# AMD CS5535 Companion IDE controllers
a751 2
jmide* 		at pci? dev ? function ? 	# JMicron PCI-e PATA/SATA controllers
ahcisata* 	at jmide?
a781 1
options	ATADEBUG
d949 8
a956 8
ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
ex*	at cardbus? function ?	# 3Com 3C575TX
fxp*	at cardbus? function ?	# Intel i8255x
ral*	at cardbus? function ?	# Ralink Technology RT25x0 802.11a/b/g
rtk*	at cardbus? function ?	# Realtek 8129/8139
rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
tlp*	at cardbus? function ?	# DECchip 21143
a1002 1
gcscehci* at pci? dev ? function ?	# Enhanced Host Controller (Geode CSC)
d1007 3
a1009 3
ehci*	at cardbus? function ?		# Enhanced Host Controller
ohci*	at cardbus? function ?		# Open Host Controller
uhci*	at cardbus? function ?		# Universal Host Controller (Intel)
a1013 3
# PCMCIA USB controllers   
slhci*	at pcmcia? function ?		# ScanLogic SL811HS

a1015 1
usb*	at gcscehci?
a1016 1
usb*	at slhci?
d1018 1
d1022 1
a1022 1
uhub*	at uhub? port ?
a1083 1
zyd*	at uhub? port ?		# Zydas ZD1211
a1103 3
uslsa*	at uhub? port ?		# Silicon Labs USB-RS232 serial adapter
ucom*	at uslsa? portno ?

d1151 1
a1151 1
fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
a1268 1
btbc* at pcmcia? function ?		# AnyCom BlueCard LSE041/039/139
d1271 1
a1271 1
ubt* at uhub? port ?
a1274 2
bthub* at btbc?
bthub* at btuart?
a1305 1
glxsb*	at pci? dev ? function ?	# AMD Geode LX Security Block
a1347 1
pseudo-device	bio			# RAID control device driver
a1384 1
pseudo-device	agr			# IEEE 802.3ad link aggregation
a1398 1
pseudo-device	btuart			# Bluetooth HCI UART (H4)
@


1.683.2.5
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.4 2007/09/03 14:26:29 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.4 $"
a131 1
#options 	DDB_VERBOSE_HELP
d185 6
a190 6
file-system 	CODA		# Coda File System; also needs vcoda (below)
file-system 	SMBFS		# experimental - CIFS; also needs nsmb (below)
file-system 	PTYFS		# /dev/ptm support
file-system 	TMPFS		# Efficient memory file-system
#file-system 	UDF		# experimental - OSTA UDF CD/DVD file-system
#file-system 	HFS		# experimental - Apple HFS+ (read-only)
a439 2
#amdpcib* at pci? dev ? function ?	# AMD 8111 PCI-ISA w/ HPET
#hpet* 	at amdpcib?
d442 1
a442 1
#piixpcib* at pci? dev ? function ?	# Intel PIIX4 PCI-ISA w/ SpeedStep
a461 1
#isa0 	at amdpcib?
d463 1
a463 1
#isa0	at piixpcib?
d522 1
a522 1
options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
a629 3
# IBM Thinkpad Active Protection System
#aps0 	at isa? port 0x1600

d807 1
a807 1
njata*	at cardbus? function ? flags 0x01	# Workbit NinjaATA-32
a990 1
re*	at cardbus? function ?	# Realtek 8139C+/8169/8169S/8110S
a1108 3
stuirda* at uhub? port ? configuration ? interface ?
irframe* at stuirda?

a1134 3
uchcom*	at uhub? port ?		# WinChipHead CH341/CH340 serial adapter
ucom*	at uchcom? portno ?

a1184 3
# USB generic serial port (e.g., data over cellular)
ugensa*	at uhub? port ?
ucom*	at ugensa?
d1400 1
a1400 1
pseudo-device	cgd		4	# cryptographic disk devices
@


1.683.2.6
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.5 2007/10/27 11:26:22 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.5 $"
d29 6
d59 1
a59 1
#options 	INTEL_ONDEMAND_CLOCKMOD
d99 4
d104 1
d512 9
a616 3
# Intel Core's on-die Thermal sensor
options 	INTEL_CORETEMP

a1479 3
# pseudo audio device driver
pseudo-device	pad

@


1.683.2.7
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.6 2007/11/15 11:42:47 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.6 $"
d350 1
a350 1
#com* 		at acpi?		# Serial communications interface
d354 1
a354 1
#lpt* 		at acpi?		# Parallel port
d621 1
a621 1
#itesio0 	at isa? port 0x2e
a739 1
arcmsr* at pci? dev ? function ?	# Areca SATA RAID controllers
a1320 1
bthub* at bcsp?
a1450 1
pseudo-device	bcsp			# BlueCore Serial Protocol
@


1.683.2.8
log
@sync with head
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.7 2007/12/07 17:24:54 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.7 $"
d29 1
a29 1
makeoptions 	CPUFLAGS="-march=i486 -mtune=pentiumpro" # Assume at least 486,
d33 1
d50 1
a50 1
#options 	VIA_PADLOCK
a78 7
# The following options limit the overall size of physical memory
# and/or the maximum address used by the system.
# Contrary to REALBASEMEM and REALEXTMEM, they still use the BIOS memory map
# and can deal with holes in the memory layout.
#options 	PHYSMEM_MAX_SIZE=64	# max size of physical memory (in MB)
#options 	PHYSMEM_MAX_ADDR=2048	# don't use memory above this (in MB)

d89 1
a96 3
options 	MULTIPROCESSOR	# SMP
options 	APM_NO_IDLE	# needed for SMP
options 	MPBIOS		# configure CPUs and APICs using MPBIOS
d124 1
a124 1
#makeoptions 	DEBUG="-g"	# compile full symbol table
a157 7
# Wedge support
options 	DKWEDGE_AUTODISCOVER	# Automatically add dk(4) instances
options 	DKWEDGE_METHOD_GPT	# Supports GPT partitions as wedges
# The following two options can break /etc/fstab, so handle with care
#options 	DKWEDGE_METHOD_BSDLABEL	# Support disklabel entries as wedges
#options 	DKWEDGE_METHOD_MBR	# Support MBR partitions as wedges

d343 1
a343 5
# The ACPI Embedded Controller is generally configured via the special ECDT.
# This is required as parts of the DSDT can reference the EC before the normal
# attach phase.
acpiec* 	at acpi?		# ACPI Embedded Controller (late binding)
acpiecdt* 	at acpi?		# ACPI Embedded Controller (early binding)
a358 1
thinkpad*	at acpi?		# IBM/Lenovo Thinkpad hotkeys
d433 1
a433 4
					# watchdog, SpeedStep and HPET
#hpet* 	at ichlpcib?
gcscpcib* at pci? dev ? function ?	# AMD CS5535/CS5536 PCI-ISA w/
gpio* 	at gcscpcib?			# timecounter, watchdog and GPIO
a454 1
isa0 	at gcscpcib?
d620 1
a620 1
# iTE IT87xxF Super I/O with watchdog and sensors support
d1044 1
a1044 1
# PCMCIA USB controllers
a1468 3
# userland interface to drivers, including autoconf and properties retrieval
pseudo-device	drvctl

d1485 1
a1485 2
options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
options 	PAX_ASLR=0		# PaX Address Space Layout Randomization
@


1.683.2.9
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.8 2008/01/21 09:36:49 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.8 $"
d27 1
a27 1
maxusers	64		# estimated number of users
a1109 4
# Huawei E220 3G/HSDPA modem
uhmodem* at uhub? port ? configuration ? interface ?
ucom*	at uhmodem? portno ?

@


1.683.2.10
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.683.2.9 2008/02/04 09:22:00 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.683.2.9 $"
d1419 1
a1419 1
cinclude "arch/i386/conf/GENERIC.local"
@


1.682
log
@Uncomment WSDISPLAY_SCROLLSUPPORT. A lot of people ask for this feature
and it doesn't make much sens to recompile just to have scrolling support.

Ok'ed by Christos Zoulas and Hubert Feyrer.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.681 2005/06/28 09:08:04 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.681 $"
a974 1
scsibus* at umass?
@


1.681
log
@pss(4) was removed, remove it from kernel configs too.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.680 2005/06/25 12:05:17 rpaulo Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.680 $"
d289 1
a289 1
#options 	WSDISPLAY_SCROLLSUPPORT
@


1.680
log
@Add file-system PTYFS (commented out) so that people know its existence.

Ok'ed by Christos Zoulas and Hubert Feyrer.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.679 2005/06/21 08:19:25 sekiya Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.679 $"
a1105 2
#pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
#sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
@


1.679
log
@Rework the configuration scheme for PCI fixups:

* bus enumeration fixups are not PCIBIOS-specific, interrupt fixups are done
  by both PCIBIOS and ACPI.  The redundancy is very redundant.  Therefore,
  rename PCIBIOS_*_FIXUP to PCI_*_FIXUP, use PCI_INTR_FIXUP in place of
  ACPI_PCI_FIXUP, and change code refences to match.

* move the fixup defines from opt_pcibios.h to opt_pcifixup.h to reflect
  the above.

* fix up the PCI bus numbering in mainbus_attach(), right after we detect the
  configuration mode.  This probably renders the fixup in pcibios.c
  redundant -- but it should be harmless.

These changes make cardbus work in ACPI-only machines, when PCI_BUS_FIXUP
and PCI_INTR_FIXUP are defined.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.678 2005/06/21 02:23:13 kent Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.678 $"
d164 1
@


1.678
log
@add "azalia at pci"
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.677 2005/06/19 00:23:43 chs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.677 $"
d333 1
a333 1
#options 	ACPI_PCI_FIXUP		# PCI interrupt routing via ACPI
a401 3
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O addresses
#options 	PCIBIOS_BUS_FIXUP	# fixup PCI bus numbering
#options 	PCIBIOS_INTR_FIXUP	# fixup PCI interrupt routing
d412 5
@


1.677
log
@uncomment hme, add more missing NICs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.676 2005/06/18 17:34:18 chs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.676 $"
d1076 1
@


1.676
log
@alphabetize.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.675 2005/06/18 16:12:19 chs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.675 $"
d787 1
a787 1
#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
@


1.675
log
@add txp.  uncomment the firewire stuff.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.674 2005/06/09 14:43:30 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.674 $"
d786 2
a789 2
gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
@


1.674
log
@- Rename options NEW_BUFQ_STRATEGY -> options BUFQ_READPRIO.
  (still commented out)
- Add (also commented out) options BUFQ_PRIOCSCAN.

Suggested by perry and soda on tech-kern.
Please refer options(4) for details for these options.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.673 2005/05/17 17:20:41 hubertf Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.673 $"
d807 1
d1056 1
a1056 1
#fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
d1061 1
a1061 1
#fw*	at fwbus?			# IP over 1394
d1064 3
a1066 3
#fwnode* at fwbus? idhi ? idlo ?
#sbpscsi* at fwnode?
#scsibus* at sbpscsi?
@


1.673
log
@Fix comments:
Comments in kernel config files start with #, and are not enclosed in /* */
Noted by Patrick Welche <prlw1@@newn.cam.ac.uk> on current-users@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.672 2005/05/06 04:42:24 elad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.672 $"
d105 2
a106 1
#options 	NEW_BUFQ_STRATEGY
@


1.672
log
@Change pseudo-device name from "verifiedexec" to "veriexec", as it appears
in majors.i386.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.671 2005/05/04 02:40:55 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.671 $"
d272 2
a273 2
#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" /* for pckbd driver */
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  /* for ukbd driver */
@


1.671
log
@Mention PCKBD_CNATTACH_MAY_FAIL, but don't define it.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.670 2005/05/04 01:55:24 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.670 $"
d1282 1
a1282 1
#pseudo-device verifiedexec        1
@


1.670
log
@Mention WSKBD_EVENT_AUTOREPEAT.
XXX All the WS options need to be added to options(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.669 2005/04/29 16:58:39 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.669 $"
d269 2
@


1.669
log
@Mention UKBD_LAYOUT, which corresponds to PCKBD_LAYOUT for the ukbd driver.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.668 2005/04/26 12:13:33 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.668 $"
d268 1
@


1.668
log
@Alphabetize.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.667 2005/04/20 13:44:45 blymn Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.667 $"
d269 2
a270 1
#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
@


1.667
log
@Rototill of the verified exec functionality.
  * We now use hash tables instead of a list to store the in kernel
    fingerprints.
  * Fingerprint methods handling has been made more flexible, it is now
    even simpler to add new methods.
  * the loader no longer passes in magic numbers representing the
    fingerprint method so veriexecctl is not longer kernel specific.
  * fingerprint methods can be tailored out using options in the kernel
    config file.
  * more fingerprint methods added - rmd160, sha256/384/512
  * veriexecctl can now report the fingerprint methods supported by the
    running kernel.
  * regularised the naming of some portions of veriexec.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.666 2005/04/15 17:27:21 itohy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.666 $"
d342 1
a349 1
#attimer*	at acpi?		# AT Timer
@


1.666
log
@Add ukyopon(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.665 2005/04/10 23:02:01 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.665 $"
d210 17
d1277 3
@


1.665
log
@change a set of spaces to " \t"
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.664 2005/04/03 11:39:07 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.664 $"
d1005 4
@


1.664
log
@add tra* at mca?
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.663 2005/03/25 23:28:44 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.663 $"
d333 1
a333 1
#pcppi*         at acpi?                # AT-style speaker sound
@


1.663
log
@Add attimer(4) configurations everywhere pcppi(4) exists, with the
following rule:
  If a pcppi device is enabled for an attachment, enable an attimer for the
  same attachement, otherwise comment it.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.662 2005/03/21 14:15:27 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.662 $"
d867 1
@


1.662
log
@Add "pcppi* at acpi?" commented out.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661 2005/03/03 23:02:01 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661 $"
d332 1
d483 1
@


1.661
log
@Backout last commit because an entry for atu(4) already existed.
Problem noted by FUKAUMI Naoki on current-users mailing list.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.659 2005/02/20 18:39:41 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.659 $"
d332 1
@


1.661.2.1
log
@Pull up revision 1.666 (requested by itohy in ticket #160):
Add ukyopon(4).
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a1000 4
# Kyocera AIR-EDGE PHONE
ukyopon* at uhub? port ?
ucom*	at ukyopon? portno ?

@


1.661.2.2
log
@Pull up revision 1.667 (requested by elad in ticket #389):
Rototill of the verified exec functionality.
* We now use hash tables instead of a list to store the in kernel
fingerprints.
* Fingerprint methods handling has been made more flexible, it is now
even simpler to add new methods.
* the loader no longer passes in magic numbers representing the
fingerprint method so veriexecctl is not longer kernel specific.
* fingerprint methods can be tailored out using options in the kernel
config file.
* more fingerprint methods added - rmd160, sha256/384/512
* veriexecctl can now report the fingerprint methods supported by the
running kernel.
* regularised the naming of some portions of veriexec.
@
text
@a209 17
# These options control the verified exec feature
#options VERIFIED_EXEC
#
# Uncomment the fingerprint methods below that are desired.  Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
#options VERIFIED_EXEC_FP_RMD160
#options VERIFIED_EXEC_FP_SHA256
#options VERIFIED_EXEC_FP_SHA384
#options VERIFIED_EXEC_FP_SHA512
#options VERIFIED_EXEC_FP_SHA1
#options VERIFIED_EXEC_FP_MD5
#
#options VERIFIED_EXEC_DEBUG
#options VERIFIED_EXEC_DEBUG_VERBOSE

a1255 3
# a pseudo device needed for verified exec
#pseudo-device verifiedexec        1

@


1.661.2.3
log
@Pull up revision 1.672 (requested by elad in ticket #389):
Change pseudo-device name from "verifiedexec" to "veriexec", as it appears
in majors.i386.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.2 2005/06/10 14:49:03 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.2 $"
d1274 1
a1274 1
#pseudo-device veriexec		1
@


1.661.2.4
log
@Pull up revision 1.678 (requested by kent in ticket #494):
add "azalia at pci"
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a1065 1
azalia*	at pci? dev ? function ?	# High Definition Audio
@


1.661.2.5
log
@Pull up revision 1.684 (requested by tron in ticket #566):
Add (commented out) IPSEC_NAT_T option.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.4 2005/07/02 16:35:18 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.4 $"
a179 1
#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
@


1.661.2.6
log
@Pull up revision 1.688 (requested by hubertf in ticket #625):
Add support for reading cloop2 compressed filesystem images,
enable by putting VND_COMPRESSION into kernel config file.
Written by Cliff Wright, polished up slightly by me.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.5 2005/07/18 21:12:51 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.5 $"
a1237 1
options 	VND_COMPRESSION		# compressed vnd(4)
@


1.661.2.7
log
@Pull up following revision(s) (requested by tron in ticket #786):
	sys/arch/amd64/conf/GENERIC: revision 1.71
	sys/arch/i386/conf/GENERIC.MPACPI: revision 1.46
	sys/arch/i386/conf/GENERIC: revision 1.700
Add 10 Gigabit Ethernet drivers dge(4) and xge(4).
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a771 1
dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
a803 1
xge*	at pci? dev ? function ?	# Neterion (S2io) Xframe-I 10GbE
@


1.661.2.8
log
@Pullup  (requested by chs in ticket #912)
 Fix txp cards so this compiles and enable in GENERIC.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.7 2005/09/15 23:33:43 snj Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.7 $"
d783 1
a783 1
hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
a800 1
txp*	at pci? dev ? function ?	# 3com 3cr990
@


1.661.2.8.2.1
log
@Pull up following revision(s) (requested by adrianp in ticket #1826):
	sys/arch/hp300/conf/GENERIC: revision 1.141 via patch
	sys/arch/amd64/conf/GENERIC: revision 1.154 via patch
	sys/arch/cats/conf/GENERIC: revision 1.116 via patch
	sys/arch/arc/conf/GENERIC: revision 1.148 via patch
	sys/arch/acorn32/conf/GENERIC: revision 1.80 via patch
	sys/arch/sparc/conf/GENERIC: revision 1.200 via patch
	sys/arch/sparc64/conf/GENERIC: revision 1.88 via patch
	sys/arch/atari/conf/GENERIC.in: revision 1.68 via patch
	sys/arch/amiga/conf/GENERIC: revision 1.248 via patch
	sys/arch/i386/conf/GENERIC.MPACPI: patch
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66 via patch
	sys/arch/i386/conf/GENERIC: revision 1.840 via patch
	sys/arch/amiga/conf/GENERIC.in: revision 1.61 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68 via patch
	sys/arch/mac68k/conf/GENERIC: revision 1.182 via patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@@
Ok'ed by core@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.8 2005/10/28 20:12:42 jmc Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.8 $"
d186 1
a186 1
#options 	ISO,TPIP	# OSI
@


1.661.2.9
log
@Pull up following revision(s) (requested by tls in ticket #1180):
	sys/arch/amd64/conf/GENERIC: revision 1.87
	sys/arch/i386/conf/GENERIC: revision 1.727
Add amdpm -- without this, we're throwing away a good hardware random
number source on a huge set of machines.  Also, now that amdpm has
support for the SMBus controller, add (commented-out, since we don't
always know what address the sensors are at) iic at amdpm and adt7463c
at iic, which is the configuration used on the Tyan S2881 and S2882-D
server boards.  This should work in either 64-bit or 32-bit mode; it's
been tested in 64-bit mode.  Addresses PR kern/32463 submitted by
Anil Gopinath.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a559 7
# AMD 768 and 8111 power/ACPI controllers
amdpm*	at pci? dev ? function ?	# RNG and SMBus 1.0 interface
#iic*	at amdpm?			# sensors below are on this bus
#adt7463c* at iic? addr 0x2C		# Unknown other motherboard(s)
#adt7463c* at iic? addr 0x2D		# Tyan S2881
#adt7463c* at iic? addr 0x2E		# Tyan S2882-D

@


1.661.2.10
log
@Pull up following revision(s) (requested by tron in ticket #1266):
	sys/arch/amd64/conf/GENERIC: revision 1.88
	sys/arch/i386/conf/INSTALL: revision 1.282
	sys/arch/amd64/conf/INSTALL: revision 1.48
	sys/arch/i386/conf/XEN0: revision 1.35
	sys/arch/i386/conf/GENERIC: revision 1.733
add nfe.
@
text
@a794 1
nfe*	at pci?	dev ? function ?	# NVIDIA nForce Ethernet
@


1.661.2.11
log
@Pull up following revision(s) (requested by martti in ticket #1258):
	sys/arch/i386/conf/INSTALL: revision 1.284
	sys/arch/i386/conf/GENERIC: revision 1.741
	sys/arch/amd64/conf/GENERIC: revision 1.91
	sys/arch/i386/conf/INSTALL_SMALL: revision 1.125
	sys/arch/amd64/conf/INSTALL: revision 1.50
	sys/arch/i386/conf/INSTALL_TINY: revision 1.102
Added ciss(4). Tested by Joseph Dacuma on HP DL-380 G3 with Smart Array 5i.
@
text
@a663 1
ciss*	at pci? dev ? function ?	# HP Smart Array controllers
@


1.661.2.12
log
@Pull up following revision(s) (requested by jonathan in ticket #1298):
	share/man/man4/pciide.4: revision 1.60
	share/man/man4/Makefile: revision 1.376 via patch
	sys/dev/pci/svwsata.c: revision 1.1
	sys/dev/pci/files.pci: revision 1.243
	sys/arch/i386/conf/INSTALL: revision 1.281
	sys/dev/pci/pcidevs: revision 1.771 via patch
	sys/dev/pci/pciidevar.h: revision 1.33
	sys/arch/i386/conf/XEN0: revision 1.34
	sys/arch/i386/conf/GENERIC: revision 1.732
	sys/dev/pci/pciide_svwsata_reg.h: revision 1.1
Add svwsata(4), a driver for Serverworks K2 SATA controllers. From
OpenBSD via Joerg Sonnenberger.
@
text
@a701 1
svwsata* 	at pci? dev ? function ?	# ServerWorks SATA controllers
@


1.661.2.13
log
@Pull up following revision(s) (requested by riz in ticket #1331):
	sys/arch/i386/conf/GENERIC: revision 1.701
	sys/arch/i386/pci/geodereg.h: revision 1.1
	sys/arch/i386/conf/files.i386: revision 1.270
	sys/arch/i386/pci/geode.c: revision 1.1
Add a driver for the watchdog timer on the AMD Geode SC1100.
@
text
@a1214 2
geodewdog* at pci? dev ? function ?	# AMD Geode SC1100 watchdog timer

@


1.661.2.14
log
@Apply patch (requested by bouyer in ticket #1441):
Pullup the twa(4) driver for the 3ware Apache RAID controllers.
Matching revisions in current:
share/man/man4/twa.4	1.1
sys/dev/pci/ld_twa.c	1.2
sys/dev/pci/twa.c	1.9
sys/dev/pci/twaio.h	1.3
sys/dev/pci/twareg.h	1.5
sys/dev/pci/twavar.h	1.5
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.13 2006/05/20 12:25:39 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.13 $"
a668 1
twa*	at pci? dev ? function ?	# 3ware Escalade 9xxx RAID controllers
a674 1
ld*	at twa? unit ?
@


1.661.2.14.2.1
log
@Pull up following revision(s) (requested by adrianp in ticket #1826):
	sys/arch/hp300/conf/GENERIC: revision 1.141 via patch
	sys/arch/amd64/conf/GENERIC: revision 1.154 via patch
	sys/arch/cats/conf/GENERIC: revision 1.116 via patch
	sys/arch/arc/conf/GENERIC: revision 1.148 via patch
	sys/arch/acorn32/conf/GENERIC: revision 1.80 via patch
	sys/arch/sparc/conf/GENERIC: revision 1.200 via patch
	sys/arch/sparc64/conf/GENERIC: revision 1.88 via patch
	sys/arch/atari/conf/GENERIC.in: revision 1.68 via patch
	sys/arch/amiga/conf/GENERIC: revision 1.248 via patch
	sys/arch/i386/conf/GENERIC.MPACPI: patch
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66 via patch
	sys/arch/i386/conf/GENERIC: revision 1.840 via patch
	sys/arch/amiga/conf/GENERIC.in: revision 1.61 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68 via patch
	sys/arch/mac68k/conf/GENERIC: revision 1.182 via patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@@
Ok'ed by core@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.14 2006/07/31 12:35:22 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.14 $"
d186 1
a186 1
#options 	ISO,TPIP	# OSI
@


1.661.2.15
log
@Pull up following revision(s) (requested by bouyer in ticket #1608):
	sys/arch/i386/conf/INSTALL: revision 1.299 via patch
	sys/arch/i386/conf/XEN2_DOM0: revision 1.20 via patch
	sys/arch/i386/conf/GENERIC: revision 1.803 via patch
	sys/dev/pci/files.pci: revision 1.275 via patch
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.218 via patch
	sys/arch/amd64/conf/GENERIC: revision 1.123 via patch
	sys/dev/pci/if_bnx.c: revision 1.1 via patch
	share/man/man4/bnx.4: revision 1.1-1.2 via patch
	distrib/sets/lists/man/mi: revision 1.959 via patch
	sys/arch/amd64/conf/INSTALL: revision 1.62 via patch
	sys/dev/microcode/bnx/bnxfw.h: revision 1.1-1.2 via patch
	sys/dev/pci/if_bnxreg.h: revision 1.1 via patch
	share/man/man4/Makefile: revision 1.417 via patch
	sys/arch/i386/conf/INSTALL_LAPTOP: revision 1.112 via patch
Add bnx(4), a driver for Broadcom NetXtreme II 10/100/1000 Ethernet device.
Ported from OpenBSD by cube@@, with some bus_dma fixes by me.
Tested on i386 and amd64.
Add a NetBSD RCS tag.
Nx -> Ox; remove trailing whitespace.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a782 1
bnx* 	at pci? dev ? function ?	# Broadcom NetXtremeII gigabit Ethernet
@


1.661.2.16
log
@Pull up following revision(s) (requested by bouyer in ticket #1609):
	sys/arch/i386/conf/INSTALL: revision 1.298
	sys/arch/i386/conf/GENERIC: revision 1.802
	sys/dev/pci/files.pci: revision 1.274
	sys/arch/amd64/conf/GENERIC: revision 1.122
	sys/dev/pci/mfi_pci.c: revision 1.1 via patch
	distrib/sets/lists/man/mi: revision 1.958
	sys/arch/amd64/conf/INSTALL: revision 1.61
	sys/dev/ic/mfireg.h: revision 1.1
	share/man/man4/Makefile: revision 1.416 via patch
	sys/dev/ic/mfi.c: revision 1.1
	sys/arch/i386/conf/XEN2_DOM0: revision 1.19
	sys/dev/ic/mfivar.h: revision 1.1
	sys/conf/files: revision 1.821
	share/man/man4/mfi.4: revision 1.1
	share/man/man4/mfi.4: revision 1.2
	sys/dev/pci/pcidevs via patch
Add mfi(4), a driver for LSI Logic & Dell MegaRAID SAS RAID controller.
Ported from OpenBSD, tested on i386 and amd64.
Punctuation issues.
@
text
@a595 1
mfi*	at pci? dev ? function ?	# LSI MegaRAID SAS
@


1.661.2.17
log
@Pull up following revision(s) (requested by bouyer in ticket #1621):
	sys/arch/i386/conf/GENERIC: revision 1.787 via patch
	share/man/man4/Makefile: revision 1.407 via patch
	distrib/sets/lists/man/mi: revision 1.936 via patch
	share/man/man4/ipmi.4: revision 1.1 via patch
	sys/arch/i386/i386/bios32.c: revision 1.11 via patch
	sys/dev/DEVNAMES: revision 1.221 via patch
	sys/arch/x86/x86/ipmi.c: revision 1.1 via patch
	sys/arch/i386/i386/mainbus.c: revision 1.65 via patch
	sys/arch/x86/include/smbiosvar.h: revision 1.1 via patch
	sys/arch/x86/include/ipmivar.h: revision 1.1 via patch
	sys/arch/x86/conf/files.x86: revision 1.20 via patch
	sys/arch/i386/conf/files.i386: revision 1.293 via patch
Add ipmi(4) driver, from OpenBSD. This requires SMBios support, so add
SMBios detection and mapping to bios32.c, also from OpenBSD (for now this
is only compiled in if ipmi(4) is configured). The sensors and watchdog are
accessible though envsys(4).
Works on i386; some work is needed on amd64 to access the BIOS. It would
eventually work on Xen if the SMBios is accessible (to be tested).
Add manpage for new ipmi driver.
Claim ipmi.
@
text
@a316 3
#IPMI support
#ipmi0		at mainbus?

@


1.661.2.18
log
@Pull up following revision(s) (requested by tsutsui in ticket #1673):
	distrib/sets/lists/man/mi		1.844, 1.871
	share/man/man4/Makefile			1.372, 1.379 via patch
	share/man/man4/re.4			1.8, 1.9, 1.11, 1.12
	share/man/man4/rgephy.4			1.1
	share/man/man4/rlphy.4			1.1, 1.2
	sys/arch/amd64/conf/GENERIC		1.79, 1.89
	sys/arch/amd64/conf/INSTALL		1.45, 1.49
	sys/arch/i386/conf/GENERIC		1.717, 1.747
	sys/arch/i386/conf/GENERIC_LAPTOP	1.164
	sys/arch/i386/conf/INSTALL		1.277, 1.283
	sys/arch/i386/conf/INSTALL_LAPTOP	1.96, 1.98
	sys/arch/i386/conf/XEN2_DOM0		1.22 via patch
	sys/arch/macppc/conf/GENERIC		1.220, 1.246
	sys/arch/macppc/conf/INSTALL		1.96, 1.100
	sys/dev/cardbus/if_re_cardbus.c		1.10
	sys/dev/cardbus/if_rtk_cardbus.c 	1.29-1.31
	sys/dev/ic/rtl8169.c			1.14, 1.20, 1.24, 1.25, 1.28-1.61, 1.63, 1.64-1.81 via patch
	sys/dev/ic/rtl81x9.c			1.52, 1.54-1.63, 1.65, 1.67-1.70
	sys/dev/ic/rtl81x9reg.h			1.15-1.26
	sys/dev/ic/rtl81x9var.h			1.19, 1.21-1.37
	sys/dev/mii/files.mii			1.38
	sys/dev/mii/miidevs			1.62, 1.64
	sys/dev/mii/rgephy.c			1.10, 1.13-1.16
	sys/dev/mii/rlphy.c			1.1, 1.6, 1.7, 1.11 via patch
	sys/dev/pci/if_re_pci.c			1.13, 1.15-1.17, 1.19-1.23
	sys/dev/pci/if_rtk_pci.c		1.25, 1.28, 1.29, 1.31
	sys/dev/pci/pcidevs			1.851, 1.852

on re(4):
- improve stability (I believe ;-)
- add a workaround for hardware ip4csum-tx bug
- support newer chips (8169SB/SC, PCIe based 8168 etc.)
- fix 8139C+ support
- enable hardware VLAN
- misc bus_dma(9) fix (which makes re(4) work on mips ports)

on rtk(4):
- fix kern/31348
- fix possible panic on dreamcast
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.17 2007/01/08 16:36:20 ghen Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.17 $"
a924 2
rgephy* at mii? phy ?			# Realtek 8169S/8110S internal PHYs
rlphy*	at mii? phy ?			# Realtek 8139/8201L PHYs
@


1.661.2.19
log
@pullup the following revisions (requested by msaitoh in ticket 1681):
	sys/dev/pci/if_wm.c			1.104-1.105, 1.116-1.121,
						1.127,1.133-1.134 via patch
	sys/dev/pci/if_wmreg.h			1.17-1.20
	sys/dev/pci/pcidevs			patch
	sys/dev/mii/igphy.c			1.11
	sys/dev/mii/makphy.c			1.20, 1.23
	sys/dev/mii/ikphy.c			patch
	sys/dev/mii/ikphyreg.h			patch
	sys/dev/mii/miidevs			1.68
	sys/dev/mii/files.mii			1.39
	sys/arch/i386/conf/GENERIC		1.788-1.789 via patch
	sys/arch/i386/conf/GENERIC.MPACPI	patch
	sys/arch/i386/conf/GENERIC_LAPTOP	1.209 via patch
	sys/arch/i386/conf/INSTALL		1.291 via patch
	sys/arch/i386/conf/INSTALL_LAPTOP	1.104 via patch
	sys/arch/i386/conf/XEN2_DOM0		1.13 via patch
	share/man/man4/wm.4			1.14-1.16
Add support for many cards (include PCI-express based chips).
Many bug fixes about auto negotiations (PR#30078, PR#30490,
PR#30906, PR#33429 and PR#35386).
Fix media link issues with fiber-based card (PR#35797).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.18 2007/03/03 23:30:21 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.18 $"
a916 1
ikphy*	at mii? phy ?			# Intel 82563 PHYs
@


1.661.2.20
log
@Pull up following revision(s) (requested by adrianp in ticket #1826):
	sys/arch/hp300/conf/GENERIC: revision 1.141 via patch
	sys/arch/amd64/conf/GENERIC: revision 1.154 via patch
	sys/arch/cats/conf/GENERIC: revision 1.116 via patch
	sys/arch/arc/conf/GENERIC: revision 1.148 via patch
	sys/arch/acorn32/conf/GENERIC: revision 1.80 via patch
	sys/arch/sparc/conf/GENERIC: revision 1.200 via patch
	sys/arch/sparc64/conf/GENERIC: revision 1.88 via patch
	sys/arch/atari/conf/GENERIC.in: revision 1.68 via patch
	sys/arch/amiga/conf/GENERIC: revision 1.248 via patch
	sys/arch/i386/conf/GENERIC.MPACPI: patch
	sys/arch/i386/conf/GENERIC_LAPTOP: revision 1.239 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x: revision 1.66 via patch
	sys/arch/i386/conf/GENERIC: revision 1.840 via patch
	sys/arch/amiga/conf/GENERIC.in: revision 1.61 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x: revision 1.68 via patch
	sys/arch/mac68k/conf/GENERIC: revision 1.182 via patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net&#64;
Ok'ed by core&#64;
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d186 1
a186 1
#options 	ISO,TPIP	# OSI
@


1.661.2.21
log
@Pull up following revisions via patch (requested by bouyer in ticket #1838):
	distrib/sets/lists/man/mi: revision 1.997
	sbin/bioctl/strtonum.c: revision 1.1
	sys/dev/Makefile: revision 1.25
	sys/arch/amd64/conf/GENERIC: revision 1.139
	sbin/bioctl/strtonum.h: revision 1.1
	sys/dev/bio.c: revision 1.1
	sbin/bioctl/bioctl.c: revision 1.1
	share/man/man4/bio.4: revision 1.1
	sbin/bioctl/bioctl.8: revision 1.1
	sys/sys/envsys.h: revision 1.11
	sbin/bioctl/bioctl.8: revision 1.3
	sbin/bioctl/bioctl.8: revision 1.4
	sys/arch/i386/conf/XEN2_DOM0: revision 1.25
	distrib/sets/lists/base/mi: revision 1.704
	sys/conf/majors: revision 1.34
	share/man/man4/Makefile: revision 1.426
	etc/MAKEDEV.tmpl: revision 1.86
	sys/arch/i386/conf/GENERIC: revision 1.825
	distrib/sets/lists/comp/mi: revision 1.1022
	sys/conf/files: revision 1.839
	usr.sbin/envstat/envstat.c: revision 1.24
	sbin/Makefile: revision 1.105
	sys/dev/ic/mfi.c: revision 1.4
	sys/dev/biovar.h: revision 1.1
	sys/dev/ic/mfivar.h: revision 1.4
	sbin/bioctl/Makefile: revision 1.1
Fix typo.
Add bio(4) and associated bioctl(8) from OpenBSD, a driver control block
device controllers, and more specifically raid controllers.
Add a new sensor type, ENVSYS_DRIVE, to report drive status. From OpenBSD.
Add bio and sysmon support to mfi(4). This allow userland to query
status for drives and logical volumes attached to a mfi(4) controller. While
there fix some debug printfs in mfi so they compile.
Add bio(4) to amd64 and i386 GENERIC.
Add bio(4) and associated bioctl(8) from OpenBSD, a driver control block
device controllers, and more specifically raid controllers.
Add a new sensor type, ENVSYS_DRIVE, to report drive status. From OpenBSD.
Add bio and sysmon support to mfi(4). This allow userland to query
status for drives and logical volumes attached to a mfi(4) controller. While
there fix some debug printfs in mfi so they compile.
Add bio(4) to amd64 and i386 GENERIC.
Fix Dd argument (use full month names).
Use more markup.
Comment out references to safte(4) and softraid(4), which don't exist in
NetBSD.
Remove trailing whitespace.
Use macros instead of characters for HTML output (replace ">", "<"
with \*[Gt], \*[Lt]).
Sort sections.
Create /dev/bio
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.661.2.20 2007/08/28 13:49:44 ghen Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.661.2.20 $"
a1242 1
pseudo-device	bio			# RAID control device driver
@


1.660
log
@add atu ether driver on usb
@
text
@a963 1
atu*	at uhub? port ?		# Atmel AT76C50XX based adapters
@


1.659
log
@add vge(4), ciphy(4)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.658 2005/02/18 21:05:52 dsl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.658 $"
d964 1
@


1.658
log
@Invert FFS_SNAPSHOT to FFS_NO_SNAPSHOT
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.657 2005/02/15 21:07:37 jwise Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.657 $"
d782 1
d871 1
@


1.657
log
@FFS_SNAPSHOT does not need to be here _twice_, once on, once off.  Obviously,
we keep the one that's on, so as not to change meaning.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.656 2005/02/12 13:07:27 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.656 $"
d170 1
a170 1
options 	FFS_SNAPSHOT	# ffs snapshots
@


1.656
log
@add npx* at pnpbios? (commented out)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.655 2005/02/11 08:25:54 dsl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.655 $"
a166 1
# options 	FFS_SNAPSHOT	# FFS snapshots
@


1.655
log
@Add 'option FFS_SNAPSHOT' to most of the config files.
Commented out for kernels that appear to hace space constraints.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.654 2005/01/31 16:54:34 hannken Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.654 $"
d366 1
@


1.654
log
@Add file system snapshots to kernel configs.

- Ffs internal snapshots get compiled in unconditionally.

- File system snapshot device fss(4) added to all kernel configs that
  have a disk.  Device is commented out on all non-GENERIC kernels.

Reviewed by: Jason Thorpe <thorpej@@netbsd.org>
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.653 2005/01/28 03:19:50 rumble Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.653 $"
d167 1
d171 1
@


1.653
log
@Sprinkle options UFS_DIRHASH on GENERIC kernels. It's presently
commented out and labeled experimental pending further review and
testing.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.652 2005/01/24 03:02:45 joff Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.652 $"
d1203 1
@


1.652
log
@Add atu(4) 802.11b USB driver
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.651 2005/01/18 10:28:00 scw Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.651 $"
d168 1
@


1.652.2.1
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a166 1
# options 	FFS_SNAPSHOT	# FFS snapshots
a167 1
#options	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
a168 1
options 	FFS_SNAPSHOT	# ffs snapshots
a362 1
#npx*		at pnpbios? index ?	# Math coprocessor
a1201 1
pseudo-device	fss		4	# file system snapshot device
@


1.652.2.2
log
@sync with head.  xen and whitespace.  xen part is not finished.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.652.2.1 2005/02/12 18:17:33 yamt Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.652.2.1 $"
d167 1
d171 1
a171 1
#options 	FFS_NO_SNAPSHOT	# ffs snapshots
a782 1
vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
a870 1
ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
@


1.652.2.3
log
@sync with head.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a331 2
#attimer*	at acpi?		# AT Timer
#pcppi*         at acpi?                # AT-style speaker sound
a480 1
attimer0	at isa?
@


1.651
log
@Add "options PMS_SYNAPTICS_TOUCHPAD", commented out in all but GENERIC_LAPTOP.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.650 2005/01/17 15:28:51 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.650 $"
d967 3
@


1.650
log
@Add tap(4) support to a random^Wcarefully chosen set of kernel configs.
All those kernels have a line for both tun and bridge, and if either is
commented out, tap is commented out also.  With the exception of i386's
GENERIC_TINY.

XXX:  we _need_ some way of making this more simple.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.649 2005/01/12 00:18:16 reinoud Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.649 $"
d467 1
@


1.649
log
@Add auixp(4) driver for the architectures that are known to have the ATI
IXP chipset.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.648 2005/01/11 18:43:42 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.648 $"
d1215 1
@


1.649.2.1
log
@sync with -current
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.668 2005/04/26 12:13:33 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.668 $"
a167 1
#options	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
a168 1
#options 	FFS_NO_SNAPSHOT	# ffs snapshots
a207 17
# These options control the verified exec feature
#options VERIFIED_EXEC
#
# Uncomment the fingerprint methods below that are desired.  Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
#options VERIFIED_EXEC_FP_RMD160
#options VERIFIED_EXEC_FP_SHA256
#options VERIFIED_EXEC_FP_SHA384
#options VERIFIED_EXEC_FP_SHA512
#options VERIFIED_EXEC_FP_SHA1
#options VERIFIED_EXEC_FP_MD5
#
#options VERIFIED_EXEC_DEBUG
#options VERIFIED_EXEC_DEBUG_VERBOSE

a322 1
#attimer*	at acpi?		# AT Timer
a329 1
#pcppi*		at acpi?                # AT-style speaker sound
a362 1
#npx*		at pnpbios? index ?	# Math coprocessor
a466 1
#options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
a476 1
attimer0	at isa?
a777 1
vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
a858 1
tra*	at mca? slot ?			# Tiara LANCard/E and clones
a865 1
ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
a965 3
# USB 802.11b adapters
atu*	at uhub? port ?		# Atmel AT76C50XX based adapters

a991 4
# Kyocera AIR-EDGE PHONE
ukyopon* at uhub? port ?
ucom*	at ukyopon? portno ?

a1197 1
pseudo-device	fss		4	# file system snapshot device
a1214 1
pseudo-device	tap			# virtual Ethernet
a1240 3
# a pseudo device needed for verified exec
#pseudo-device verifiedexec        1

@


1.648
log
@Add iwi(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.647 2005/01/07 01:31:14 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.647 $"
d1033 1
@


1.647
log
@space-then-tab ixpide so it comments out nicely.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.646 2004/12/06 19:28:12 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.646 $"
d758 1
@


1.646
log
@Add ixpide(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.645 2004/12/02 14:33:31 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.645 $"
d663 1
a663 1
ixpide*		at pci? dev ? function ?	# ATI IXP IDE controllers
@


1.645
log
@Add ACPI joy(4) attachment, based on lpt_acpi.c by jmcneill@@,
reviewed and ok'ed by cube@@ and martin@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.644 2004/12/02 09:50:42 xtraeme Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.644 $"
d663 1
@


1.644
log
@Add ACPI mpu(4) attachment, based on lpt_acpi.c by jmcneill@@,
reviewed by christos@@, cube@@ and martin@@.

While here, remove a printf() in mpu_attach() (ic/mpu.c) to remove
an empty line in some frontends (mpu_isa.c, etc).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.643 2004/12/01 22:27:46 grant Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.643 $"
d325 1
@


1.643
log
@add iteide(4) driver for ITE8212-based IDE controllers. from
OpenBSD, ported to NetBSD by me.

ok'd by bouyer@@, thorpej@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.642 2004/11/25 16:13:34 kim Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.642 $"
d326 1
@


1.642
log
@Whitespace police.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.641 2004/11/24 20:49:21 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.641 $"
d660 1
@


1.641
log
@pdcsata(4), a driver for the Promise SATA150 (aka PDC203xx) serie of
controllers. Tested with a PDC20375 (2 SATA, one PATA) controller on sparc64.
Added to all kernel config file which had pdcide(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.640 2004/11/10 17:54:05 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.640 $"
d142 1
a142 1
options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
@


1.640
log
@Add COMPAT_BSDPTY to the rest of the config files.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.639 2004/11/10 17:25:21 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.639 $"
d663 1
@


1.639
log
@Add COMPAT_BSDPTY on all the kernels that have COMPAT options.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.638 2004/11/01 23:20:42 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.638 $"
a142 1
options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
@


1.638
log
@Grammar fix in comment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.637 2004/10/26 19:52:23 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.637 $"
d142 2
@


1.637
log
@replace a tab with a space so commenting out auacer is more
aesthetically acceptable.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.636 2004/10/23 14:00:51 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.636 $"
d381 1
a381 1
					# work, but should not be enabled for
@


1.636
log
@s/uax/axe/
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.635 2004/10/22 13:10:20 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.635 $"
d1024 1
a1024 1
auacer*	at pci? dev ? function ?	# ALi M5455 integrated AC'97 Audio
@


1.635
log
@Add cdce(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.634 2004/10/21 17:12:41 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.634 $"
d952 1
a955 1
uax*	at uhub? port ?		# ASIX AX88172 based adapters
@


1.634
log
@Add a gross hack to route the ECHI interrupt on the Sharp MM20.
You can read the long and sad story about the BIOS in a comment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.633 2004/10/19 05:44:25 lukem Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.633 $"
d952 1
@


1.633
log
@enable ipw* (Intel PRO/Wireless 2100).  (requested by hubertf)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.632 2004/10/10 16:39:36 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.632 $"
d380 3
@


1.632
log
@Add auacer.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.631 2004/09/08 11:38:22 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.631 $"
d748 1
@


1.631
log
@Set valid values for the (commented out) WS_DEFAULT_COLATTR and
WS_DEFAULT_MONOATTR options.  This way, if a user blindly uncomments
them, he will not get a build failure.  Addresses PR kern/26503.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.630 2004/09/04 23:29:48 manu Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.630 $"
d1019 1
@


1.630
log
@IPv4 PIM support, based on a submission from Pavlin Radoslavov posted on
tech-net@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.629 2004/08/26 14:33:01 itohy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.629 $"
d234 2
a235 2
#options 	WS_DEFAULT_COLATTR=""
#options 	WS_DEFAULT_MONOATTR=""
@


1.629
log
@Add njs to some generic config files (I tested on i386 and sparc64).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.628 2004/08/10 20:50:11 mycroft Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.628 $"
d179 1
@


1.628
log
@+cs@@pcmcia
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.627 2004/08/08 08:57:09 mycroft Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.627 $"
d562 1
d605 1
@


1.627
log
@xi -> xirc,com,xi
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.626 2004/07/31 17:35:19 mrg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.626 $"
d785 1
@


1.626
log
@update the comment for ichlpcib to include SpeedStep.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.625 2004/07/29 22:29:35 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.625 $"
d793 3
a795 2
xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet

@


1.625
log
@Implement border color customization in wscons(4), only available for vga(4)
at the moment.

This includes the addition of two new wsdisplay ioctls, WSDISPLAY_{G,S}BORDER,
one to get the actual color and one to set it, respectively.  Possible colors
match those defined by ANSI (and listed in wsdisplayvar.h).

It also adds two accessops to the underlying graphics device, getborder and
setborder, which mach their ioctl counterparts.

Two kernel options are added: WSDISPLAY_CUSTOM_BORDER, which enables the
ioctls described above (to customize the border color from userland after
boot), and WSDISPLAY_BORDER_COLOR, which sets the color at boot time.
The former is enabled by default on the GENERIC kernel, but not on INSTALL
(among others).  The later is always commented out, leaving the usual black
border as a default.

wsconsctl is modified to allow accessing this value easily.  For example,
'wsconsctl -d -w border=blue'.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.624 2004/07/28 12:34:02 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.624 $"
d385 2
a386 1
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ watchdog support
@


1.624
log
@Implement support to dynamically change wscons console and kernel colors.

Two new ioctls are added to the wsdisplay device, named WSDISPLAY_GMSGATTRS
and WSDISPLAY_SMSGATTRS, used to retrieve the actual values and set them,
respectively (the name, if you are wondering, comes from "message attributes").

A new emulop is added to the underlying display driver (only vga, for now)
which sets the new attribute for the whole screen, without having to clear
it.  This is optional, which means that this also works with other drivers
that don't have this new operation.

Five new kernel options have been added, although only documented in
i386 kernels (for now):
- WSDISPLAY_CUSTOM_OUTPUT, which enables the ioctls described above to
  change the colors dynamically from userland.  This is enabled by default
  in the GENERIC kernel (as well as others) but disabled on all INSTALL*
  kernels (as this feature is useless there).
- WS_DEFAULT_COLATTR, WS_DEFAULT_MONOATTR, WS_DEFAULT_BG and WS_DEFAULT_FG,
  which specify the default colors for the console at boot time.  These have
  the same meaning as the (already existing) WS_KERNEL_* variables.

wsconsctl is modified to add msg.default.{attrs,bg,fg} and
msg.kernel.{attrs,bg,fg} to the display part, so that colors can be changed
after boot.

Tested on NetBSD/i386 with vga (and vga in mono mode), and on NetBSD/mac68k.
No objections in tech-kern@@.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.623 2004/07/19 14:23:59 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.623 $"
d239 3
@


1.623
log
@Enable ehci(4) by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.622 2004/07/15 03:53:47 atatat Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.622 $"
d229 6
a234 1
# different kernel output - see dev/wscons/wsdisplayvar.h
d237 2
@


1.622
log
@Add "options SYSCTL_INCLUDE_DESCR" to a lot of configs, but commented
out in most of them.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.621 2004/07/10 18:51:01 cube Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.621 $"
d864 1
a864 2
# The EHCI is not ready for prime time.
#ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
d876 1
a876 1
#usb*	at ehci?
@


1.621
log
@Add an option to allow any user to write to machdep.est.frequency.target,
which is very handy on a laptop to control EST through another program that
you don't necessarily want to run as root (in my case, gkrellm).

The option's name is EST_FREQ_USERWRITE, and is disabled by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.620 2004/07/09 18:38:40 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.620 $"
d94 1
@


1.620
log
@Add geodeide(4), a driver for the AMD Geode CS5530A IDE controller.
Tested by Ian Zagorskih (ianzag at megasignal.com).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.619 2004/07/06 22:53:36 mycroft Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.619 $"
d44 1
@


1.619
log
@Remove XSERVER and XSERVER_DDB from all config files.  wscons does not use
these, and pccons is rapidly heading for the guillotine.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.618 2004/07/05 22:30:38 abs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.618 $"
d638 1
@


1.618
log
@Remove accidently added UMASS_DEBUG. Thanks to kimmo for spotting.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.617 2004/06/29 04:51:29 itojun Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.617 $"
a439 3
# pccons-specific options:
#options 	XSERVER_DDB	# PF12 gets you into DDB when X is running
#options 	XSERVER		# X server support
@


1.617
log
@s/options\t\t/options \t/.  (whether UMASS_DEBUG is appropriate for everyone's
GENERIC is a different issue.  i'm not sure)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.616 2004/06/26 07:32:06 abs Exp $
a23 1
options 	UMASS_DEBUG
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.616 $"
@


1.616
log
@Add (commented out) ALTQ options to all GENERIC-like files
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.615 2004/06/22 15:18:33 toshii Exp $
d24 1
a24 1
options		UMASS_DEBUG
d26 1
a26 1
#ident 		"GENERIC-$Revision: 1.615 $"
@


1.615
log
@Add re; Realtek GbE.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.614 2004/06/22 14:09:50 itojun Exp $
d24 1
d26 1
a26 1
#ident 		"GENERIC-$Revision: 1.614 $"
d192 13
@


1.614
log
@have pf and pflog pseudo-device (commented out).
reviewed by matt, perry, christos
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.613 2004/06/18 15:04:39 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.613 $"
d729 1
@


1.613
log
@ptm is now mandatory, depends on pty, and can be disabled with -DNO_DEV_PTM
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.612 2004/06/14 01:28:00 lukem Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.612 $"
d1180 2
@


1.612
log
@Use  "options<SPACE><TAB>".
(`egrep -l '(^|[^e])options<TAB>'` is your friend...)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.611 2004/06/08 12:46:11 kochi Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.611 $"
a1182 1
pseudo-device	ptm			# pseudo-terminal multiplexor
@


1.611
log
@Fix typo:
ACPI = Advanced *Configuration* and Power Interface
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.610 2004/06/07 15:33:52 kochi Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.610 $"
d285 1
a285 1
#options	ACPI_DISABLE_ON_POWEROFF	# disable acpi on power off
@


1.610
log
@Add ACPI_DISABLE_ON_POWEROFF option.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.609 2004/06/01 16:29:36 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.609 $"
d270 1
a270 1
# Advanced Control and Power Interface
@


1.609
log
@Use SPC-TAB after the word "options".
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.608 2004/05/28 21:44:51 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.608 $"
d285 1
@


1.608
log
@PR/19925: David Ferlier: Add scrolling support to wscons
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.607 2004/05/27 02:57:24 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.607 $"
d237 1
a237 1
#options	WSDISPLAY_SCROLLSUPPORT
@


1.607
log
@Add ptm device.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.606 2004/05/24 23:50:11 tsarna Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.606 $"
d236 2
@


1.606
log
@add uep driver
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.605 2004/05/22 03:16:26 grant Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.605 $"
d1180 1
@


1.605
log
@add `scsibus* at umass?' so usb mass storage devices which attach to
sd@@scsibus can be used out of the box.

whitespace tweak for wd* at umass?
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.604 2004/05/21 03:30:40 atatat Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.604 $"
d876 4
@


1.604
log
@Whitespace nits
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.603 2004/05/11 23:07:35 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.603 $"
d892 2
a893 1
wd* at umass?
@


1.603
log
@Add commented out entries for ioat* and nsclpcsio*;
from Sergey Svishchev in private mail.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.602 2004/04/30 17:41:19 gendalia Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.602 $"
d348 1
a348 1
#options	PCIBIOS_LIBRETTO_FIXUP	# this code makes the Toshiba Libretto
d487 1
a487 1
#ioat*	at isa?	port 0x220 irq 5	# BOCA IOAT66 6-port serial card
@


1.602
log
@Uncomment 'wd* at umass?' in GENERIC, add to GENERIC_LAPTOP.
supports the ISD's ATA protocol over Bulk-Only, used with the Archos studio
and Archos Jukebox products, among others.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.601 2004/04/30 15:55:10 fredb Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.601 $"
d487 2
d508 3
@


1.601
log
@ - - "options" should be followed by <SPACE><TAB>.
 - - restore "options COMPAT_20", no doubt commented out by mistake.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.600 2004/04/30 02:47:16 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.600 $"
d887 1
a887 1
#wd* at umass?
@


1.600
log
@Add and document PCIBIOS_LIBRETTO_FIXUP
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.599 2004/04/30 02:08:17 lukem Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.599 $"
d43 1
a43 1
options		ENHANCED_SPEEDSTEP
d126 1
a126 1
#options 	COMPAT_20	# NetBSD 2.0
@


1.599
log
@add ENHANCED_SPEEDSTEP
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.598 2004/04/29 11:54:24 minoura Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.598 $"
d126 1
a126 1
options 	COMPAT_20	# NetBSD 2.0
d348 3
@


1.598
log
@Comment out ichlpcib.
There are at least 2 reports that it freezes upon startup.
http://mail-index.netbsd.org/current-users/2004/04/19/0016.html
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.597 2004/04/21 01:05:35 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.597 $"
d42 3
@


1.597
log
@Replace the statfs() family of system calls with statvfs().
Retain binary compatibility.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.596 2004/04/07 13:13:59 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.596 $"
d351 1
a351 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ watchdog support
d368 1
a368 1
isa0	at ichlpcib?
@


1.596
log
@Put ichlpcib in alphabetical order.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.595 2004/03/14 08:09:42 minoura Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.595 $"
d123 1
@


1.595
log
@Add ichlpcib.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.594 2004/02/25 18:56:26 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.594 $"
d350 1
a353 1
ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ watchdog support
d367 1
a370 1
isa0	at ichlpcib?
@


1.595.2.1
log
@Pullup patch (requested by minoura in ticket #233)

Comment out ichlpcib.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.595 2004/03/14 08:09:42 minoura Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.595 $"
d353 1
a353 1
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ watchdog support
d370 1
a370 1
#isa0	at ichlpcib?
@


1.595.2.2
log
@Pull up revision 1.602 (requested by gendalia in ticket #244):
Uncomment 'wd* at umass?' in GENERIC, add to GENERIC_LAPTOP.
supports the ISD's ATA protocol over Bulk-Only, used with the Archos studio
and Archos Jukebox products, among others.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d880 1
a880 1
wd* at umass?
@


1.595.2.3
log
@Pull up revision 1.608 (requested by recht in ticket #451):
PR/19925: David Ferlier: Add scrolling support to wscons
@
text
@a231 2
# console scrolling support.
#options	WSDISPLAY_SCROLLSUPPORT
@


1.595.2.4
log
@Pullup patch (requested by kochi in ticket #463)

Add ACPI_DISABLE_ON_POWEROFF option. PR#24869
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.595.2.3 2004/06/07 09:45:49 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.595.2.3 $"
a280 1
#options	ACPI_DISABLE_ON_POWEROFF	# disable acpi on power off
@


1.595.2.5
log
@Pull up revision 1.616 (requested by abs in ticket #567).

Add (commented out) ALTQ options to all GENERIC-like files
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.595.2.4 2004/06/14 03:18:51 jmc Exp $
a23 1
options		UMASS_DEBUG
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.595.2.4 $"
a186 13
#options 	ALTQ		# Manipulate network interfaces' output queues
#options 	ALTQ_BLUE	# Stochastic Fair Blue
#options 	ALTQ_CBQ	# Class-Based Queueing
#options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
#options 	ALTQ_FIFOQ	# First-In First-Out Queue
#options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
#options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
#options 	ALTQ_LOCALQ	# Local queueing discipline
#options 	ALTQ_PRIQ	# Priority Queueing
#options 	ALTQ_RED	# Random Early Detection
#options 	ALTQ_RIO	# RED with IN/OUT
#options 	ALTQ_WFQ	# Weighted Fair Queueing

@


1.595.2.6
log
@Pull up revision 1.618 (requested by abs in ticket #608):

Remove accidently added UMASS_DEBUG.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.595.2.5 2004/06/30 21:08:45 jdc Exp $
d24 1
d26 1
a26 1
#ident 		"GENERIC-$Revision: 1.595.2.5 $"
@


1.595.2.7
log
@Pull up revision 1.615 (requested by he in ticket #641):
Add re; Realtek GbE.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a729 1
re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
@


1.595.2.8
log
@Pull up revision 1.620 (requested by bouyer in ticket #644):
Add geodeide(4), a driver for the AMD Geode CS5530A IDE controller.
Tested by Ian Zagorskih (ianzag at megasignal.com).
@
text
@a628 1
geodeide* 	at pci? dev ? function ?	# AMD Geode IDE controllers
@


1.595.2.9
log
@Pull up revision 1.622 (requested by atatat in ticket #663):
	Add "options SYSCTL_INCLUDE_DESCR" to a lot of configurations,
	but commented out in most of them.
@
text
@a89 1
options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
@


1.595.2.10
log
@Pull up revision 1.623 (requested by tron in ticket #702):
  Enable ehci(4) by default.
@
text
@d854 2
a855 1
ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
d867 1
a867 1
usb*	at ehci?
@


1.595.2.11
log
@Pull up revision 1.629 (requested by itohy in ticket #800):
Add njs to some generic config files (I tested on i386 and sparc64).
@
text
@a540 1
njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
a582 1
#njs*	at cardbus? dev ? function ?	# Workbit NinjaSCSI-32
@


1.595.2.12
log
@Pull up following revision(s) (requested by adrianp in ticket #11356):
	sys/arch/acorn32/conf/GENERIC                   1.80 via patch
	sys/arch/amd64/conf/GENERIC                     1.154 via patch
	sys/arch/amiga/conf/GENERIC.in                  1.61 via patch
	sys/arch/arc/conf/GENERIC                       1.148 via patch
	sys/arch/atari/conf/GENERIC.in                  1.68 via patch
	sys/arch/cats/conf/GENERIC                      1.116 via patch
	sys/arch/hp300/conf/GENERIC                     1.141 via patch
	sys/arch/hp700/conf/GENERIC                     patch
	sys/arch/i386/conf/GENERIC                      1.840 via patch
	sys/arch/i386/conf/GENERIC_LAPTOP               1.239 via patch
	sys/arch/i386/conf/GENERIC.MPACPI               patch
	sys/arch/mac68k/conf/GENERIC                    1.182 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x            1.68 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x            1.66 via patch
	sys/arch/sparc/conf/GENERIC                     1.200 via patch
	sys/arch/sparc64/conf/GENERIC32                 patch
	sys/arch/xen/conf/GENERIC                       patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@@
Ok'ed by core@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.595.2.11 2004/08/30 09:52:37 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.595.2.11 $"
d176 1
a176 1
#options 	ISO,TPIP	# OSI
@


1.595.2.11.2.1
log
@Pull up revision 1.641 (requested by bouyer in ticket #1019):
  Add pdcsata(4), a driver for the Promise SATA150 (aka PDC203xx) series of
  controllers.
@
text
@a636 1
pdcsata*	at pci? dev ? function ?	# Promise SATA150 controllers
@


1.595.2.11.2.2
log
@Pull up revision 1.666 (requested by itohy in ticket #1430):
Add ukyopon(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.666 2005/04/15 17:27:21 itohy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.595.2.11.2.1 $"
a951 4
# Kyocera AIR-EDGE PHONE
ukyopon* at uhub? port ?
ucom*	at ukyopon? portno ?

@


1.595.2.11.2.3
log
@Pull up following revision(s) (requested by adrianp in ticket #11356):
	sys/arch/acorn32/conf/GENERIC                   1.80 via patch
	sys/arch/amd64/conf/GENERIC                     1.154 via patch
	sys/arch/amiga/conf/GENERIC.in                  1.61 via patch
	sys/arch/arc/conf/GENERIC                       1.148 via patch
	sys/arch/atari/conf/GENERIC.in                  1.68 via patch
	sys/arch/cats/conf/GENERIC                      1.116 via patch
	sys/arch/hp300/conf/GENERIC                     1.141 via patch
	sys/arch/hp700/conf/GENERIC                     patch
	sys/arch/i386/conf/GENERIC                      1.840 via patch
	sys/arch/i386/conf/GENERIC_LAPTOP               1.239 via patch
	sys/arch/i386/conf/GENERIC.MPACPI               patch
	sys/arch/mac68k/conf/GENERIC                    1.182 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x            1.68 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x            1.66 via patch
	sys/arch/sparc/conf/GENERIC                     1.200 via patch
	sys/arch/sparc64/conf/GENERIC32                 patch
	sys/arch/xen/conf/GENERIC                       patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@@
Ok'ed by core@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.595.2.11.2.2 2005/07/21 19:27:58 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.595.2.11.2.2 $"
d176 1
a176 1
#options 	ISO,TPIP	# OSI
@


1.595.2.11.2.2.2.1
log
@Pull up following revision(s) (requested by adrianp in ticket #11356):
	sys/arch/acorn32/conf/GENERIC                   1.80 via patch
	sys/arch/amd64/conf/GENERIC                     1.154 via patch
	sys/arch/amiga/conf/GENERIC.in                  1.61 via patch
	sys/arch/arc/conf/GENERIC                       1.148 via patch
	sys/arch/atari/conf/GENERIC.in                  1.68 via patch
	sys/arch/cats/conf/GENERIC                      1.116 via patch
	sys/arch/hp300/conf/GENERIC                     1.141 via patch
	sys/arch/hp700/conf/GENERIC                     patch
	sys/arch/i386/conf/GENERIC                      1.840 via patch
	sys/arch/i386/conf/GENERIC_LAPTOP               1.239 via patch
	sys/arch/i386/conf/GENERIC.MPACPI               patch
	sys/arch/mac68k/conf/GENERIC                    1.182 via patch
	sys/arch/sgimips/conf/GENERIC32_IP2x            1.68 via patch
	sys/arch/sgimips/conf/GENERIC32_IP3x            1.66 via patch
	sys/arch/sparc/conf/GENERIC                     1.200 via patch
	sys/arch/sparc64/conf/GENERIC32                 patch
	sys/arch/xen/conf/GENERIC                       patch
Remove iso(4) from GENERIC kernels, as discussed on tech-net@@
Ok'ed by core@@
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.595.2.11.2.2 2005/07/21 19:27:58 riz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.595.2.11.2.2 $"
d176 1
a176 1
#options 	ISO,TPIP	# OSI
@


1.594
log
@fix another whitespace nit
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.593 2004/02/25 18:50:01 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.593 $"
d353 1
d370 1
@


1.593
log
@juggle tabs and spaces so comments don't nuke line lengths as badly
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.592 2004/01/16 17:02:05 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.592 $"
d1090 1
a1090 1
#joy*	at pnpbios? index ?	# Game port
@


1.592
log
@Make the warning on NEW_BUFQ_STRATEGY much milder -- I've upgraded it
to "Likely stable". I'm not going to make it the default unilaterally
but I really think it should be.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.591 2004/01/09 18:31:25 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.591 $"
d278 1
a278 1
#options	ACPICA_PEDANTIC		# force strict conformance to the Spec.
d329 1
a329 1
#pciide*	at pnpbios? index ?
d371 2
a372 2
pcmcia*	at pcic? controller ? socket ?
pcmcia*	at tcic? controller ? socket ?
d387 1
a387 1
isapnp0	at isa?
d451 1
a451 1
pcmcom*	at pcmcia? function ?		# PCMCIA multi-port serial cards
d805 3
a807 3
amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
d813 1
a813 1
icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
d817 2
a818 2
lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
d820 2
a821 2
nsphyter* at mii? phy ?			# NS83843 PHYs
pnaphy*	at mii? phy ?			# generic HomePNA PHYs
d916 1
a916 1
uplcom*	at uhub? port ?		# I/O DATA USB-RSAQ2 serial adapter
d919 1
a919 1
uvscom*	at uhub? port ?		# SUNTAC Slipper U VS-10U serial adapter
d975 1
a975 1
emuxki*	at pci? dev ? function ?	# Creative SBLive! and PCI512
d986 1
a986 1
guspnp*	at isapnp?			# Gravis Ultra Sound PnP audio
d1090 1
a1090 1
#joy*		at pnpbios? index ?	# Game port
d1157 1
a1157 1
#options	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
@


1.591
log
@nuke trailing spaces.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.590 2003/12/31 16:44:26 jonathan Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.590 $"
d99 1
a99 1
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
@


1.590
log
@Split opencrypto configuration into an attribute, usable by inkernel
clients, and a pseudo-device for userspace access.

The attribute is named `opencrypto'. The pseudo-device is renamed to
"crypto", which has a dependency on "opencrypto". The sys/conf/majors
entry and pseudo-device attach entrypoint are updated to match the
new pseudo-device name.

Fast IPsec (sys/netipsec/files.ipsec) now lists a dependency on the
"opencrypto" attribute.  Drivers for crypto accelerators (ubsec,
hifn775x) also pull in opencrypto, as providers of opencrypto transforms.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.589 2003/12/30 18:09:50 augustss Exp $
d4 1
a4 1
# 
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.589 $"
d98 1
a98 1
# Enable experimental buffer queue strategy for better responsiveness under 
d693 1
a693 1
ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11 
@


1.589
log
@Alphabetize IDE controllers
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.588 2003/12/23 10:11:42 kochi Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.588 $"
d1118 1
a1118 1
pseudo-device 	opencrypto		# opencrypto framework
@


1.588
log
@add ACPICA_PEDANTIC option.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.587 2003/12/17 09:18:45 tls Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.587 $"
d619 1
a620 1
stpcide*	at pci? dev ? function ?	# STMicro STPC IDE controllers
@


1.587
log
@Add "sk" driver for SysKonnect/Marvell GigE cards.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.586 2003/12/14 09:54:01 dyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.586 $"
d278 1
@


1.586
log
@Add ath(4) for Atheros 802.11a/b/g cards.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.585 2003/12/14 01:32:02 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.585 $"
d714 2
a715 2
#skc*	at pci? dev ? function ?	# SysKonnect SK9821 Gigabit Ethernet
#sk*	at skc?				# SysKonnect SK9821 Gigabit Ethernet
@


1.585
log
@Split the Intel i31244 SATA controller ("Artisea") driver out of piixide
into its own driver (artsata).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.584 2003/12/13 23:13:41 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.584 $"
d692 1
d786 1
@


1.584
log
@Split out the Silicon Image SATALink support into its own driver,
"satalink".
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.583 2003/11/20 13:32:41 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.583 $"
d607 1
@


1.583
log
@Add (commented out) and document NO_TSC_TIME.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.582 2003/11/18 23:07:37 jonathan Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.582 $"
d614 1
@


1.582
log
@Add opencrypto and drivers for PCI cryptographic accelerators --
hifn (Hifn 7751), ubsec (Broadcom 582x) -- to i386 GENERIC kernel.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.581 2003/11/05 07:51:12 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.581 $"
d70 2
@


1.581
log
@Update comment for wm(4) attachment because the driver supports more
than the Intel 82543 and 82544.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.580 2003/11/04 23:38:41 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.580 $"
d1074 7
d1110 2
@


1.580
log
@Add and enable igphy.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.579 2003/11/04 16:57:57 mycroft Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.579 $"
d718 1
a718 1
wm*	at pci? dev ? function ?	# Intel 82543/82544 gigabit
@


1.579
log
@Re-add ServerWorks IDE support, as "rccide".  Note: this is untested, as I no
longer have a ServerWorks-based motherboard.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.578 2003/10/31 06:49:58 nisimura Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.578 $"
d807 1
@


1.578
log
@Added stpcide(4) driver for STMicroelectronics STPC IDE controllers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.577 2003/10/18 08:12:07 lukem Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.577 $"
d611 1
@


1.577
log
@Use one  'atabus* at ata?'  instead of multiple  'atabus* at FOOide? channel ?'
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.576 2003/10/13 05:45:59 dyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.576 $"
d614 1
@


1.576
log
@Add atw (ADMtek ADM8211 802.11).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.575 2003/10/10 04:50:07 grog Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.575 $"
d628 3
a641 14

atabus* at pciide? channel ?
atabus* at acardide? channel ?
atabus* at aceride? channel ?
atabus* at cmdide? channel ?
atabus* at cypide? channel ?
atabus* at hptide? channel ?
atabus* at optiide? channel ?
atabus* at piixide? channel ?
atabus* at pdcide? channel ?
atabus* at siside? channel ?
atabus* at slide? channel ?
atabus* at viaide? channel ?
atabus* at wdc? channel ?
@


1.575
log
@Add config info for Vinum
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.574 2003/10/08 12:08:38 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.574 $"
d697 1
d790 1
@


1.574
log
@Alphabetize.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.573 2003/10/08 11:55:43 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.573 $"
d1123 4
@


1.573
log
@Add new per-chip pciide drivers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.572 2003/10/08 11:10:04 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.572 $"
d899 1
a900 1
udav*	at uhub? port ?		# Davicom DM9601 based adapters
@


1.572
log
@Add atabus
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.571 2003/09/27 13:16:16 mrg Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.571 $"
d602 12
a613 1
pciide* at pci? dev ? function ? flags 0x0000
d641 11
@


1.571
log
@enable broadcom BCM4401 (bce) driver (as found on recent dell laptops)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.570 2003/09/06 22:39:23 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.570 $"
d628 4
a631 2
wd*	at wdc? channel ? drive ? flags 0x0000
wd*	at pciide? channel ? drive ? flags 0x0000
@


1.570
log
@Add COMPAT_16
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.569 2003/08/26 21:12:48 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.569 $"
d673 1
@


1.569
log
@add commented out entries for skc/sk SysKonnect SK9821 driver
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.568 2003/08/22 05:14:00 itojun Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.568 $"
d120 1
@


1.568
log
@add udav*
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.567 2003/08/07 12:06:15 soren Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.567 $"
d691 2
@


1.567
log
@Enable ahd(4) by default. There are some problems with higher speeds /
packetized mode, but those can be disabled in the Adaptec BIOS setup.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.566 2003/08/06 12:32:07 bouyer Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.566 $"
d872 1
@


1.566
log
@Add esiop at pci to GENERIC which already have siop at pci.
esiop has been tested enouth now.
esiop not added to INSTALL kernels because of possible space constraint.
siop should be able to drive all adapters supported by esiop.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.565 2003/07/06 04:03:21 kochi Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.565 $"
d511 1
a511 1
#ahd*	at pci? dev ? function ?	# Adaptec 29320, 39320 (aic790x) SCSI
@


1.565
log
@o cleanup usage of ACPI_ACTIVATE_DEV/ACPI_PCI_FIXUP
o delete usage of ENABLE_DEBUGGER

As ACPI_ACTIVATE_DEV/ACPI_PCI_FIXUP are defflag'ed in files.acpi,
these options don't have to have a value.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564 2003/06/29 22:28:23 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564 $"
d520 1
@


1.564
log
@Back out the lwp/ktrace changes. They contained a lot of colateral damage,
and need to be examined and discussed more.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.561 2003/05/29 20:22:28 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.561 $"
d274 1
a274 1
#options 	ACPI_ACTIVATE_DEV=0	# If set, activate inactive devices
@


1.564.2.1
log
@Apply the aborted ktrace-lwp changes to a specific branch.  This is just for
others to review, I'm concerned that patch fuziness may have resulted in some
errant code being generated but I'll look at that later by comparing the diff
from the base to the branch with the file I attempt to apply to it.  This will,
at the very least, put the changes in a better context for others to review
them and attempt to tinker with removing passing of 'struct lwp' through
the kernel.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564 2003/06/29 22:28:23 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564 $"
d101 2
a102 2
options 	DIAGNOSTIC	# expensive kernel consistency checks
options 	DEBUG		# expensive debugging checks/support
d105 1
a105 1
options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
d122 1
a122 1
options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
d129 4
a132 4
options 	COMPAT_MACH	# binary compatibility with Mach binaries
options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
options 	EXEC_MACHO	# exec MACH-O binaries
options 	COMPAT_PECOFF	# kernel support to run Win32 apps
d156 1
a156 1
options 	FFS_EI		# FFS Endian Independent support
d159 1
a159 1
options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
d166 2
a167 2
options 	IPSEC		# IP security
options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
d169 1
a169 1
options 	MROUTING	# IP multicast routing
d171 1
a171 1
options 	NSIP		# XNS tunneling over IP
d173 1
a173 1
options 	EON		# OSI tunneling over IP
d244 1
a244 1
ioapic* at mainbus?
d247 1
a247 1
p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
d249 1
a249 1
apm0	at mainbus0			# Advanced power management
d272 2
a273 2
acpi0 		at mainbus0
options 	ACPI_PCI_FIXUP		# PCI interrupt routing via ACPI
d277 6
a282 6
acpiacad* 	at acpi?		# ACPI AC Adapter
acpibat* 	at acpi?		# ACPI Battery
acpibut* 	at acpi?		# ACPI Button
acpiec* 	at acpi?		# ACPI Embedded Controller
acpilid* 	at acpi?		# ACPI Lid Switch
acpitz* 	at acpi?		# ACPI Thermal Zone
d285 6
a290 6
com* 		at acpi?		# Serial communications interface
fdc* 		at acpi?		# Floppy disk controller
lpt* 		at acpi?		# Parallel port
npx*		at acpi?		# Math coprocessor
pckbc*  	at acpi?		# PC keyboard controller
wss* 		at acpi?		# NeoMagic 256AV in wss mode
d293 2
a294 2
spic* 		at acpi?		# Sony Programmable I/O Controller
wsmouse* 	at spic?
d297 1
a297 1
vald* at acpi?
d301 1
a301 1
pnpbios*	at mainbus?
d304 4
a307 4
ess*		at pnpbios? index ?	# ESS AudioDrive
sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
ym*		at pnpbios? index ?	# OPL3-SA3
d314 1
a314 1
com*		at pnpbios? index ?	# serial ports
d319 1
a319 1
lpt*		at pnpbios? index ?	# parallel ports
d321 2
a322 2
pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
fdc*		at pnpbios? index ?	# floppy controller
d325 1
a325 1
pciide*	at pnpbios? index ?
d424 1
a424 1
machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
d427 1
a427 1
wsdisplay* 	at machfb? console ?
d451 1
a451 1
com*	at cardbus? dev ? function ?	# Modems and serial cards
d458 16
a473 16
com3	at isa? port 0x2e8 irq 9
ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
com*	at ast? slave ?
boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
com*	at boca? slave ?
tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
com*	at tcom? slave ?
rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
com*	at rtfps? slave ?
cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
com*	at addcom? slave ?
moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
com*	at moxa? slave ?
d494 2
a495 2
viapm*	at pci? dev ? function ?
viaenv* at viapm?
d547 3
a549 3
dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
d557 2
a558 2
adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
d648 1
a648 1
fdc1	at isa? port 0x370 irq ? drq ?
d651 1
a651 1
fd0	at fdc0 drive 0
d654 1
a654 1
mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
d680 1
a680 1
hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
d722 1
a722 1
tr*	at pcmcia? function ?		# TROPIC based Token-Ring
d743 2
a744 2
depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
le*	at depca?
d747 1
a747 1
ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
d760 4
a763 4
ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
fxp*	at cardbus? dev ? function ?	# Intel i8255x
rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
tlp*	at cardbus? dev ? function ?	# DECchip 21143
d804 1
a804 1
ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
d809 2
a810 2
ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
ohci*	at cardbus? dev ? function ?	# Open Host Controller
d813 1
a813 1
slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
d816 1
a816 1
usb*	at ehci?
d819 1
a819 1
usb*	at slhci?
d922 1
a922 1
fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
d925 1
a925 1
fwohci* at cardbus? dev ? function ?	# IEEE1394 Open Host Controller
d927 1
a927 1
fw*	at fwbus?			# IP over 1394
d930 3
a932 3
fwnode* at fwbus? idhi ? idlo ?
sbpscsi* at fwnode?
scsibus* at sbpscsi?
d962 2
a963 2
aria0	at isa? port 0x290 irq 10 		# Aria
ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
d966 2
a967 2
pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
d972 1
a972 1
esl*	at pcmcia? function ?			# ESS 1688 AudioDrive
d979 1
a979 1
opl*	at esl?
d1006 1
a1006 1
spkr0	at pcppi?		# PC speaker
d1011 9
a1019 9
az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
az1	at isa? port 0x358
rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
rt1	at isa? port 0x284
rt2	at isa? port 0x30c
rt3	at isa? port 0x384
rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
rtii1	at isa? port 0x30c
sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card
d1022 1
a1022 1
gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d1025 5
a1029 5
radio*	at az?
radio*	at gtp?
radio*	at rt?
radio*	at rtii?
radio*	at sf2r?
d1082 1
a1082 1
pseudo-device	cgd		4	# cryptographic disk devices
d1109 2
a1110 2
pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
@


1.564.2.2
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.1 2003/07/02 15:25:20 darrenr Exp $
d4 1
a4 1
#
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.1 $"
a41 4
# Enhanced SpeedStep Technology in the Pentium M
options 	ENHANCED_SPEEDSTEP
#options 	EST_FREQ_USERWRITE	# any user can set frequency

a69 2
#options 	NO_TSC_TIME	# Don't use TSC microtime, even if available.
				# Improves time behavior under VMware.
a87 1
options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
d96 2
a97 2
# Enable experimental buffer queue strategy for better responsiveness under
# high disk I/O load. Likely stable but not yet the default.
d105 1
a105 1
#options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
a119 2
options 	COMPAT_16	# NetBSD 1.6
options 	COMPAT_20	# NetBSD 2.0
d122 1
a122 1
#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
d156 1
a156 1
#options 	FFS_EI		# FFS Endian Independent support
d159 1
a159 1
#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
d166 2
a167 2
#options 	IPSEC		# IP security
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
d169 1
a169 1
#options 	MROUTING	# IP multicast routing
d171 1
a171 1
#options 	NSIP		# XNS tunneling over IP
d173 1
a173 1
#options 	EON		# OSI tunneling over IP
a183 13
#options 	ALTQ		# Manipulate network interfaces' output queues
#options 	ALTQ_BLUE	# Stochastic Fair Blue
#options 	ALTQ_CBQ	# Class-Based Queueing
#options 	ALTQ_CDNR	# Diffserv Traffic Conditioner
#options 	ALTQ_FIFOQ	# First-In First-Out Queue
#options 	ALTQ_FLOWVALVE	# RED/flow-valve (red-penalty-box)
#options 	ALTQ_HFSC	# Hierarchical Fair Service Curve
#options 	ALTQ_LOCALQ	# Local queueing discipline
#options 	ALTQ_PRIQ	# Priority Queueing
#options 	ALTQ_RED	# Random Early Detection
#options 	ALTQ_RIO	# RED with IN/OUT
#options 	ALTQ_WFQ	# Weighted Fair Queueing

d207 1
a207 6
# customization of console and kernel output - see dev/wscons/wsdisplayvar.h
options 	WSDISPLAY_CUSTOM_OUTPUT	# color customization from wsconsctl(8)
#options 	WS_DEFAULT_FG=WSCOL_WHITE
#options 	WS_DEFAULT_BG=WSCOL_BLACK
#options 	WS_DEFAULT_COLATTR=""
#options 	WS_DEFAULT_MONOATTR=""
a209 5
#options 	WS_KERNEL_COLATTR=""
#options 	WS_KERNEL_MONOATTR=""
# customization of console border color
options 	WSDISPLAY_CUSTOM_BORDER	# border customization from wsconsctl(8)
#options 	WSDISPLAY_BORDER_COLOR=WSCOL_BLUE	# default color
a228 2
# console scrolling support.
#options 	WSDISPLAY_SCROLLSUPPORT
d244 1
a244 1
#ioapic* at mainbus?
d247 1
a247 1
#p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
d249 1
a249 1
#apm0	at mainbus0			# Advanced power management
d261 1
a261 1
# Advanced Configuration and Power Interface
d272 3
a274 5
#acpi0 		at mainbus0
#options 	ACPI_PCI_FIXUP		# PCI interrupt routing via ACPI
#options 	ACPI_ACTIVATE_DEV	# If set, activate inactive devices
#options 	ACPICA_PEDANTIC		# force strict conformance to the Spec.
#options 	ACPI_DISABLE_ON_POWEROFF	# disable acpi on power off
d277 6
a282 6
#acpiacad* 	at acpi?		# ACPI AC Adapter
#acpibat* 	at acpi?		# ACPI Battery
#acpibut* 	at acpi?		# ACPI Button
#acpiec* 	at acpi?		# ACPI Embedded Controller
#acpilid* 	at acpi?		# ACPI Lid Switch
#acpitz* 	at acpi?		# ACPI Thermal Zone
d285 6
a290 6
#com* 		at acpi?		# Serial communications interface
#fdc* 		at acpi?		# Floppy disk controller
#lpt* 		at acpi?		# Parallel port
#npx*		at acpi?		# Math coprocessor
#pckbc*  	at acpi?		# PC keyboard controller
#wss* 		at acpi?		# NeoMagic 256AV in wss mode
d293 2
a294 2
#spic* 		at acpi?		# Sony Programmable I/O Controller
#wsmouse* 	at spic?
d297 1
a297 1
#vald* at acpi?
d301 1
a301 1
#pnpbios*	at mainbus?
d304 4
a307 4
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# OPL3-SA3
d314 1
a314 1
#com*		at pnpbios? index ?	# serial ports
d319 1
a319 1
#lpt*		at pnpbios? index ?	# parallel ports
d321 2
a322 2
#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller
d325 1
a325 1
#pciide* 	at pnpbios? index ?
a339 3
#options 	PCIBIOS_LIBRETTO_FIXUP	# this code makes the Toshiba Libretto
					# L2/L3 work, but should not be enabled
					# on anything else.
a345 2
#ichlpcib* at pci? dev ? function ?	# Intel ICH PCI-ISA w/ watchdog and
					# SpeedStep support
a361 1
#isa0	at ichlpcib?
d367 2
a368 2
pcmcia* at pcic? controller ? socket ?
pcmcia* at tcic? controller ? socket ?
d383 1
a383 1
isapnp0 at isa?
d411 3
d424 1
a424 1
#machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
d427 1
a427 1
#wsdisplay* 	at machfb? console ?
d447 1
a447 1
pcmcom* at pcmcia? function ?		# PCMCIA multi-port serial cards
d451 1
a451 1
#com*	at cardbus? dev ? function ?	# Modems and serial cards
d458 16
a473 18
#com3	at isa? port 0x2e8 irq 9
#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
#com*	at ast? slave ?
#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
#boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
#boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
#com*	at boca? slave ?
#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
#com*	at tcom? slave ?
#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
#com*	at rtfps? slave ?
#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
#addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
#com*	at addcom? slave ?
#moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
#com*	at moxa? slave ?
#ioat*	at isa? port 0x220 irq 5	# BOCA IOAT66 6-port serial card
#com*	at ioat? slave ?
a492 3
# PC87366 hardware monitor
#nsclpcsio*	at isa?

d494 2
a495 2
#viapm*	at pci? dev ? function ?
#viaenv* at viapm?
d511 1
a511 1
ahd*	at pci? dev ? function ?	# Adaptec 29320, 39320 (aic790x) SCSI
a519 1
esiop*	at pci? dev ? function ?	# Symbios 53c875 SCSI and newer
d547 3
a549 3
#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
d557 2
a558 2
#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
d600 1
a600 17
pciide* 	at pci? dev ? function ? flags 0x0000	# GENERIC pciide driver
acardide*	at pci? dev ? function ?	# Acard IDE controllers
aceride* 	at pci? dev ? function ?	# Acer Lab IDE controllers
artsata* 	at pci? dev ? function ?	# Intel i31244 SATA controller
cmdide* 	at pci? dev ? function ?	# CMD tech IDE controllers
cypide* 	at pci? dev ? function ?	# Cypress IDE controllers
geodeide* 	at pci? dev ? function ?	# AMD Geode IDE controllers
hptide* 	at pci? dev ? function ?	# Triones/HighPoint IDE controllers
optiide* 	at pci? dev ? function ?	# Opti IDE controllers
piixide* 	at pci? dev ? function ?	# Intel IDE controllers
pdcide* 	at pci? dev ? function ?	# Promise IDE controllers
rccide* 	at pci? dev ? function ?	# ServerWorks IDE controllers
satalink*	at pci? dev ? function ?	# SiI SATALink controllers
siside* 	at pci? dev ? function ?	# SiS IDE controllers
slide*  	at pci? dev ? function ?	# Symphony Labs IDE controllers
stpcide*	at pci? dev ? function ?	# STMicro STPC IDE controllers
viaide* 	at pci? dev ? function ?	# VIA/AMD/Nvidia IDE controllers
a614 3
# ATA (IDE) bus support
atabus* at ata?

d626 2
a627 1
wd*	at atabus? drive ? flags 0x0000
d648 1
a648 1
#fdc1	at isa? port 0x370 irq ? drq ?
d651 1
a651 1
#fd0	at fdc0 drive 0
d654 1
a654 1
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
a670 3
ath*	at pci? dev ? function ?	# Atheros 5210/5211/5212 802.11
atw*	at pci? dev ? function ?	# ADMtek ADM8211 (802.11)
bce* 	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
d680 1
a680 1
#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
a686 1
re*	at pci? dev ? function ?	# Realtek 8139C+/8169/8169S/8110S
a689 2
skc*	at pci? dev ? function ?	# SysKonnect SK9821 Gigabit Ethernet
sk*	at skc?				# SysKonnect SK9821 Gigabit Ethernet
d697 1
a697 1
wm*	at pci? dev ? function ?	# Intel 8254x gigabit
d722 1
a722 1
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
d743 2
a744 2
#depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
#le*	at depca?
d747 1
a747 1
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
d760 4
a763 6
#ath*	at cardbus? dev ? function ?	# Atheros 5210/5211/5212 802.11
#atw*	at cardbus? dev ? function ?	# ADMtek ADM8211 (802.11)
#ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
#fxp*	at cardbus? dev ? function ?	# Intel i8255x
#rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
#tlp*	at cardbus? dev ? function ?	# DECchip 21143
d776 3
a778 3
amhphy* at mii? phy ?			# AMD 79c901 Ethernet PHYs
bmtphy* at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
brgphy* at mii? phy ?			# Broadcom BCM5400-family PHYs
d784 1
a784 2
icsphy* at mii? phy ?			# Integrated Circuit Systems ICS189x
igphy*	at mii? phy ?			# Intel IGP01E1000
d787 2
a788 2
lxtphy* at mii? phy ?			# Level One LXT-970 PHYs
makphy* at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
d790 2
a791 2
nsphyter* at mii? phy ? 		# NS83843 PHYs
pnaphy* at mii? phy ?			# generic HomePNA PHYs
d803 1
d809 2
a810 2
#ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
#ohci*	at cardbus? dev ? function ?	# Open Host Controller
d813 1
a813 1
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
d819 1
a819 1
#usb*	at slhci?
a831 4
# USB eGalax touch-panel
uep*	at uhub? port ?
wsmouse* at uep? mux 0

d848 1
a848 2
scsibus* at umass?
wd*	at umass?
a869 1
udav*	at uhub? port ?		# Davicom DM9601 based adapters
d885 1
a885 1
uplcom* at uhub? port ? 	# I/O DATA USB-RSAQ2 serial adapter
d888 1
a888 1
uvscom* at uhub? port ? 	# SUNTAC Slipper U VS-10U serial adapter
d922 1
a922 1
#fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
d925 1
a925 1
#fwohci* at cardbus? dev ? function ?	# IEEE1394 Open Host Controller
d927 1
a927 1
#fw*	at fwbus?			# IP over 1394
d930 3
a932 3
#fwnode* at fwbus? idhi ? idlo ?
#sbpscsi* at fwnode?
#scsibus* at sbpscsi?
d944 1
a944 1
emuxki* at pci? dev ? function ?	# Creative SBLive! and PCI512
d955 1
a955 1
guspnp* at isapnp?			# Gravis Ultra Sound PnP audio
d962 2
a963 2
#aria0	at isa? port 0x290 irq 10 		# Aria
#ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
d966 2
a967 2
#pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
#sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
d972 1
a972 1
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive
d979 1
a979 1
#opl*	at esl?
d1006 1
a1006 1
#spkr0	at pcppi?		# PC speaker
d1011 9
a1019 9
#az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
#az1	at isa? port 0x358
#rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
#rt1	at isa? port 0x284
#rt2	at isa? port 0x30c
#rt3	at isa? port 0x384
#rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
#rtii1	at isa? port 0x30c
#sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card
d1022 1
a1022 1
#gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d1025 5
a1029 5
#radio*	at az?
#radio*	at gtp?
#radio*	at rt?
#radio*	at rtii?
#radio*	at sf2r?
a1049 7
# Cryptographic Devices

# PCI cryptographic devices
hifn*	at pci? dev ? function ?	# Hifn 7755/7811/795x
ubsec*	at pci? dev ? function ?	# Broadcom 5501/5601/580x/582x


d1052 1
a1052 1
#joy*	at pnpbios? index ?		# Game port
a1079 2
pseudo-device 	crypto		# opencrypto framework

d1082 1
a1082 1
#pseudo-device	cgd		4	# cryptographic disk devices
a1093 4
# Vinum
# pseudo-device	vinum		8	# Vinum
# options 	VINUMDEBUG

d1109 2
a1110 2
#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
d1113 1
a1113 3
#options 	BRIDGE_IPF		# bridge uses IP/IPv6 pfil hooks too
#pseudo-device	pf			# PF packet filter
#pseudo-device	pflog			# PF log if
@


1.564.2.3
log
@Fix some merge mistakes.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d108 2
a109 2
#options 	DIAGNOSTIC	# expensive kernel consistency checks
#options 	DEBUG		# expensive debugging checks/support
d138 4
a141 4
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
#options 	COMPAT_PECOFF	# kernel support to run Win32 apps
@


1.564.2.4
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.3 2004/08/05 20:23:05 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.3 $"
a784 1
cs*	at pcmcia? function ?		# CS89xx Ethernet
d793 2
a794 3
xirc*	at pcmcia? function ?		# Xircom CreditCard Ethernet
com*	at xirc?
xi*	at xirc?
@


1.564.2.5
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.4 2004/08/12 11:41:11 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.4 $"
d108 2
a109 2
options 	DIAGNOSTIC	# expensive kernel consistency checks
options 	DEBUG		# expensive debugging checks/support
a561 1
njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
a603 1
#njs*	at cardbus? dev ? function ?	# Workbit NinjaSCSI-32
@


1.564.2.6
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.5 2004/09/03 12:44:47 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.5 $"
d108 2
a109 2
#options 	DIAGNOSTIC	# expensive kernel consistency checks
#options 	DEBUG		# expensive debugging checks/support
a178 1
#options 	PIM		# Protocol Independent Multicast
d233 2
a234 2
#options 	WS_DEFAULT_COLATTR="(0)"
#options 	WS_DEFAULT_MONOATTR="(0)"
@


1.564.2.7
log
@Fix the sync with head I botched.
@
text
@d108 2
a109 2
options 	DIAGNOSTIC	# expensive kernel consistency checks
options 	DEBUG		# expensive debugging checks/support
@


1.564.2.8
log
@Sync with HEAD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.7 2004/09/21 13:16:35 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.7 $"
a747 1
ipw*	at pci? dev ? function ?	# Intel PRO/Wireless 2100
a1018 1
auacer*	at pci? dev ? function ?	# ALi M5455 integrated AC'97 Audio
@


1.564.2.9
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.8 2004/10/19 15:56:35 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.8 $"
a379 3
#options 	PCIBIOS_SHARP_MM20_FIXUP # this code makes the Sharp MM 20
					# work, but should not be enabled for
					# on anything else.
a948 2
axe*	at uhub? port ?		# ASIX AX88172 based adapters
cdce*	at uhub? port ?		# CDC, Ethernet Networking Control Model
d951 1
d1020 1
a1020 1
auacer* at pci? dev ? function ?	# ALi M5455 integrated AC'97 Audio
@


1.564.2.10
log
@Don't enable DIAGNOSTIC or DEBUG.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.9 2004/11/02 07:50:34 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.9 $"
d108 2
a109 2
#options 	DIAGNOSTIC	# expensive kernel consistency checks
#options 	DEBUG		# expensive debugging checks/support
@


1.564.2.11
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.10 2004/11/03 16:40:13 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.10 $"
a141 1
options		COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
d381 1
a381 1
					# work, but should not be enabled
@


1.564.2.12
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.11 2004/11/14 08:15:16 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.11 $"
d142 1
a142 1
options 	COMPAT_BSDPTY	# /dev/[pt]ty?? ptys.
a662 1
pdcsata*	at pci? dev ? function ?	# Promise SATA150 controllers
@


1.564.2.13
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.12 2004/11/29 07:24:04 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.12 $"
a324 1
#joy*		at acpi?		# Joystick/Game port
a325 1
#mpu*		at acpi?		# Roland MPU-401 MIDI UART
a659 2
iteide* 	at pci? dev ? function ?	# IT Express IDE controllers
ixpide*		at pci? dev ? function ?	# ATI IXP IDE controllers
@


1.564.2.14
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.13 2004/12/18 09:31:03 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.13 $"
d663 1
a663 1
ixpide* 	at pci? dev ? function ?	# ATI IXP IDE controllers
a757 1
iwi*	at pci? dev ? function ?	# Intel PRO/Wireless 2200BG
a1031 1
auixp*	at pci? dev ? function ?	# ATI IXP AC'97 Audio
@


1.564.2.15
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.14 2005/01/17 19:29:28 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.14 $"
a466 1
#options 	PMS_SYNAPTICS_TOUCHPAD	# Enable support for Synaptics Touchpads
a965 3
# USB 802.11b adapters
atu*	at uhub? port ?		# Atmel AT76C50XX based adapters

a1214 1
pseudo-device	tap			# virtual Ethernet
@


1.564.2.16
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.15 2005/01/24 08:34:12 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.15 $"
a167 1
#options	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
a1201 1
pseudo-device	fss		4	# file system snapshot device
@


1.564.2.17
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.16 2005/02/04 11:44:20 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.16 $"
a166 1
# options 	FFS_SNAPSHOT	# FFS snapshots
a169 1
options 	FFS_SNAPSHOT	# ffs snapshots
a363 1
#npx*		at pnpbios? index ?	# Math coprocessor
@


1.564.2.18
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.17 2005/02/15 21:32:41 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.17 $"
d167 1
@


1.564.2.19
log
@Sync with HEAD.

Hi Perry!
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.18 2005/02/17 07:10:36 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.18 $"
d170 1
a170 1
#options 	FFS_NO_SNAPSHOT	# ffs snapshots
a781 1
vge*	at pci? dev ? function ?	# VIATech VT612X Gigabit Ethernet
a869 1
ciphy*	at mii? phy ?			# Cicada CS8201 Gig-E PHYs
@


1.564.2.20
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.19 2005/03/04 16:38:37 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.19 $"
a331 2
#attimer*	at acpi?		# AT Timer
#pcppi*         at acpi?                # AT-style speaker sound
a480 1
attimer0	at isa?
@


1.564.2.21
log
@Sync with HEAD. Here we go again...
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.564.2.20 2005/04/01 14:27:38 skrll Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.564.2.20 $"
d105 1
a105 2
#options 	BUFQ_READPRIO
#options 	BUFQ_PRIOCSCAN
a128 1
options 	COMPAT_30	# NetBSD 3.0
a162 2
file-system	PTYFS		# /dev/ptm support
#file-system	TMPFS		# experimental - Efficient memory file-system
d168 1
a168 1
#options 	UFS_DIRHASH	# UFS Large Directory Hashing - Experimental
a179 1
#options 	IPSEC_NAT_T	# IPsec NAT traversal (NAT-T)
a209 14
# These options control the verified exec feature
#options VERIFIED_EXEC
#
# Uncomment the fingerprint methods below that are desired.  Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
#options VERIFIED_EXEC_FP_RMD160
#options VERIFIED_EXEC_FP_SHA256
#options VERIFIED_EXEC_FP_SHA384
#options VERIFIED_EXEC_FP_SHA512
#options VERIFIED_EXEC_FP_SHA1
#options VERIFIED_EXEC_FP_MD5

a250 3
#options 	WSKBD_EVENT_AUTOREPEAT		# auto repeat in event mode
# don't attach pckbd as the console if no PS/2 keyboard is found
options 	PCKBD_CNATTACH_MAY_FAIL
d252 1
a252 2
#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # for pckbd driver
#options 	UKBD_LAYOUT="(KB_DE | KB_NODEAD)"  # for ukbd driver 
d266 1
a266 1
options 	WSDISPLAY_SCROLLSUPPORT
d311 1
a311 1

a324 1
#attimer*	at acpi?		# AT Timer
d332 2
a333 1
#pcppi*		at acpi?                # AT-style speaker sound
d380 3
a392 5
# PCI fixups, for both PCIBIOS and ACPI
#options 	PCI_ADDR_FIXUP		# fixup PCI I/O addresses
#options 	PCI_BUS_FIXUP		# fixup PCI bus numbering
#options 	PCI_INTR_FIXUP		# fixup PCI interrupt routing

a394 1
gpio* 	at elansc?
a398 1
#gscpcib* at pci? dev ? function ?	# NS Geode PCI-ISA w/ GPIO support
a415 1
#isa0	at gscpcib?
d504 1
a504 1
#com*	at cardbus? function ?	# Modems and serial cards
d546 1
a546 1
#lm0	at isa?	port 0x290		# other common: 0x280, 0x310, 0xc00
a549 1
#gpio*		at nsclpcsio?
a561 3
# GPIO devices
#gpio*	at gscpcib?

d617 3
a619 3
#adv*	at cardbus? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
#ahc*	at cardbus? function ?	# Adaptec ADP-1480
#njs*	at cardbus? function ?	# Workbit NinjaSCSI-32
a756 1
dge*	at pci? dev ? function ?	# Intel 82597 10GbE LR
a763 2
gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
d766 2
a784 1
txp*	at pci? dev ? function ?	# 3com 3cr990
a788 1
xge*	at pci? dev ? function ?	# Neterion (S2io) Xframe-I 10GbE
d853 6
a858 7
#ath*	at cardbus? function ?	# Atheros 5210/5211/5212 802.11
#atw*	at cardbus? function ?	# ADMtek ADM8211 (802.11)
#ex*	at cardbus? function ?	# 3Com 3C575TX
#fxp*	at cardbus? function ?	# Intel i8255x
#rtk*	at cardbus? function ?	# Realtek 8129/8139
#rtw*	at cardbus? function ?	# Realtek 8180L (802.11)
#tlp*	at cardbus? function ?	# DECchip 21143
a866 1
tra*	at mca? slot ?			# Tiara LANCard/E and clones
d905 2
a906 2
#ehci*	at cardbus? function ?	# Enhanced Host Controller
#ohci*	at cardbus? function ?	# Open Host Controller
a935 3
# USB serial adpater
ucycom*	at uhidev? reportid ?

d948 1
a987 3
uipaq*	at uhub? port ?		# iPAQ PDAs
ucom*	at uipaq? portno ?

a1003 4
# Kyocera AIR-EDGE PHONE
ukyopon* at uhub? port ?
ucom*	at ukyopon? portno ?

a1026 1

d1028 1
a1028 1
fwohci*	at pci? dev ? function ?	# IEEE1394 Open Host Controller
d1031 1
a1031 1
#fwohci*	at cardbus? function ?	# IEEE1394 Open Host Controller
d1033 1
a1033 3
ieee1394if* at fwohci?
fwip*	at ieee1394if?			# IP over IEEE1394
sbp*	at ieee1394if? euihi ? euilo ?	# SCSI over IEEE1394
d1035 4
a1047 1
azalia*	at pci? dev ? function ?	# High Definition Audio
d1074 2
a1181 2
geodewdog* at pci? dev ? function ?	# AMD Geode SC1100 watchdog timer

a1217 1
options 	VND_COMPRESSION		# compressed vnd(4)
a1254 3
# a pseudo device needed for verified exec
#pseudo-device veriexec		1

@


1.564.2.22
log
@Sync with head.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.713 2005/12/11 02:11:50 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.713 $"
d174 1
a174 1
#options 	FFS_NO_SNAPSHOT	# No FFS snapshot support
d215 14
a362 3
# Sony LCD brightness etc.
#sony* 		at acpi?		# Sony Miscellaneous Controller

d1241 1
a1241 2
pseudo-device 	crypto		# /dev/crypto device
pseudo-device	swcrypto	# software crypto implementation
d1302 3
a1308 17

# Veriexec
#options VERIFIED_EXEC
#
# a pseudo device needed for veriexec
#pseudo-device	veriexec		1
#
# Uncomment the fingerprint methods below that are desired. Note that
# removing fingerprint methods will have almost no impact on the kernel
# code size.
#
#options VERIFIED_EXEC_FP_RMD160
#options VERIFIED_EXEC_FP_SHA256
#options VERIFIED_EXEC_FP_SHA384
#options VERIFIED_EXEC_FP_SHA512
#options VERIFIED_EXEC_FP_SHA1
#options VERIFIED_EXEC_FP_MD5
@


1.563
log
@Revert out an accidental commit.
@
text
@@


1.562
log
@Pass lwp pointers throughtout the kernel, as required, so that the lwpid can
be inserted into ktrace records.  The general change has been to replace
"struct proc *" with "struct lwp *" in various function prototypes, pass
the lwp through and use l_proc to get the process pointer when needed.

Bump the kernel rev up to 1.6V
@
text
@d101 2
a102 2
options 	DIAGNOSTIC	# expensive kernel consistency checks
options 	DEBUG		# expensive debugging checks/support
d105 1
a105 1
options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
d122 1
a122 1
options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
d129 4
a132 4
options 	COMPAT_MACH	# binary compatibility with Mach binaries
options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
options 	EXEC_MACHO	# exec MACH-O binaries
options 	COMPAT_PECOFF	# kernel support to run Win32 apps
d156 1
a156 1
options 	FFS_EI		# FFS Endian Independent support
d159 1
a159 1
options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
d166 2
a167 2
options 	IPSEC		# IP security
options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
d169 1
a169 1
options 	MROUTING	# IP multicast routing
d171 1
a171 1
options 	NSIP		# XNS tunneling over IP
d173 1
a173 1
options 	EON		# OSI tunneling over IP
d244 1
a244 1
ioapic* at mainbus?
d247 1
a247 1
p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
d249 1
a249 1
apm0	at mainbus0			# Advanced power management
d272 2
a273 2
acpi0 		at mainbus0
options 	ACPI_PCI_FIXUP		# PCI interrupt routing via ACPI
d277 6
a282 6
acpiacad* 	at acpi?		# ACPI AC Adapter
acpibat* 	at acpi?		# ACPI Battery
acpibut* 	at acpi?		# ACPI Button
acpiec* 	at acpi?		# ACPI Embedded Controller
acpilid* 	at acpi?		# ACPI Lid Switch
acpitz* 	at acpi?		# ACPI Thermal Zone
d285 6
a290 6
com* 		at acpi?		# Serial communications interface
fdc* 		at acpi?		# Floppy disk controller
lpt* 		at acpi?		# Parallel port
npx*		at acpi?		# Math coprocessor
pckbc*  	at acpi?		# PC keyboard controller
wss* 		at acpi?		# NeoMagic 256AV in wss mode
d293 2
a294 2
spic* 		at acpi?		# Sony Programmable I/O Controller
wsmouse* 	at spic?
d297 1
a297 1
vald* at acpi?
d301 1
a301 1
pnpbios*	at mainbus?
d304 4
a307 4
ess*		at pnpbios? index ?	# ESS AudioDrive
sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
ym*		at pnpbios? index ?	# OPL3-SA3
d314 1
a314 1
com*		at pnpbios? index ?	# serial ports
d319 1
a319 1
lpt*		at pnpbios? index ?	# parallel ports
d321 2
a322 2
pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
fdc*		at pnpbios? index ?	# floppy controller
d325 1
a325 1
pciide*	at pnpbios? index ?
d424 1
a424 1
machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
d427 1
a427 1
wsdisplay* 	at machfb? console ?
d451 1
a451 1
com*	at cardbus? dev ? function ?	# Modems and serial cards
d458 16
a473 16
com3	at isa? port 0x2e8 irq 9
ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
com*	at ast? slave ?
boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
com*	at boca? slave ?
tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
com*	at tcom? slave ?
rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
com*	at rtfps? slave ?
cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
com*	at addcom? slave ?
moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
com*	at moxa? slave ?
d494 2
a495 2
viapm*	at pci? dev ? function ?
viaenv* at viapm?
d547 3
a549 3
dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
d557 2
a558 2
adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
d648 1
a648 1
fdc1	at isa? port 0x370 irq ? drq ?
d651 1
a651 1
fd0	at fdc0 drive 0
d654 1
a654 1
mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
d680 1
a680 1
hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
d722 1
a722 1
tr*	at pcmcia? function ?		# TROPIC based Token-Ring
d743 2
a744 2
depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
le*	at depca?
d747 1
a747 1
ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
d760 4
a763 4
ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
fxp*	at cardbus? dev ? function ?	# Intel i8255x
rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
tlp*	at cardbus? dev ? function ?	# DECchip 21143
d804 1
a804 1
ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
d809 2
a810 2
ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
ohci*	at cardbus? dev ? function ?	# Open Host Controller
d813 1
a813 1
slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
d816 1
a816 1
usb*	at ehci?
d819 1
a819 1
usb*	at slhci?
d922 1
a922 1
fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
d925 1
a925 1
fwohci* at cardbus? dev ? function ?	# IEEE1394 Open Host Controller
d927 1
a927 1
fw*	at fwbus?			# IP over 1394
d930 3
a932 3
fwnode* at fwbus? idhi ? idlo ?
sbpscsi* at fwnode?
scsibus* at sbpscsi?
d962 2
a963 2
aria0	at isa? port 0x290 irq 10 		# Aria
ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
d966 2
a967 2
pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
d972 1
a972 1
esl*	at pcmcia? function ?			# ESS 1688 AudioDrive
d979 1
a979 1
opl*	at esl?
d1006 1
a1006 1
spkr0	at pcppi?		# PC speaker
d1011 9
a1019 9
az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
az1	at isa? port 0x358
rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
rt1	at isa? port 0x284
rt2	at isa? port 0x30c
rt3	at isa? port 0x384
rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
rtii1	at isa? port 0x30c
sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card
d1022 1
a1022 1
gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d1025 5
a1029 5
radio*	at az?
radio*	at gtp?
radio*	at rt?
radio*	at rtii?
radio*	at sf2r?
d1082 1
a1082 1
pseudo-device	cgd		4	# cryptographic disk devices
d1109 2
a1110 2
pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
@


1.561
log
@Add the options MPBIOS_SCANPCI and MPACPI_SCANPCI to configure PCI roots
with the MPBIOS/ACPI bus information, by walking through the buses, and
descending down every bus that hasn't been marked configured yet.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.560 2003/05/15 13:13:23 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.560 $"
d101 2
a102 2
#options 	DIAGNOSTIC	# expensive kernel consistency checks
#options 	DEBUG		# expensive debugging checks/support
d105 1
a105 1
#options 	DDB_ONPANIC=1	# see also sysctl(8): `ddb.onpanic'
d122 1
a122 1
#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
d129 4
a132 4
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
#options 	COMPAT_PECOFF	# kernel support to run Win32 apps
d156 1
a156 1
#options 	FFS_EI		# FFS Endian Independent support
d159 1
a159 1
#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
d166 2
a167 2
#options 	IPSEC		# IP security
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
d169 1
a169 1
#options 	MROUTING	# IP multicast routing
d171 1
a171 1
#options 	NSIP		# XNS tunneling over IP
d173 1
a173 1
#options 	EON		# OSI tunneling over IP
d244 1
a244 1
#ioapic* at mainbus?
d247 1
a247 1
#p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
d249 1
a249 1
#apm0	at mainbus0			# Advanced power management
d272 2
a273 2
#acpi0 		at mainbus0
#options 	ACPI_PCI_FIXUP		# PCI interrupt routing via ACPI
d277 6
a282 6
#acpiacad* 	at acpi?		# ACPI AC Adapter
#acpibat* 	at acpi?		# ACPI Battery
#acpibut* 	at acpi?		# ACPI Button
#acpiec* 	at acpi?		# ACPI Embedded Controller
#acpilid* 	at acpi?		# ACPI Lid Switch
#acpitz* 	at acpi?		# ACPI Thermal Zone
d285 6
a290 6
#com* 		at acpi?		# Serial communications interface
#fdc* 		at acpi?		# Floppy disk controller
#lpt* 		at acpi?		# Parallel port
#npx*		at acpi?		# Math coprocessor
#pckbc*  	at acpi?		# PC keyboard controller
#wss* 		at acpi?		# NeoMagic 256AV in wss mode
d293 2
a294 2
#spic* 		at acpi?		# Sony Programmable I/O Controller
#wsmouse* 	at spic?
d297 1
a297 1
#vald* at acpi?
d301 1
a301 1
#pnpbios*	at mainbus?
d304 4
a307 4
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# OPL3-SA3
d314 1
a314 1
#com*		at pnpbios? index ?	# serial ports
d319 1
a319 1
#lpt*		at pnpbios? index ?	# parallel ports
d321 2
a322 2
#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller
d325 1
a325 1
#pciide*	at pnpbios? index ?
d424 1
a424 1
#machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
d427 1
a427 1
#wsdisplay* 	at machfb? console ?
d451 1
a451 1
#com*	at cardbus? dev ? function ?	# Modems and serial cards
d458 16
a473 16
#com3	at isa? port 0x2e8 irq 9
#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
#com*	at ast? slave ?
#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
#boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
#boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
#com*	at boca? slave ?
#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
#com*	at tcom? slave ?
#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
#com*	at rtfps? slave ?
#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
#addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
#com*	at addcom? slave ?
#moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
#com*	at moxa? slave ?
d494 2
a495 2
#viapm*	at pci? dev ? function ?
#viaenv* at viapm?
d547 3
a549 3
#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
d557 2
a558 2
#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
d648 1
a648 1
#fdc1	at isa? port 0x370 irq ? drq ?
d651 1
a651 1
#fd0	at fdc0 drive 0
d654 1
a654 1
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
d680 1
a680 1
#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
d722 1
a722 1
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
d743 2
a744 2
#depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
#le*	at depca?
d747 1
a747 1
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
d760 4
a763 4
#ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
#fxp*	at cardbus? dev ? function ?	# Intel i8255x
#rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
#tlp*	at cardbus? dev ? function ?	# DECchip 21143
d804 1
a804 1
#ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
d809 2
a810 2
#ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
#ohci*	at cardbus? dev ? function ?	# Open Host Controller
d813 1
a813 1
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
d816 1
a816 1
#usb*	at ehci?
d819 1
a819 1
#usb*	at slhci?
d922 1
a922 1
#fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller
d925 1
a925 1
#fwohci* at cardbus? dev ? function ?	# IEEE1394 Open Host Controller
d927 1
a927 1
#fw*	at fwbus?			# IP over 1394
d930 3
a932 3
#fwnode* at fwbus? idhi ? idlo ?
#sbpscsi* at fwnode?
#scsibus* at sbpscsi?
d962 2
a963 2
#aria0	at isa? port 0x290 irq 10 		# Aria
#ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
d966 2
a967 2
#pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
#sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
d972 1
a972 1
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive
d979 1
a979 1
#opl*	at esl?
d1006 1
a1006 1
#spkr0	at pcppi?		# PC speaker
d1011 9
a1019 9
#az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
#az1	at isa? port 0x358
#rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
#rt1	at isa? port 0x284
#rt2	at isa? port 0x30c
#rt3	at isa? port 0x384
#rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
#rtii1	at isa? port 0x30c
#sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card
d1022 1
a1022 1
#gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d1025 5
a1029 5
#radio*	at az?
#radio*	at gtp?
#radio*	at rt?
#radio*	at rtii?
#radio*	at sf2r?
d1082 1
a1082 1
#pseudo-device	cgd		4	# cryptographic disk devices
d1109 2
a1110 2
#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
@


1.560
log
@Remove last traces of obsolete olms and omms drivers.
Ok'd by drochner and fvdl.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.559 2003/05/04 16:16:18 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.559 $"
d267 1
d270 1
@


1.559
log
@Enable the amr driver.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.558 2003/04/26 14:10:11 ragge Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.558 $"
a1045 5
# backwards compatible versions
#olms0	at isa? port 0x23c irq 5	# Logitech bus mouse
#olms1	at isa? port 0x238 irq 5
#omms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
#omms1	at isa? port 0x238 irq 5
@


1.558
log
@Add pseudo-device ksyms.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.557 2003/04/21 00:17:46 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.557 $"
d576 1
d585 1
@


1.557
log
@Add commented-out ahd driver.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.556 2003/04/16 23:39:02 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.556 $"
d1134 1
@


1.556
log
@Add mpt(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.555 2003/04/16 23:36:22 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.555 $"
d509 1
@


1.555
log
@Fix a typo.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.554 2003/04/10 22:06:57 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.554 $"
d514 1
@


1.554
log
@Bye Bye UCONSOLE
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.553 2003/04/08 18:58:20 abs Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.553 $"
d769 1
a769 1
acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
@


1.553
log
@Note that BSDI binaries require COMPAT_12, COMPAT_13, and COMPAT_43.
Addresses PR/3553, PR/6872, and PR/8029. Does not address PR/7262
Also add some missing COMPAT_15 entries.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.552 2003/04/05 18:41:19 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.552 $"
a65 1
options 	UCONSOLE	# users can use TIOCCONS (for xconsole)
@


1.552
log
@Add gentbi* PHYs
I noted in reading the log for PR kern/20988 that they were missing
XXX I'm not sure I got the name in the comment right, but if I don't
XXX do this who will?
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.551 2003/03/25 19:37:12 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.551 $"
d113 9
a121 9
options 	COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
options 	COMPAT_09	# NetBSD 0.9,
options 	COMPAT_10	# NetBSD 1.0,
options 	COMPAT_11	# NetBSD 1.1,
options 	COMPAT_12	# NetBSD 1.2,
options 	COMPAT_13	# NetBSD 1.3,
options 	COMPAT_14	# NetBSD 1.4,
options 	COMPAT_15	# NetBSD 1.5,
options 	COMPAT_43	# and 4.3BSD
@


1.551
log
@Implement the beep on halt feature.  When enabled, it makes the kernel beep
the computer speaker when it's completely safe to power down the machine
(after the "The operating system has halted." message).  This is useful for
headless machines.

The feature is only enabled if the BEEP_ONHALT option is defined (disabled      by default).  It can be tuned through the BEEP_ONHALT_{COUNT,PERIOD,PITCH}      options.

Closes my own PR kern/18792.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.550 2003/03/15 19:34:17 jmmv Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.550 $"
d776 1
@


1.550
log
@Note the DDB_ONPANIC option (commented out). Closes my own PR port-i386/17649.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.549 2003/03/05 10:27:59 grant Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.549 $"
d89 7
@


1.549
log
@fix some comments
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.548 2003/02/27 19:22:41 perseant Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.548 $"
d99 1
@


1.548
log
@Make BRIDGE_IPF an option, and document it.  Add it (commented) to GENERIC.
Let brconfig tell whether the bridge is using the ipfilter hook, or not.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.547 2003/02/18 20:13:03 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.547 $"
d259 3
a261 1
#options 	MPACPI
@


1.547
log
@add file-system SMBFS and pseudo-device nsmb, uncommented, marked as
experimental
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.546 2003/02/16 17:35:15 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.546 $"
d1102 1
@


1.546
log
@Add uax(4) (and url(4) in some cases).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.545 2003/01/27 22:31:12 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.545 $"
d145 1
d1114 3
@


1.545
log
@Add the "ataraid" pseudo-device and the "ld" instances that attach
to it.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.544 2003/01/21 02:44:15 itojun Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.544 $"
d852 1
@


1.544
log
@s/options^I^I/options ^I/
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.543 2003/01/20 20:08:30 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.543 $"
d612 4
@


1.543
log
@add support for p1003.1b semaphores. From FreeBSD
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.542 2003/01/19 10:42:06 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.542 $"
d83 1
a83 1
options		P1003_1B_SEMAPHORE	# p1003.1b semaphore support
@


1.542
log
@Correct indentation error for "COMPAT_OSSAUDIO" option.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.541 2003/01/18 22:33:29 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.541 $"
d83 1
@


1.541
log
@add COMPAT_OSSAUDIO [for lkms that need it]. XXX: wish for /dev/ksyms
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.540 2003/01/08 13:41:17 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.540 $"
d116 1
a116 1
options		COMPAT_OSSAUDIO	# OSS (Voxware) audio driver compatibility
@


1.540
log
@Fix indendation problem in entry for "pckbc* at acpi?".
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.539 2003/01/08 13:20:26 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.539 $"
d116 1
d260 1
a260 1
#options 	ACPI_PCI_FIXUP=1	# PCI interrupt routing via ACPI
d282 3
@


1.539
log
@DUMMY_NOPS is gone, replace it with an inverted, less confusing option:
PIC_DELAY. To be used on very old machines.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.538 2003/01/07 18:55:36 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.538 $"
d275 1
a275 1
#pckbc* 	at acpi?		# PC keyboard controller
@


1.538
log
@Add MPACPI option (commented out). Add MPBIOS option by default, it is
needed now to do MP BIOS MP configuration.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.537 2003/01/07 03:19:38 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.537 $"
d39 2
a40 2
# eliminate delay no-ops in I/O; recommended on all but very old machines
#options 	DUMMY_NOPS
@


1.537
log
@*soren* remember <SPACE><TAB> in config files :-)
Space-Tab-ify ACPI examples.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.536 2003/01/05 22:31:13 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.536 $"
d252 5
@


1.536
log
@add ACPIVERBOSE [commented out]
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.535 2003/01/05 21:44:32 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.535 $"
d253 3
a255 3
#acpi0		at mainbus0
#options	ACPI_PCI_FIXUP=1	# PCI interrupt routing via ACPI
#options	ACPI_ACTIVATE_DEV=0	# If set, activate inactive devices
d258 6
a263 6
#acpiacad*	at acpi?		# ACPI AC Adapter
#acpibat*	at acpi?		# ACPI Battery
#acpibut*	at acpi?		# ACPI Button
#acpiec*	at acpi?		# ACPI Embedded Controller
#acpilid*	at acpi?		# ACPI Lid Switch
#acpitz*	at acpi?		# ACPI Thermal Zone
d266 3
a268 3
#com*		at acpi?		# Serial communications interface
#fdc*		at acpi?		# Floppy disk controller
#lpt*		at acpi?		# Parallel port
d270 2
a271 2
#pckbc*		at acpi?		# PC keyboard controller
#wss*		at acpi?		# NeoMagic 256AV in wss mode
d274 2
a275 2
#spic*		at acpi?		# Sony Programmable I/O Controller
#wsmouse*	at spic?
@


1.535
log
@Document all known ACPI devices and options (disabled by default).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.534 2003/01/02 12:36:51 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.534 $"
d176 1
@


1.534
log
@Add commented out entry for acpi(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.532 2002/12/09 16:24:39 david Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.533 $"
a238 1
#acpi0	at mainbus0			# Advanced Control and Power Interface
d249 26
@


1.533
log
@#<space>comment...

Pointed out by collver1 via PR#18468.
@
text
@d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.532 $"
d239 1
@


1.532
log
@Restore the cardbus config line. Cardslot is upset with pcmcia only.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.531 2002/12/09 15:50:57 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.531 $"
d1031 1
a1031 1
#Options to enable various other RAIDframe RAID types.
@


1.531
log
@comment out/comment/move p64h2apic line.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.530 2002/12/09 02:38:13 david Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.530 $"
d344 1
a344 1
#cardbus*	at cardslot?
@


1.530
log
@Don't want cardbus here, since there are no devices on it.
Thanks to Krister Walfridsson for mentioning it.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.529 2002/12/07 07:26:51 jmc Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.529 $"
d235 3
a305 4

#

p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC
@


1.529
log
@Rename the commented out fwscsi -> sbpscsi (names changed once code was
committed)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.528 2002/12/05 09:32:22 ichiro Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.528 $"
d345 1
a345 1
cardbus*	at cardslot?
@


1.528
log
@add IEEE1394 configuration(Comment out)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.526 2002/11/22 12:21:02 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.526 $"
d873 2
a874 2
#fwscsi* at fwnode?
#scsibus* at fwscsi?
@


1.527
log
@Include cbb, and its cardslot and pcmcia children. Needed by some wi cards.
@
text
@d863 12
@


1.526
log
@Fix typo (responsiness -> responsiveness).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.525 2002/11/14 22:37:18 atatat Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.525 $"
d341 2
a342 2
#cbb*		at pci? dev ? function ?
#cardslot*	at cbb?
d345 2
a346 2
#cardbus*	at cardslot?
#pcmcia* 	at cardslot?
@


1.525
log
@Remove t4dw at pci, since we don't have any description or code for a
device with that name.  Addresses PR port-i386/19040.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.524 2002/11/13 20:00:04 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.524 $"
d89 1
a89 1
# Enable experimental buffer queue strategy for better responsiness under 
@


1.524
log
@enable raidframe again, it apparently works fine even w/ MP now
blessed by Frank
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.523 2002/11/13 19:20:24 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.523 $"
a880 1
t4dw*	at pci? dev ? function ?	# Trident 4DWave/SIS7018/ALi M5453
@


1.523
log
@add COMPAT_DARWIN
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.522 2002/11/07 21:56:56 martin Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.522 $"
d1019 2
a1020 3
# RAIDframe is broken with MULTIPROCESSOR / LOCKDEBUG
#pseudo-device	raid		8	# RAIDframe disk driver
#options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
@


1.522
log
@Add a driver for the Myson Technology MTD803 3-in-1 Fast Ethernet Controller,
provided by Peter Bex in PR 18675.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.521 2002/10/27 10:28:39 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.521 $"
d121 1
d881 1
@


1.521
log
@Add fmv* at isapnp? for FMV-183.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.520 2002/10/24 18:22:53 junyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.520 $"
d626 1
@


1.520
log
@Add commented-out machfb attachment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.519 2002/10/18 15:11:11 junyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.519 $"
d649 1
d681 1
a681 1
fmv0	at isa? port 0x2a0 irq ?		# FMV-180 series
@


1.519
log
@Add NEW_BUFQ_STRATEGY (disabled by default).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.518 2002/10/15 18:20:58 junyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.518 $"
d375 1
d378 1
@


1.518
log
@Add (commented out) VGA_RASTERCONSOLE.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.517 2002/10/08 13:09:05 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.517 $"
d88 4
@


1.517
log
@Add ubsa attachment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.516 2002/10/05 16:02:39 elric Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.516 $"
d213 2
@


1.516
log
@add [commented out] cgd's to generic kernel configs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.515 2002/10/04 16:24:47 tsutsui Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.515 $"
d807 3
@


1.515
log
@Add le* at isapnp?
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.514 2002/10/04 03:17:00 itojun Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.514 $"
d1003 1
@


1.514
log
@whitespace
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.513 2002/10/01 12:56:39 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.513 $"
d641 1
@


1.513
log
@Merge Bill Sommerfeld's i386 MP branch. This code has some known
caveats, but works quite well in a lot of MP cases, and all
UP cases that I have tested. Parts of this will hopefully be
reworked in the not-too-distant future.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.300.2.31 2002/08/19 01:22:17 sommerfeld Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.300.2.31 $"
d166 1
a166 1
#options	IPFILTER_DEFAULT_BLOCK	# block all packets by default
@


1.512
log
@Add one space between "#option" and "<tab>IPFILTER_DEFAULT_BLOCK"
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.511 2002/09/21 15:24:29 perry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.511 $"
d43 2
a44 1
options 	PERFCTRS	# performance-monitoring counters support
d166 1
a166 1
#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
d225 3
d297 5
d1002 3
a1004 2
pseudo-device	raid		8	# RAIDframe disk driver
options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
d1013 1
@


1.511
log
@change a tab to a space so commenting elansc isn't as ugly
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.510 2002/09/20 10:39:52 martti Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.510 $"
d165 1
a165 1
#options	IPFILTER_DEFAULT_BLOCK	# block all packets by default
@


1.510
log
@Added (commented out) IPFILTER_DEFAULT_BLOCK.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.509 2002/09/18 02:44:00 lukem Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.509 $"
d280 1
a280 1
elansc*	at pci? dev ? function ?	# AMD Elan SC520 System Controller
@


1.509
log
@enable USERCONF by default; it's small and extremely useful to have available.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.508 2002/09/03 18:55:47 augustss Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.508 $"
d165 1
@


1.508
log
@Replace mr with gtp device.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.507 2002/08/12 03:28:52 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.507 $"
d85 1
a85 1
#options 	USERCONF	# userconf(4) support
@


1.507
log
@Add elansc* at pci? (AMD Elan SC520 System Controller).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.506 2002/08/11 13:50:45 isaki Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.506 $"
d927 1
a927 1
#mr*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d931 1
a931 1
#radio*	at mr?
@


1.506
log
@Commented out slhci. it's experimental yet.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.505 2002/08/11 13:26:28 isaki Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.505 $"
d277 3
@


1.505
log
@Add slhci0, ScanLogic SL811HS/T USB Host Contoller.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.504 2002/08/06 12:09:42 grant Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.504 $"
d731 1
a731 1
slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS
d737 1
a737 1
usb*	at slhci?
@


1.504
log
@add X note comment for INSECURE option.

addresses port-i386/17853 from hclsmith@@yahoo.ca.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.503 2002/08/02 05:26:45 ichiro Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.503 $"
d730 3
d737 1
@


1.503
log
@chenge comment for wi(4)
 - add vender Intersil
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.502 2002/07/22 11:06:00 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.502 $"
d66 1
a66 1
options 	INSECURE	# disable kernel security levels
@


1.502
log
@Sync (commented out) SHMMAXPGS value with vmparam.h.
Closes port-i386/12708 by Patrick Welche.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.501 2002/07/10 08:37:40 itojun Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.501 $"
d642 1
a642 1
wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
@


1.501
log
@whitespace
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.500 2002/07/01 13:19:05 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.500 $"
d81 1
a81 1
#options 	SHMMAXPGS=1024	# 1024 pages is the default
@


1.500
log
@Add example use of WSDISPLAY_CHARFUNCS, from Julio Merino
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.499 2002/06/27 06:34:23 junyoung Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.499 $"
d358 1
a358 1
wskbd* 		at pckbd? console ?
a1029 1

@


1.499
log
@Add VGA_CONSOLE_ATI_BROKEN_FONTSEL (disabled by default).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.498 2002/06/25 03:12:06 lukem Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.498 $"
d207 4
@


1.498
log
@- replace all "scsibus* at XXXX" with a single "scsibus* at scsi?"
- replace all "atapibus* at XXXX" with a single "atapibus* at atapi?"
- replace all "audio* at XXXX" with a single "audio* at audiobus?"
- replace all "midi* at XXXX" (except "midi* at pcppi?") with a single
  "midi* at midibus?"
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.497 2002/06/22 23:13:37 fvdl Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.497 $"
d205 2
@


1.497
log
@Add bge@@pci attachment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.496 2002/06/18 03:06:58 itojun Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.496 $"
d486 1
a486 20
scsibus* at adv?
scsibus* at adw?
scsibus* at aha?
scsibus* at ahb?
scsibus* at ahc?
scsibus* at aic?
scsibus* at bha?
scsibus* at dpt?
scsibus* at esp?
scsibus* at iha?
scsibus* at iopsp?
scsibus* at isp?
scsibus* at mly?
#scsibus* at nca?
scsibus* at pcscp?
scsibus* at sea?
scsibus* at siop?
scsibus* at trm?
scsibus* at uha?
scsibus* at wds?
a513 1
scsibus* at icpsp?
d550 1
a550 2
atapibus* at wdc? channel ?
atapibus* at pciide? channel ?
a755 2
atapibus* at umass? channel ?
scsibus* at umass? channel ?
a806 1
scsibus* at usscanner? channel ?
d882 1
a882 26
#audio*	at aria?
audio*	at auich?
audio*	at autri?
audio*	at auvia?
audio*	at clcs?
audio*	at clct?
audio*	at cmpci?
audio*	at eap?
audio*	at emuxki?
audio*	at esa?
#audio*	at esl?
audio*	at esm?
audio*	at eso?
audio*	at ess?
audio*	at fms?
audio*	at gus?
audio*	at guspnp?
audio*	at neo?
audio*	at pas?
audio*	at sb?
#audio*	at sp?
audio*	at sv?
audio*	at uaudio?
audio*	at wss?
audio*	at yds?
audio*	at ym?
d894 1
a894 7
midi*	at autri?		# Trident 4DWAVE MIDI port
midi*	at clcs?		# Cirrus Logic CS4280 MIDI port
#midi*	at clct?		# Cirrus Logic CS4281 MIDI port
#midi*	at cms?			# Creative Music System
midi*	at eap?			# 137[01] MIDI port
midi*	at mpu?			# MPU 401
midi*	at opl?			# OPL FM synth
a895 2
midi*	at sb?			# SB1 MIDI port
midi*	at umidi?		# USB MIDI
@


1.496
log
@s/options\t\t/options \t/
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.495 2002/06/17 16:33:06 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.495 $"
d608 1
@


1.495
log
@MD systrace gluons.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.494 2002/06/17 05:14:12 lukem Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.494 $"
d72 1
a72 1
options		SYSTRACE	# system call vetting via systrace(1)
@


1.494
log
@Enable "pseudo-device clockctl" in all kernels, except
installation related kernels (INSTALL* and RAMDISK*).
This enables rc.conf(5) $ntpd_chroot to be used "out of the box"
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.493 2002/06/06 21:16:48 gmcgarry Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.493 $"
d72 1
@


1.493
log
@Include PERFCTRS to match MTRR option.  Now pmc(1) does something useful.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.492 2002/05/25 17:05:33 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.492 $"
d1071 1
@


1.492
log
@Add explanation for PMS_DISABLE_POWERHOOKS, as requested by hubertf.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.491 2002/04/26 02:05:10 ad Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.491 $"
d43 1
@


1.491
log
@Add a driver for Adaptec FSA RAID controllers, as often found in Dell
servers. Based on the FreeBSD/OpenBSD versions.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.490 2002/04/25 15:22:44 wiz Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.490 $"
d344 1
a344 1
#options 	PMS_DISABLE_POWERHOOK
@


1.491.4.1
log
@Pull up revision 1.493 (requested by gmcgarry in ticket #230):
Include PERFCTRS to match MTRR option.  Now pmc(1) does something useful.
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a42 1
options 	PERFCTRS	# performance-monitoring counters support
@


1.491.4.2
log
@Pull up revision 1.494 (requested by lukem in ticket #312):
Enable "pseudo-device clockctl" in all kernels, except
installation related kernels (INSTALL* and RAMDISK*).
This enables rc.conf(5) $ntpd_chroot to be used "out of the box"
@
text
@a1070 1
pseudo-device	clockctl		# user control of clock subsystem
@


1.491.4.3
log
@Pull up upgrade to IPfilter 3.4.29 (requested by martti in ticket #905).
Affected files & revisions:

dist/ipf/HISTORY				1.14
dist/ipf/fils.c					1.17-1.21
dist/ipf/ipf.c					1.11-1.13
dist/ipf/ipfs.c					1.8-1.10
dist/ipf/ipft_ef.c				1.6-1.7
dist/ipf/ipft_td.c				1.6-1.7
dist/ipf/ipft_tx.c				1.7-1.8
dist/ipf/ipmon.c				1.12-1.17
dist/ipf/ipnat.c				1.11-1.12
dist/ipf/ipsend/ip_var.h			1.2
dist/ipf/ipsend/ipsend.c			1.8
dist/ipf/ipsend/iptests.c			1.5
dist/ipf/ipt.c					1.8-1.10
dist/ipf/kmem.c					1.8-1.10
dist/ipf/man/ipf.4				1.10
dist/ipf/man/ipf.5				1.8
dist/ipf/man/ipftest.1				1.3
dist/ipf/man/ipmon.8				1.10
dist/ipf/man/ipnat.5				1.9-1.10
dist/ipf/man/ipnat.8				1.4
dist/ipf/misc.c					1.7
dist/ipf/natparse.c				1.10
dist/ipf/parse.c				1.13
dist/ipf/printnat.c				1.8-1.10
dist/ipf/relay.c				1.5-1.6
dist/ipf/rules/example.9			1.2
etc/rc.d/ipnat					1.8
regress/sys/kern/ipf/Makefile			1.3-1.4
regress/sys/kern/ipf/dotest6			1.2
regress/sys/kern/ipf/expected/f13		1.1.1.2
regress/sys/kern/ipf/expected/i12		1.1.1.1
regress/sys/kern/ipf/expected/ni3		1.1.1.1
regress/sys/kern/ipf/expected/ni5		1.2
regress/sys/kern/ipf/input/f13			1.1.1.2
regress/sys/kern/ipf/input/ipv6.1		1.1.1.1
regress/sys/kern/ipf/input/ni3			1.1.1.1
regress/sys/kern/ipf/regress/i12		1.1.1.1
regress/sys/kern/ipf/regress/ipv6.1		1.1.1.1
regress/sys/kern/ipf/regress/ni3.ipf		1.1.1.1
regress/sys/kern/ipf/regress/ni3.nat		1.1.1.1
sys/arch/alpha/conf/ALPHA			1.169,1.171
sys/arch/amiga/conf/GENERIC			1.185-1.186
sys/arch/arc/conf/GENERIC			1.71-1.72
sys/arch/atari/conf/GENERIC.in			1.24-1.25
sys/arch/cats/conf/GENERIC			1.31-1.32
sys/arch/cobalt/conf/GENERIC			1.34-1.35
sys/arch/hp300/conf/GENERIC			1.83-1.84
sys/arch/i386/conf/CARDBUS			1.66-1.67
sys/arch/i386/conf/GENERIC			1.510,1.512
sys/arch/i386/conf/GENERIC_LAPTOP		1.58-1.59
sys/arch/i386/conf/GENERIC_PS2TINY		1.19-1.20
sys/arch/i386/conf/GENERIC_TINY			1.47-1.48
sys/arch/luna68k/conf/GENERIC			1.33-1.33
sys/arch/mac68k/conf/GENERIC			1.130-1.131
sys/arch/mac68k/conf/GENERICSBC			1.21-1.22
sys/arch/mac68k/conf/SMALLRAM			1.4-1.5
sys/arch/macppc/conf/GENERIC			1.142-1.143
sys/arch/mipsco/conf/GENERIC			1.21-1.22
sys/arch/mmeye/conf/GENERIC			1.44-1.45
sys/arch/news68k/conf/GENERIC			1.36-1.37
sys/arch/news68k/conf/GENERIC_TINY		1.18-1.19
sys/arch/newsmips/conf/GENERIC			1.50-1.51
sys/arch/ofppc/conf/GENERIC			1.56-1.57
sys/arch/pmax/conf/GENERIC			1.103-1.104
sys/arch/prep/conf/GENERIC			1.55-1.56
sys/arch/sbmips/conf/GENERIC			1.11-1.12
sys/arch/sgimips/conf/GENERIC			1.7-1.8
sys/arch/sparc/conf/GENERIC			1.138-1.139
sys/arch/sparc64/conf/GENERIC32			1.46-1.47
sys/arch/vax/conf/GENERIC			1.102-1.103
sys/arch/x68k/conf/ALL				1.55-1.56
sys/arch/x68k/conf/GENERIC			1.80-1.81
sys/lkm/netinet/if_ipl/mln_ipl.c		1.29
sys/netinet/fil.c				1.57-1.58
sys/netinet/ip_auth.c				1.29-1.30
sys/netinet/ip_compat.h				1.30-1.31
sys/netinet/ip_fil.c				1.81-1.86
sys/netinet/ip_fil.h				1.46-1.49
sys/netinet/ip_frag.c				1.33-1.34
sys/netinet/ip_frag.h				1.18
sys/netinet/ip_ftp_pxy.c			1.25-1.26
sys/netinet/ip_h323_pxy.c			1.5-1.6
sys/netinet/ip_log.c				1.22-1.23
sys/netinet/ip_nat.c				1.51-1.53
sys/netinet/ip_nat.h				1.27
sys/netinet/ip_netbios_pxy.c			1.4
sys/netinet/ip_proxy.c				1.35-1.36
sys/netinet/ip_proxy.h				1.18
sys/netinet/ip_state.c				1.41-1.42
sys/netinet/ip_state.h				1.23
sys/netinet/ipl.h				1.14
@
text
@a163 1
#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
@


1.491.4.4
log
@Pullup revisions 1.496-1.497 (requested by fvdl in ticket #1126)
 Pullup support for bge device. (Broadcom Gigabit Ethernet)
@
text
@a607 1
bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
@


1.491.4.5
log
@Apply patch (requested by jmmv in ticket #1389):

enable USERCONF in all kernels where it's enabled in -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.491.4.4 2003/01/28 06:28:20 jmc Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.491.4.4 $"
d84 1
a84 1
options 	USERCONF	# userconf(4) support
@


1.491.4.6
log
@Pull up revision 1.571 (requested by mrg in ticket #1486):
enable broadcom BCM4401 (bce) driver (as found on recent dell laptops)
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
a607 1
bce* 	at pci? dev ? function ?	# Broadcom 4401 10/100 Ethernet
@


1.491.4.7
log
@Pull up revision 1.629 (via patch, requested by itohy in ticket #1741):
  Add support for the Workbit NinjaSCSI-32 PCI/Cardbus
  SCSI driver, njs(4).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.491.4.6 2003/10/05 11:49:20 tron Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.491.4.6 $"
a439 1
njs*	at pci? dev ? function ?	# Workbit NinjaSCSI-32
a480 1
#njs*	at cardbus? dev ? function ?	# Workbit NinjaSCSI-32
a499 1
scsibus* at njs?
@


1.491.4.8
log
@Pullup (via patch) requested in ticket #5754 by itohy

  Provide a backport for ukyopon(4) and pullup umodem(4) updates.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.666 2005/04/15 17:27:21 itohy Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.491.4.7 $"
a828 4
# Kyocera AIR-EDGE PHONE
ukyopon* at uhub? port ?
ucom*	at ukyopon? portno ?

@


1.491.2.1
log
@Catch up with -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.492 2002/05/25 17:05:33 jmcneill Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.492 $"
d344 1
a344 1
#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
@


1.491.2.2
log
@catch up with -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.495 2002/06/17 16:33:06 christos Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.495 $"
a42 1
options 	PERFCTRS	# performance-monitoring counters support
a70 1
options		SYSTRACE	# system call vetting via systrace(1)
a1069 1
pseudo-device	clockctl		# user control of clock subsystem
@


1.491.2.3
log
@catch up with -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.501 2002/07/10 08:37:40 itojun Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.501 $"
d72 1
a72 1
options 	SYSTRACE	# system call vetting via systrace(1)
a204 6
# work around a hardware bug that loaded fonts don't work; found on ATI cards
#options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
# the following enables some functions to get mouse console support.
# if you want a really secure system, it may be better not to enable them,
# see wsmoused(8), section SECURITY CONSIDERATIONS for more info.
#options 	WSDISPLAY_CHARFUNCS		# mouse console support
d352 1
a352 1
wskbd*		at pckbd? console ?
d486 20
a505 1
scsibus* at scsi?
d533 1
d570 2
a571 1
atapibus* at atapi?
a607 1
bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
d776 2
d829 1
d905 26
a930 1
audio*	at audiobus?
d942 7
a948 1
midi*	at midibus?
d950 2
d1080 1
@


1.491.2.4
log
@catch up with -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.507 2002/08/12 03:28:52 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.507 $"
d66 1
a66 1
options 	INSECURE	# disable kernel security levels - X needs this
d81 1
a81 1
#options 	SHMMAXPGS=2048	# 2048 pages is the default
a277 3
# System Controllers
elansc*	at pci? dev ? function ?	# AMD Elan SC520 System Controller

d642 1
a642 1
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
a729 3
# ISA USB controllers
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS

a733 1
#usb*	at slhci?
@


1.490
log
@Another options<TAB> -> options<SP><TAB>, noted by Patrick Welche.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.489 2002/04/25 15:06:28 atatat Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.489 $"
d516 1
d524 2
a525 1
ld*	at cac? unit ?			# logical disk devices
@


1.489
log
@Add the INCLUDE_CONFIG_FILE option to all config files.  In config
files that are generic (ie, GENERIC, GENERICSBC, GENERIC32, ALL, or
ALPHA), it is uncommented.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.488 2002/04/25 00:54:54 kleink Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.488 $"
d344 1
a344 1
#options	PMS_DISABLE_POWERHOOK
@


1.488
log
@Attach joy* at eso?.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.487 2002/04/22 21:05:22 ad Exp $
d23 3
a25 1
#ident 		"GENERIC-$Revision: 1.487 $"
@


1.487
log
@Add a driver for ICP-Vortex GDT and Intel Storage RAID controllers. Parts
taken from OpenBSD. Test hardware kindly provided by Intel. This still needs
management bits, and doesn't support older controllers, but that shouldn't
be hard to fix.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.486 2002/04/18 12:54:13 wiz Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.486 $"
d1006 1
@


1.486
log
@Remove opms(4) and its device, /dev/pms0, from the i386 port, because
it has been obsoleted by pms(4).

Reviewed by fvdl and christos.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.485 2002/04/18 12:06:11 bouyer Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.485 $"
d516 1
d522 1
d525 3
@


1.485
log
@Add (commented out) options SIOP_SYMLED
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.484 2002/04/17 02:22:49 mycroft Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.484 $"
a340 1
# "opms" should not be enabled together with "pms"
a342 1
#opms*		at pckbc?		# backwards compatible PS/2 mouse
a989 1
#opms0	at pc? irq 12		# PS/2 auxiliary port mouse
@


1.484
log
@Switch from de to tlp by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.483 2002/04/15 15:00:18 mycroft Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.483 $"
d440 1
@


1.483
log
@Add wm.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.482 2002/04/14 01:42:52 mycroft Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.482 $"
a597 1
de*	at pci? dev ? function ?	# DEC 21x4x-based Ethernet
d619 1
a619 5
tlp*	at pci? dev ? function ?	# DECchip 21x4x (and clones) Ethernet
#options 	TLP_MATCH_21040
#options 	TLP_MATCH_21041
#options 	TLP_MATCH_21140
#options 	TLP_MATCH_21142
@


1.482
log
@The functionality of pmsi has been implemented in pms, so it's time for pmsi
to go back where it came from.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.481 2002/04/12 17:58:17 mycroft Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.481 $"
d627 1
@


1.481
log
@Enable AGP GART support by default.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.480 2002/04/12 08:11:01 gmcgarry Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.480 $"
d341 1
a341 1
# "opms" should not be enabled together with "pms" or "pmsi"
a343 2
pmsi*		at pckbc?		# PS/2 "Intelli"mouse for wsmouse
#options	PMSI_DISABLE_POWERHOOK
a351 1
wsmouse*	at pmsi? mux 0
@


1.480
log
@Add commented-out USERCONF option.  Mainly useful for install media
and can be optionally enabled based on miniroot and ramdisk size
requirements.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.479 2002/04/02 20:48:01 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.479 $"
d277 1
a277 1
#agp* 	at pchb?
@


1.479
log
@Alphabetize.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.478 2002/03/29 02:25:21 itojun Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.478 $"
d81 1
@


1.478
log
@re-enable urlphy
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.477 2002/03/29 01:31:28 itojun Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.477 $"
d724 1
a725 1
ukphy*	at mii? phy ?			# generic unknown PHYs
@


1.477
log
@urlphy is not known to config(8).  need a fix somewhere else.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.476 2002/03/28 21:13:20 ichiro Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.476 $"
d724 1
a724 1
#urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
@


1.476
log
@add Realtek RTL8150L USB ethernet driver

url*    at uhub? port ?
urlphy* at mii? phy ?
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.475 2002/03/19 15:10:21 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.475 $"
d724 1
a724 1
urlphy*	at mii? phy ?			# Realtek RTL8150L internal PHYs
@


1.475
log
@Add uvscom driver.  Untested.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.474 2002/03/04 13:24:10 sommerfeld Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.474 $"
d724 1
d795 1
@


1.474
log
@The "gif*" tunnelling interface does everything ipip does.
Move usage example from ipip.4 to gif.4
Excise ipip and stitch up the scars.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.473 2002/02/27 00:31:12 jmcneill Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.473 $"
d795 1
a795 1
# Prolofic PL2301/PL2302 host-to-host adapter
d799 1
a799 2
# FTDI FT8U100AX serial adapter
uftdi*	at uhub? port ?
d802 3
d808 2
a809 2
umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?
@


1.473
log
@Add options (commented out) for disabling power hooks on the pms and pmsi
PS/2 mouse drivers.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.472 2002/02/10 17:36:57 wiz Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.472 $"
a1050 1
pseudo-device	ipip		2	# IP Encapsulation within IP (RFC 2003)
@


1.472
log
@Update description for icsphy.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.471 2002/02/08 01:47:59 jmcneill Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.471 $"
d342 1
d344 1
@


1.471
log
@Add another pcic at isa attachment. This enables the top PCMCIA slot on
my AST Ascentia 910N, and closes port-i386/11797
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.470 2002/02/06 19:58:02 wiz Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.470 $"
d710 1
a710 1
icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS1890
@


1.470
log
@Another <tab> -> <sp><tab> noted by Patrick Welche.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.469 2002/02/01 15:17:04 wiz Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.469 $"
d297 1
@


1.469
log
@Do '<sp><tab>' instead of '<tab>' for some RAID options.
Noted by Patrick Welche in private mail.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.468 2002/01/28 01:23:32 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.468 $"
d81 1
a81 1
#options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
@


1.468
log
@Keep adv in alphabetical order.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.467 2002/01/27 13:23:18 jdolecek Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.467 $"
d1026 8
a1033 8
# Options to enable various other RAIDframe RAID types.
# options	RF_INCLUDE_EVENODD=1
# options	RF_INCLUDE_RAID5_RS=1
# options	RF_INCLUDE_PARITYLOGGING=1
# options	RF_INCLUDE_CHAINDECLUSTER=1
# options	RF_INCLUDE_INTERDECLUSTER=1
# options 	RF_INCLUDE_PARITY_DECLUSTERING=1
# options	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
@


1.467
log
@add options PIPE_SOCKETPAIR to individual kernel configs
the option is commented out on everything but kernels I was able
to recognize as INSTALL-like or ones for small memory machines
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.466 2002/01/19 18:45:10 oster Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.466 $"
d475 1
a476 1
#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
@


1.466
log
@Add new RF_* options for RAIDframe bits that are no longer built by default.

While we're here, enable RAIDframe (and RAID_AUTOCONFIG) by default for
architectures that I'm comfortable can deal with it being on by default.

Also: bump the number of 'raid' devices from 4 to 8, since 4 seems to
be insufficient in practise.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.465 2002/01/17 16:06:49 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.465 $"
d80 2
@


1.465
log
@Alphabetize audio attachment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.464 2002/01/08 04:36:51 itojun Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.464 $"
d1022 10
a1031 2
#pseudo-device	raid		4	# RAIDframe disk driver
#options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
@


1.464
log
@pss is broken (for now?)
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.463 2002/01/07 19:34:25 jmcneill Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.463 $"
a898 1
audio*	at esa?
d901 1
@


1.463
log
@Re-enable radio at bktr.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.462 2002/01/07 12:12:55 tron Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.462 $"
d868 2
a869 2
pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
d912 1
a912 1
audio*	at sp?
@


1.462
log
@Disable broken radio(4) support for bktr(4). The configuration code doesn't
even check if the TV card has a radio tuner.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.461 2002/01/06 16:07:06 jmcneill Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.461 $"
d971 1
a971 1
#radio* at bktr?
@


1.461
log
@Add entries for the 'esa at pci' audio driver.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.460 2002/01/06 02:45:52 jmcneill Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.460 $"
d971 1
a971 1
radio* at bktr?
@


1.460
log
@Add radio attachment to bktr.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.459 2002/01/04 21:04:42 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.459 $"
d847 1
d899 1
@


1.459
log
@Uncomment udsbr (it works).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.458 2002/01/03 18:56:40 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.458 $"
d969 1
@


1.458
log
@Add ustir.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.457 2002/01/02 04:08:41 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.457 $"
d822 2
a823 2
#udsbr*	at uhub? port ?
#radio*	at udsbr?
@


1.457
log
@Use the right I/O addresses for the ISA radio cards.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.456 2002/01/02 03:23:07 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.456 $"
d776 2
a777 1
# USB IrDA bridges
d780 4
@


1.456
log
@Add (commented out) udsbr.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.455 2002/01/01 22:15:43 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.455 $"
d940 7
a946 2
#rt0	at isa? port 0x350      # AIMS Lab Radiotrack & compatible
#rtii0	at isa? port 0x384      # AIMS Lab Radiotrack II FM Radio Card
@


1.455
log
@Make mr pci attachment conform.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.454 2002/01/01 21:54:21 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.454 $"
d815 4
@


1.454
log
@Add (commented out) radio card support.  From OpenBSD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.453 2002/01/01 16:52:23 hpeyerl Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.453 $"
d941 1
a941 1
#mr*	at pci?			# Guillemot Maxi Radio FM 2000 Radio Card
@


1.453
log
@Add entry for PC Weasel/PCI.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.452 2001/12/28 17:37:03 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.452 $"
d931 18
@


1.452
log
@Update for new uhidev device attachment.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.451 2001/12/28 12:21:56 martin Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.451 $"
d975 3
@


1.451
log
@Add PPPoE to all generic kernels that should be able to use it.
XXX TODO: do this for INSTALL kernels too, add sysinst support and make the
XXX needed binaries available on the ramdisk root fs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.450 2001/12/24 13:47:13 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.450 $"
d743 3
d747 2
a748 2
ums*	at uhub? port ? configuration ? interface ?
wsmouse*	at ums? mux 0
d751 1
a751 1
ukbd*	at uhub? port ? configuration ? interface ?
d755 1
a755 1
uhid*	at uhub? port ? configuration ? interface ?
@


1.450
log
@Add (commented out) wd at umass (for ISD adapters).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.449 2001/12/14 16:24:52 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.449 $"
d991 1
@


1.449
log
@Uncomment uirda since it woks now.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.448 2001/12/14 05:34:48 gmcgarry Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.448 $"
d765 1
@


1.448
log
@Add a blurb to the top of all GENERIC files.  This serves three purposes:
- to clarify some terminology
- to clarify the intention of the GENERIC file
- to cross-reference some useful man pages
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.447 2001/12/12 15:32:13 augustss Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.447 $"
d773 2
a774 2
#uirda* at uhub? port ? configuration ? interface ?
#irframe* at uirda?
@


1.447
log
@Add (commented out) uirda.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.446 2001/12/06 16:51:31 soren Exp $
d3 5
a7 1
#	GENERIC -- everything that's currently supported
d9 11
d21 1
a21 1
include "arch/i386/conf/std.i386"
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.446 $"
@


1.446
log
@options space tab.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.445 2001/12/06 16:35:09 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.445 $"
d756 4
@


1.445
log
@Uncomment IrDA devices since they seem to work now.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.444 2001/12/05 16:48:03 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.444 $"
d798 1
d800 1
a800 1
oboe*	at pci? dev ? function ?
@


1.444
log
@Add (commented out) irframetty.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.443 2001/12/02 16:37:24 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.443 $"
d799 2
a800 2
#oboe*	at pci? dev ? function ?
#irframe* at oboe?
d972 1
a972 1
#pseudo-device	irframetty		# IrDA frame line discipline
@


1.443
log
@Add (commented out) oboe IrDA driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.442 2001/12/01 00:09:07 bouyer Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.442 $"
d972 1
@


1.442
log
@Add st at atapibus, now that it works.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.441 2001/11/21 17:11:02 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.441 $"
d795 6
@


1.441
log
@Add a commented out ehci driver (for the adventurous).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.440 2001/11/20 12:56:29 lukem Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.440 $"
d549 1
@


1.440
log
@cleanup:
	options SPACE TAB
	makeoptions TAB
	psuedo-device TAB
	remove trailing whitespace
	replace multiple spaces -> tabs
	options "FOO" -> options FOO
	options "FOO=bar" -> options FOO=bar
	options "FOO=\"bar\"" -> options FOO="\"bar\""
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.439 2001/11/20 08:43:24 lukem Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.439 $"
d709 2
d715 1
d719 1
@


1.439
log
@- pull in opt_kgdb.h where necessary
- replace opt_kgdb_machdep.h with opt_kgdb.h
- defparam opt_kgdb.h:
	KGDB_DEV KGDB_DEVNAME KGDB_DEVADDR KGDB_DEVRATE KGDB_DEVMODE
- move from opt_ddbparam.h to opt_ddb.h:
	DDB_FROMCONSOLE DDB_ONPANIC DDB_HISTORY_SIZE DDB_BREAK_CHAR SYMTAB_SPACE
- replace KGDBDEV with KGDB_DEV
- replace KGDBADDR with KGDB_DEVADDR
- replace KGDBMODE with KGDB_DEVMODE
- replace KGDBRATE with KGDB_DEVRATE
- use `9600' instead of `0x2580' for 9600 baud rate
- use correct quotes for  options KGDB_DEVNAME="\"com\""
- use correct quotes for  options KGDB_DEV="17*256+0"
- remove unnecessary dependancy on Makefile for kgdb_stub.o
- minor whitespace cleanup
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.438 2001/11/18 03:24:38 someya Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.438 $"
d32 1
a32 1
#options 	"CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
d119 1
a119 1
options 	SOFTDEP         # FFS soft updates support.
d293 1
a293 1
#cardslot*	at cbb?	
d392 1
a392 1
# Hardware monitors 
d515 1
a515 1
wdc*	at isapnp? 
d661 2
a662 2
tr0	at isa? port 0xa20 iomem 0xd8000 irq ?  # IBM TROPIC based Token-Ring
tr1	at isa? port 0xa24 iomem 0xd0000 irq ?  # IBM TROPIC based Token-Ring
d766 1
a766 1
ucom*	at uplcom? portno ? 
d823 1
a823 1
pss0	at isa? port 0x220 irq 7 drq 6  	# Personal Sound System
d874 1
a874 1
#mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible card
d892 1
a892 1
midi*   at umidi?               # USB MIDI
@


1.438
log
@add autri (Trident 4DWAVE based AC'97 audio)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.437 2001/11/16 13:46:31 junyoung Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.437 $"
d73 1
a73 1
#options 	"KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
@


1.437
log
@Add pseudo-device wsfont, which is necessary to make wsfontload(8)
work.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.436 2001/11/13 17:54:51 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.436 $"
d796 1
d849 1
d883 1
@


1.436
log
@The wsmux pseudo device does not need a count anymore.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.435 2001/11/04 09:00:39 yamt Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.435 $"
d978 4
a981 2
# mouse & keyboard multiplexor pseudo-devices
pseudo-device	wsmux
@


1.435
log
@add adv@@cardbus.
(commented out if ahc@@cardbus is commented out.)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.434 2001/11/04 07:39:41 itohy Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.434 $"
d979 1
a979 1
pseudo-device	wsmux		2
@


1.434
log
@Add mpu at cmpci and opl at cmpci attachment.
I always test it on alpha, and add cmpci entries to alpha config files.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.433 2001/11/03 17:08:56 tsutsui Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.433 $"
d459 1
@


1.433
log
@Add trm at pci.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.432 2001/10/17 18:41:20 jdolecek Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.432 $"
d833 1
d872 1
@


1.432
log
@add emuxki (Creative Labs SBLive!)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.431 2001/10/13 15:06:12 ichiro Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.431 $"
d422 1
d481 1
@


1.432.2.1
log
@Sync the thorpej-mips-cache branch with -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.435 2001/11/04 09:00:39 yamt Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.435 $"
a421 1
trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
a457 1
#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
a479 1
scsibus* at trm?
a830 1
opl*	at cmpci? flags 1
a868 1
mpu*	at cmpci?
@


1.431
log
@add entry Intersil Mini-PCI(802.11b)
wi* at pci?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.430 2001/10/04 15:51:32 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.430 $"
d798 1
d849 1
@


1.430
log
@Alphabetize PHYs.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.429 2001/09/30 00:56:51 hubertf Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.429 $"
d604 1
@


1.429
log
@esl is off by default, so switch off audio@@esl and opl@@esl too.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.428 2001/09/29 18:47:07 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.428 $"
d694 1
a695 1
pnaphy*	at mii? phy ?			# generic HomePNA PHYs
@


1.428
log
@Add the esl driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.427 2001/09/21 23:44:21 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.427 $"
d829 1
a829 1
opl*	at esl?
d847 1
a847 1
audio*	at esl?
@


1.427
log
@Add `dpti', which is an I2O vendor extension implementing the DPT/Adaptec
control interface. This makes it possible to run the Linux versions of
dptmgr, raidutil, dptelog and other tools under NetBSD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.426 2001/09/14 21:44:21 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.426 $"
d822 3
d829 1
d847 1
@


1.426
log
@Change all instances of "[e]isa* at foo?" to "[e]isa0 at foo?".

This prevents attaching multiple [E]ISA buses, which we don't support
(Is there any such thing to support? I'm skeptical) and avoids the
"panic: isaattach: ISA bus already seen" that occurs on some laptops
with docking stations and EISA boxes. Since there is only one [E]ISA bus,
logically, the ISA device probe will still find devices on the
docking station.

This does not address the problem of inserting or removing the docking station
at runtime.

Relevant PRs: kern/6544, port-i386/10392, kern/11627, kern/13557,
install/13865.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.425 2001/09/10 10:19:12 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.425 $"
d406 1
@


1.425
log
@Oops, didn't mean to enable agp by default yet.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.424 2001/09/10 10:18:37 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.424 $"
d262 2
a263 2
eisa*	at mainbus?
eisa*	at pceb?
d266 3
a268 3
isa*	at mainbus?
isa*	at pceb?
isa*	at pcib?
@


1.424
log
@Add 	agp*    at pchb?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.423 2001/09/10 10:17:29 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.423 $"
d259 1
a259 1
agp* 	at pchb?
@


1.423
log
@Add MTRR option.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.422 2001/09/07 00:18:27 lukem Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.422 $"
d258 2
@


1.422
log
@use  options SPACE TAB
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.421 2001/09/06 13:29:29 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.421 $"
d24 2
@


1.422.2.1
log
@file GENERIC was added on branch thorpej-devvp on 2001-10-01 12:39:33 +0000
@
text
@d1 961
@


1.422.2.2
log
@Catch up with -current.
@
text
@a0 971
#	$NetBSD: GENERIC,v 1.422.2.1 2001/10/01 12:39:33 fvdl Exp $
#
#	GENERIC -- everything that's currently supported
#

include "arch/i386/conf/std.i386"

#ident 		"GENERIC-$Revision: 1.422.2.1 $"

maxusers	32		# estimated number of users

# CPU support.  At least one is REQUIRED.
options 	I386_CPU
options 	I486_CPU
options 	I586_CPU
options 	I686_CPU

# CPU-related options.
options 	MATH_EMULATE	# floating point emulation
options 	VM86		# virtual 8086 emulation
options 	USER_LDT	# user-settable LDT; used by WINE
# eliminate delay no-ops in I/O; recommended on all but very old machines
#options 	DUMMY_NOPS

options 	MTRR		# memory-type range register syscall support

# delay between "rebooting ..." message and hardware reset, in milliseconds
#options 	CPURESET_DELAY=2000

# This option allows you to force a serial console at the specified
# I/O address.   see console(4) for details.
#options 	"CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
#	you don't want the option below ON iff you are using the
#	serial console option of the new boot strap code.
#options 	CONS_OVERRIDE	# Always use above! independent of boot info

# The following options override the memory sizes passed in from the boot
# block.  Use them *only* if the boot block is unable to determine the correct
# values.  Note that the BIOS may *correctly* report less than 640k of base
# memory if the extended BIOS data area is located at the top of base memory
# (as is the case on most recent systems).
#options 	REALBASEMEM=639		# size of base memory (in KB)
#options 	REALEXTMEM=15360	# size of extended memory (in KB)

# Standard system options

options 	UCONSOLE	# users can use TIOCCONS (for xconsole)
options 	INSECURE	# disable kernel security levels

options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
options 	NTP		# NTP phase/frequency locked loop

options 	KTRACE		# system call tracing via ktrace(1)

options 	SYSVMSG		# System V-like message queues
options 	SYSVSEM		# System V-like semaphores
#options 	SEMMNI=10	# number of semaphore identifiers
#options 	SEMMNS=60	# number of semaphores in system
#options 	SEMUME=10	# max number of undo entries per process
#options 	SEMMNU=30	# number of undo structures in system
options 	SYSVSHM		# System V-like memory sharing
#options 	SHMMAXPGS=1024	# 1024 pages is the default

options 	LKM		# loadable kernel modules

# Diagnostic/debugging support options
#options 	DIAGNOSTIC	# expensive kernel consistency checks
#options 	DEBUG		# expensive debugging checks/support
#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
options 	DDB		# in-kernel debugger
options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
#options 	KGDB		# remote debugger
#options 	"KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
#makeoptions	DEBUG="-g"	# compile full symbol table

# Compatibility options
options 	COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
options 	COMPAT_09	# NetBSD 0.9,
options 	COMPAT_10	# NetBSD 1.0,
options 	COMPAT_11	# NetBSD 1.1,
options 	COMPAT_12	# NetBSD 1.2,
options 	COMPAT_13	# NetBSD 1.3,
options 	COMPAT_14	# NetBSD 1.4,
options 	COMPAT_15	# NetBSD 1.5,
options 	COMPAT_43	# and 4.3BSD
options 	COMPAT_386BSD_MBRPART # recognize old partition ID
#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.

options 	COMPAT_SVR4	# binary compatibility with SVR4
options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
options 	COMPAT_LINUX	# binary compatibility with Linux
options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
#options 	COMPAT_PECOFF	# kernel support to run Win32 apps

# File systems
file-system 	FFS		# UFS
file-system 	EXT2FS		# second extended file system (linux)
file-system 	LFS		# log-structured file system
file-system 	MFS		# memory file system
file-system 	NFS		# Network File System client
file-system 	NTFS		# Windows/NT file system (experimental)
file-system 	CD9660		# ISO 9660 + Rock Ridge file system
file-system 	MSDOSFS		# MS-DOS file system
file-system 	FDESC		# /dev/fd
file-system 	KERNFS		# /kern
file-system 	NULLFS		# loopback file system
file-system 	OVERLAY		# overlay file system
file-system 	PORTAL		# portal filesystem (still experimental)
file-system 	PROCFS		# /proc
file-system 	UMAPFS		# NULLFS + uid and gid remapping
file-system 	UNION		# union file system
file-system	CODA		# Coda File System; also needs vcoda (below)

# File system options
options 	QUOTA		# UFS quotas
#options 	FFS_EI		# FFS Endian Independent support
options 	SOFTDEP         # FFS soft updates support.
options 	NFSSERVER	# Network File System server
#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
				# immutable) behave as system flags.

# Networking options
#options 	GATEWAY		# packet forwarding
options 	INET		# IP + ICMP + TCP + UDP
options 	INET6		# IPV6
#options 	IPSEC		# IP security
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
#options 	IPSEC_DEBUG	# debug for IP security
#options 	MROUTING	# IP multicast routing
options 	NS		# XNS
#options 	NSIP		# XNS tunneling over IP
options 	ISO,TPIP	# OSI
#options 	EON		# OSI tunneling over IP
options 	CCITT,LLC,HDLC	# X.25
options 	NETATALK	# AppleTalk networking protocols
options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP
options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
options 	PFIL_HOOKS	# pfil(9) packet filter hooks
options 	IPFILTER_LOG	# ipmon(8) log support
#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG

# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
options 	EISAVERBOSE	# verbose EISA device autoconfig messages
options 	MIIVERBOSE	# verbose PHY autoconfig messages
options 	PCIVERBOSE	# verbose PCI device autoconfig messages
#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
#options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
options 	SCSIVERBOSE	# human readable SCSI error messages
options 	USBVERBOSE	# verbose USB device autoconfig messages
#options 	PNPBIOSVERBOSE	# verbose PnP BIOS messages
#options 	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
options 	I2OVERBOSE	# verbose I2O driver messages
options 	MCAVERBOSE	# verbose MCA device autoconfig messages

options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM

#
# wscons options
#
# builtin terminal emulations
#options 	WSEMUL_SUN		# sun terminal emulation
options 	WSEMUL_VT100		# VT100 / VT220 emulation
# different kernel output - see dev/wscons/wsdisplayvar.h
options 	WS_KERNEL_FG=WSCOL_GREEN
#options 	WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
options 	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
options 	WSDISPLAY_COMPAT_SYSCONS	# emulate some ioctls
options 	WSDISPLAY_COMPAT_USL		# VT handling
options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
#options 	WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
options 	PCDISPLAY_SOFTCURSOR
# modify the screen type of the console; defaults to "80x25"
#options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""

# Kernel root file system and dump configuration.
config		netbsd	root on ? type ?
#config		netbsd	root on sd0a type ffs
#config		netbsd	root on ? type nfs

#
# Device configuration
#

mainbus0 at root

#apm0	at mainbus0			# Advanced power management

# Tuning for power management, see apm(4) for more details.
#options 	APM_NO_IDLE		# Don't call BIOS CPU idle function
#options 	APM_V10_ONLY		# Use only the APM 1.0 calls
#options 	APM_NO_POWEROFF		# Don't power off on halt(8)
#options 	APM_POWER_PRINT		# Print stats on the console
#options 	APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts


# Basic Bus Support

# Plug-and-Play BIOS and attached devices

#pnpbios*	at mainbus?

# mainboard audio chips
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# OPL3-SA3

# com port
# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
# will be no com0.  A side effect is pcmcia (and other) com? previously
# starting at com3 may attach as com1 or com2.
#com*		at pnpbios? index ?	# serial ports

# parallel port
# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
# "printer interfaces".
#lpt*		at pnpbios? index ?	# parallel ports

#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide*	at pnpbios? index ?

# PCI bus support
pci*	at mainbus? bus ?
pci*	at pchb? bus ?
pci*	at ppb? bus ?

# Configure PCI using BIOS information
#options 	PCIBIOS			# PCI BIOS support
#options 	PCIBIOSVERBOSE		# PCI BIOS verbose info
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O addresses
#options 	PCIBIOS_BUS_FIXUP	# fixup PCI bus numbering
#options 	PCIBIOS_INTR_FIXUP	# fixup PCI interrupt routing
#options 	PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
#options 	PCIBIOS_INTR_GUESS	# see pcibios(4)
#options 	PCIINTR_DEBUG		# super-verbose PCI interrupt fixup

# PCI bridges
pchb*	at pci? dev ? function ?	# PCI-Host bridges
pceb*	at pci? dev ? function ?	# PCI-EISA bridges
pcib*	at pci? dev ? function ?	# PCI-ISA bridges
pcmb*	at pci? dev ? function ?	# PCI-MCA bridges
ppb*	at pci? dev ? function ?	# PCI-PCI bridges
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc*	at pci? dev ? function ?	# PCI "universal" comm. cards

#agp* 	at pchb?

# EISA bus support
eisa0	at mainbus?
eisa0	at pceb?

# ISA bus support
isa0	at mainbus?
isa0	at pceb?
isa0	at pcib?

# PCMCIA bus support
pcmcia*	at pcic? controller ? socket ?
pcmcia*	at tcic? controller ? socket ?

# MCA bus support
mca0	at mainbus?

# ISA PCMCIA controllers
pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1	at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
tcic0	at isa? port 0x240 iomem 0xd0000 iosiz 0x10000

# PCI PCMCIA controllers
pcic0	at pci? dev? function ?

# ISA Plug-and-Play bus support
isapnp0	at isa?

# ISA Plug-and-Play PCMCIA controllers
pcic*	at isapnp?

# CardBus bridge support
#cbb*		at pci? dev ? function ?
#cardslot*	at cbb?	

# CardBus bus support
#cardbus*	at cardslot?
#pcmcia* 	at cardslot?

# Coprocessor Support

# Math Coprocessor support
npx0	at isa? port 0xf0 irq 13	# x86 math coprocessor


# Console Devices

# ISA console
#pc0	at isa? port 0x60 irq 1		# pccons generic PC console driver
# Keyboard layout configuration for pccons
#options 	FRENCH_KBD
#options 	FINNISH_KBD
#options 	GERMAN_KBD
#options 	NORWEGIAN_KBD
# pccons-specific options:
#options 	XSERVER_DDB	# PF12 gets you into DDB when X is running
#options 	XSERVER		# X server support


# wscons
pckbc0		at isa?			# pc keyboard controller
pckbd*		at pckbc?		# PC keyboard
# "opms" should not be enabled together with "pms" or "pmsi"
pms*		at pckbc?		# PS/2 mouse for wsmouse
pmsi*		at pckbc?		# PS/2 "Intelli"mouse for wsmouse
#opms*		at pckbc?		# backwards compatible PS/2 mouse
vga0		at isa?
vga*		at pci? dev ? function ?
pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
wsdisplay*	at vga? console ?
wsdisplay*	at pcdisplay? console ?
wskbd* 		at pckbd? console ?
wsmouse*	at pms? mux 0
wsmouse*	at pmsi? mux 0

pcppi0		at isa?
sysbeep0	at pcppi?

# Serial Devices

# PCI serial interfaces
com*	at puc? port ?			# 16x50s on "universal" comm boards
cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards

# ISA Plug-and-Play serial interfaces
com*	at isapnp?			# Modems and serial boards

# PCMCIA serial interfaces
com*	at pcmcia? function ?		# Modems and serial cards

pcmcom*	at pcmcia? function ?		# PCMCIA multi-port serial cards
com*	at pcmcom? slave ?		# ...and the slave devices

# CardBus serial interfaces
#com*	at cardbus? dev ? function ?	# Modems and serial cards

# ISA serial interfaces
#options 	COM_HAYESP		# adds Hayes ESP serial board support
com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
com1	at isa? port 0x2f8 irq 3
com2	at isa? port 0x3e8 irq 5
#com3	at isa? port 0x2e8 irq 9
#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
#com*	at ast? slave ?
#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
#boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
#boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
#com*	at boca? slave ?
#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
#com*	at tcom? slave ?
#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
#com*	at rtfps? slave ?
#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards
#addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
#com*	at addcom? slave ?
#moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
#com*	at moxa? slave ?

# MCA serial interfaces
com*	at mca? slot ?			# 16x50s on comm boards

# Parallel Printer Interfaces

# PCI parallel printer interfaces
lpt*	at puc? port ?			# || ports on "universal" comm boards

# ISA parallel printer interfaces
lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
lpt1	at isa? port 0x278
lpt2	at isa? port 0x3bc

# Hardware monitors 

# LM7[89] and compatible hardware monitors
#lm0	at isa?	port 0x290		# other common ports: 0x280, 0x310

# VIA VT82C686A hardware monitor
#viapm*	at pci? dev ? function ?
#viaenv* at viapm?


# I2O devices
iop*	at pci? dev ? function ?	# I/O processor
iopsp*	at iop? tid ?			# SCSI/FC-AL ports
ld*	at iop? tid ?			# block devices
dpti*	at iop? tid 0			# DPT/Adaptec control interface


# SCSI Controllers and Devices

# PCI SCSI controllers
adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI

# EISA SCSI controllers
ahb*	at eisa? slot ?			# Adaptec 174[02] SCSI
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
bha*	at eisa? slot ?			# BusLogic 7xx SCSI
dpt*	at eisa? slot ?			# DPT EATA SCSI
uha*	at eisa? slot ?			# UltraStor 24f SCSI

# PCMCIA SCSI controllers
aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI
esp*	at pcmcia? function ?		# Qlogic ESP406/FAS408 SCSI

# ISA Plug-and-Play SCSI controllers
aha*	at isapnp? 			# Adaptec AHA-154[02
aic*	at isapnp?			# Adaptec AHA-1520B

# ISA SCSI controllers
adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02] SCSI
aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI
aha1	at isa? port 0x334 irq ? drq ?
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
bha1	at isa? port 0x334 irq ? drq ?
# The "nca" and "dpt" probes might give false hits or hang your machine.
#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
sea0	at isa? iomem 0xc8000 irq 5	# Seagate/Future Domain SCSI
uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI
uha1	at isa? port 0x340 irq ? drq ?
wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
wds1	at isa? port 0x358 irq 11 drq 5

# CardBus SCSI cards
#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480

# MCA SCSI cards
aha*	at mca? slot ?			# Adaptec AHA-1640

# SCSI bus support
scsibus* at adv?
scsibus* at adw?
scsibus* at aha?
scsibus* at ahb?
scsibus* at ahc?
scsibus* at aic?
scsibus* at bha?
scsibus* at dpt?
scsibus* at esp?
scsibus* at iha?
scsibus* at iopsp?
scsibus* at isp?
scsibus* at mly?
#scsibus* at nca?
scsibus* at pcscp?
scsibus* at sea?
scsibus* at siop?
scsibus* at uha?
scsibus* at wds?

# SCSI devices
sd*	at scsibus? target ? lun ?	# SCSI disk drives
st*	at scsibus? target ? lun ?	# SCSI tape drives
cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
ch*	at scsibus? target ? lun ?	# SCSI autochangers
ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devices
ss*	at scsibus? target ? lun ?	# SCSI scanners
uk*	at scsibus? target ? lun ?	# SCSI unknown


# RAID controllers and devices
cac*	at eisa? slot ?			# Compaq EISA array controllers
cac*	at pci? dev ? function ?	# Compaq PCI array controllers
mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
mlx*	at eisa? slot ?			# Mylex DAC960 & DEC SWXCR family
twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers

ld*	at cac? unit ?			# logical disk devices
ld*	at twe? unit ?
ld*	at mlx? unit ?

# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
# how to set up DMA modes for this chip. This may work, or may cause
# a machine hang with some controllers.
pciide* at pci? dev ? function ? flags 0x0000

# ISA Plug-and-Play IDE controllers
wdc*	at isapnp? 

# PCMCIA IDE controllers
wdc*	at pcmcia? function ?

# ISA ST506, ESDI, and IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
# fall back to 16bits I/O if 32bits I/O are not functional).
# Some controllers pass the initial 32bit test, but will fail later.
wdc0	at isa? port 0x1f0 irq 14 flags 0x00
wdc1	at isa? port 0x170 irq 15 flags 0x00

# IDE drives
# Flags are used only with controllers that support DMA operations
# and mode settings (e.g. some pciide controllers)
# The lowest order four bits (rightmost digit) of the flags define the PIO
# mode to use, the next set of four bits the DMA mode and the third set the
# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
# to use, and the last bit must be 1 for this setting to be used.
# For DMA and UDMA, 0xf (1111) means 'disable'.
# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
# (0xc=1100, 0xa=1010, 0xf=1111)
# 0x0000 means "use whatever the drive claims to support".
wd*	at wdc? channel ? drive ? flags 0x0000
wd*	at pciide? channel ? drive ? flags 0x0000

# ATAPI bus support
atapibus* at wdc? channel ?
atapibus* at pciide? channel ?

# ATAPI devices
# flags have the same meaning as for IDE drives.
cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown


# Miscellaneous mass storage devices

# ISA floppy
fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
#fdc1	at isa? port 0x370 irq ? drq ?
fd*	at fdc? drive ?			# the drives themselves
# some machines need you to do this instead of fd*
#fd0	at fdc0 drive 0

# ISA CD-ROM devices
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives

# ISA tape devices
# note: the wt driver conflicts unpleasantly with SMC boards at the
# same I/O address. The probe reprograms their EEPROMs. Don't
# uncomment it unless you are actually using it.
#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives

# MCA ESDI devices
edc*	at mca? slot ?			# IBM ESDI Disk Controllers
ed*	at edc?


# Network Interfaces

# PCI network interfaces
an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
de*	at pci? dev ? function ?	# DEC 21x4x-based Ethernet
en*	at pci? dev ? function ?	# ENI/Adaptec ATM
ep*	at pci? dev ? function ?	# 3Com 3c59x
epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
esh*	at pci? dev ? function ?	# Essential HIPPI card
ex*	at pci? dev ? function ?	# 3Com 90x[BC]
fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
rtk*	at pci? dev ? function ?	# Realtek 8129/8139
sf*	at pci? dev ? function ?	# Adaptec AIC-6915 Ethernet
sip*	at pci? dev ? function ?	# SiS 900/DP83815 Ethernet
ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
tlp*	at pci? dev ? function ?	# DECchip 21x4x (and clones) Ethernet
#options 	TLP_MATCH_21040
#options 	TLP_MATCH_21041
#options 	TLP_MATCH_21140
#options 	TLP_MATCH_21142
vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet

# EISA network interfaces
ep*	at eisa? slot ?			# 3Com 3c579 Ethernet
fea*	at eisa? slot ?			# DEC DEFEA FDDI
tlp*	at eisa? slot ?			# DEC DE-425 Ethernet

# ISA Plug-and-Play network interfaces
an*	at isapnp?			# Aironet 802.11
ep*	at isapnp?			# 3Com 3c509 Ethernet
ne*	at isapnp?			# NE2000-compatible Ethernet
tr*	at isapnp?			# IBM/3COM TROPIC Token-Ring

# PCMCIA network interfaces
an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
awi*	at pcmcia? function ?		# BayStack 650/660 (802.11FH/DS)
cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer
ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
mbe*	at pcmcia? function ?		# MB8696x based Ethernet
ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
ray*	at pcmcia? function ?		# Raytheon Raylink (802.11)
sm*	at pcmcia? function ?		# Megahertz Ethernet
# tr at pcmcia has problems with Cardbus bridges
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet

mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
com*	at mhzc?
sm*	at mhzc?

# ISA network interfaces
ate0	at isa? port 0x2a0 irq ?		# AT1700
cs0	at isa? port 0x300 iomem ? irq ? drq ?	# CS8900 Ethernet
ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3Com 3c503 Ethernet
eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
ep*	at isa? port ? irq ?			# 3C509 ethernet cards
ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
fmv0	at isa? port 0x2a0 irq ?		# FMV-180 series
ix0	at isa? port 0x300 irq 10		# EtherExpress/16
iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
#depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
#le*	at depca?
nele0	at isa? port 0x320 irq 9 drq 7		# NE2100
le*	at nele?
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
bicc0	at isa? port 0x320 irq 10 drq 7		# BICC IsoLan
le*	at bicc?
ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
ne1	at isa? port 0x300 irq 10
sm0	at isa? port 0x300 irq 10		# SMC91C9x Ethernet
tr0	at isa? port 0xa20 iomem 0xd8000 irq ?  # IBM TROPIC based Token-Ring
tr1	at isa? port 0xa24 iomem 0xd0000 irq ?  # IBM TROPIC based Token-Ring
tr*	at isa? port ? irq ?			# 3COM TROPIC based Token-Ring
we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC Ethernet
we1	at isa? port 0x300 iomem 0xcc000 irq 10

# CardBus network cards
#ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
#fxp*	at cardbus? dev ? function ?	# Intel i8255x
#rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
#tlp*	at cardbus? dev ? function ?	# DECchip 21143

# MCA network cards
elmc*	at mca? slot ?			# 3Com EtherLink/MC (3c523)
ep*	at mca? slot ?			# 3Com EtherLink III (3c529)
we*	at mca? slot ?			# WD/SMC Ethernet
ate*	at mca? slot ?			# Allied Telesis AT1720
ne*	at mca? slot ?			# Novell NE/2 and clones
tr*	at mca? slot ?			# IBM Token Ring adapter
le*	at mca? slot ?			# SKNET Personal/MC2+

# MII/PHY support
acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
exphy*	at mii? phy ?			# 3Com internal PHYs
glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS1890
inphy*	at mii? phy ?			# Intel 82555 PHYs
iophy*	at mii? phy ?			# Intel 82553 PHYs
lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
nsphy*	at mii? phy ?			# NS83840 PHYs
nsphyter* at mii? phy ?			# NS83843 PHYs
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
pnaphy*	at mii? phy ?			# generic HomePNA PHYs
sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
tlphy*	at mii? phy ?			# ThunderLAN PHYs
tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
ukphy*	at mii? phy ?			# generic unknown PHYs


# USB Controller and Devices

# PCI USB controllers
ohci*	at pci?	dev ? function ?	# Open Host Controller
uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)

# CardBus USB controllers
#ohci*	at cardbus? dev ? function ?	# Open Host Controller

# USB bus support
usb*	at ohci?
usb*	at uhci?

# USB Hubs
uhub*	at usb?
uhub*	at uhub? port ? configuration ? interface ?

# USB Mice
ums*	at uhub? port ? configuration ? interface ?
wsmouse*	at ums? mux 0

# USB Keyboards
ukbd*	at uhub? port ? configuration ? interface ?
wskbd*	at ukbd? console ? mux 1

# USB Generic HID devices
uhid*	at uhub? port ? configuration ? interface ?

# USB Printer
ulpt*	at uhub? port ? configuration ? interface ?

# USB Modem
umodem*	at uhub? port ? configuration ?
ucom*	at umodem?

# USB Mass Storage
umass*	at uhub? port ? configuration ? interface ?
atapibus* at umass? channel ?
scsibus* at umass? channel ?

# USB audio
uaudio*	at uhub? port ? configuration ?

# USB MIDI
umidi* at uhub? port ? configuration ?

# USB Ethernet adapters
aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters

# Prolofic PL2301/PL2302 host-to-host adapter
upl*	at uhub? port ?

# Serial adapters
# FTDI FT8U100AX serial adapter
uftdi*	at uhub? port ?
ucom*	at uftdi? portno ?

uplcom*	at uhub? port ?		# I/O DATA USB-RSAQ2 serial adapter
ucom*	at uplcom? portno ? 

umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

# Diamond Multimedia Rio 500
urio*	at uhub? port ?

# USB Handspring Visor
uvisor*	at uhub? port ?
ucom*	at uvisor?

# USB scanners
uscanner* at uhub? port ?

# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
scsibus* at usscanner? channel ?

# Y@@P firmware loader
uyap* at uhub? port ?

# USB Generic driver
ugen*	at uhub? port ?


# Audio Devices

# PCI audio devices
auich*	at pci? dev ? function ?	# Intel ICH integrated AC'97 Audio
auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
clcs*	at pci? dev ? function ?	# Cirrus Logic CS4280
clct*	at pci? dev ? function ?	# Cirrus Logic CS4281
cmpci*	at pci? dev ? function ?	# C-Media CMI8338/8738
eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
esm*	at pci? dev ? function ?	# ESS Maestro-1/2/2e PCI Audio Accelerator
eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
fms*	at pci? dev ? function ?	# Forte Media FM801
neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
sv*	at pci? dev ? function ?	# S3 SonicVibes
yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio

# ISA Plug-and-Play audio devices
ess*	at isapnp?			# ESS Tech ES1887, ES1888, ES888 audio
guspnp*	at isapnp?			# Gravis Ultra Sound PnP audio
sb*	at isapnp?			# SoundBlaster-compatible audio
wss*	at isapnp?			# Windows Sound System
ym*	at isapnp?			# Yamaha OPL3-SA3 audio

# ISA audio devices
# the "aria" probe might give false hits
#aria0	at isa? port 0x290 irq 10 		# Aria
#ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
pss0	at isa? port 0x220 irq 7 drq 6  	# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
sb0	at isa? port 0x220 irq 5 drq 1 drq2 5	# SoundBlaster
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System

# PCMCIA audio devices
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive

#cms0	at isa? port 0x220			# Creative Music System

# OPL[23] FM synthesizers
#opl0	at isa? port 0x388	# use only if not attached to sound card
#opl*	at esl?
opl*	at eso?
opl*	at ess?
opl*	at fms?
opl*	at sb?
opl*	at sv?
opl*	at wss?
opl*	at yds?
opl*	at ym?

# Audio support
#audio*	at aria?
audio*	at auich?
audio*	at auvia?
audio*	at clcs?
audio*	at clct?
audio*	at cmpci?
audio*	at eap?
#audio*	at esl?
audio*	at esm?
audio*	at eso?
audio*	at ess?
audio*	at fms?
audio*	at gus?
audio*	at guspnp?
audio*	at neo?
audio*	at pas?
audio*	at sb?
audio*	at sp?
audio*	at sv?
audio*	at uaudio?
audio*	at wss?
audio*	at yds?
audio*	at ym?

# MPU 401 UARTs
#mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible card
mpu*	at eso?
mpu*	at fms?
mpu*	at sb?
mpu*	at yds?
mpu*	at ym?

# MIDI support
midi*	at clcs?		# Cirrus Logic CS4280 MIDI port
#midi*	at clct?		# Cirrus Logic CS4281 MIDI port
#midi*	at cms?			# Creative Music System
midi*	at eap?			# 137[01] MIDI port
midi*	at mpu?			# MPU 401
midi*	at opl?			# OPL FM synth
midi*	at pcppi?		# MIDI interface to the PC speaker
midi*	at sb?			# SB1 MIDI port
midi*   at umidi?               # USB MIDI

# The spkr driver provides a simple tone interface to the built in speaker.
#spkr0	at pcppi?		# PC speaker


# TV cards

# Brooktree 848/849/878/879 based TV cards
bktr* at pci? dev ? function ?


# Mice

# ISA busmice
lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
lms1	at isa? port 0x238 irq 5
mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
mms1	at isa? port 0x238 irq 5
wsmouse*	at lms? mux 0
wsmouse*	at mms? mux 0
# backwards compatible versions
#olms0	at isa? port 0x23c irq 5	# Logitech bus mouse
#olms1	at isa? port 0x238 irq 5
#omms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
#omms1	at isa? port 0x238 irq 5
#opms0	at pc? irq 12		# PS/2 auxiliary port mouse


# Joysticks

#joy*		at pnpbios? index ?	# Game port

# ISA Plug-and-Play joysticks
joy*	at isapnp?			# Game ports (usually on audio cards)

# PCI joysticks
joy*	at pci?				# Game ports (usually on audio cards)

# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0	at isa? port 0x201


# Miscellaneous Devices

# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1


# Pull in optional local configuration
include	"arch/i386/conf/GENERIC.local"


# Pseudo-Devices

# disk/mass storage pseudo-devices
pseudo-device	ccd		4	# concatenated/striped disk devices
#pseudo-device	raid		4	# RAIDframe disk driver
#options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
pseudo-device	md		1	# memory disk device (ramdisk)
pseudo-device	vnd		4	# disk-like interface to files

# network pseudo-devices
pseudo-device	bpfilter	8	# Berkeley packet filter
pseudo-device	ipfilter		# IP filter (firewall) and NAT
pseudo-device	loop			# network loopback
pseudo-device	ppp		2	# Point-to-Point Protocol
pseudo-device	sl		2	# Serial Line IP
pseudo-device	strip		2	# Starmode Radio IP (Metricom)
pseudo-device	tun		2	# network tunneling over tty
pseudo-device	gre		2	# generic L3 over IP tunnel
pseudo-device	ipip		2	# IP Encapsulation within IP (RFC 2003)
pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
pseudo-device	vlan			# IEEE 802.1q encapsulation
pseudo-device	bridge			# simple inter-network bridging

# miscellaneous pseudo-devices
pseudo-device	pty			# pseudo-terminals
pseudo-device	tb		1	# tablet line discipline
pseudo-device	sequencer	1	# MIDI sequencer
# rnd works; RND_COM does not on port i386 yet.
pseudo-device	rnd			# /dev/random and in-kernel generator
#options 	RND_COM			# use "com" randomness as well (BROKEN)

# a pseudo device needed for Coda	# also needs CODA (above)
pseudo-device	vcoda		4	# coda minicache <-> venus comm.

# mouse & keyboard multiplexor pseudo-devices
pseudo-device	wsmux		2
@


1.422.2.3
log
@Catch up with -current. Fix some bogons in the sparc64 kbd/ms
attach code. cd18xx conversion provided by mrg.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.422.2.2 2001/10/11 00:01:44 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.422.2.2 $"
d694 1
a695 1
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
@


1.421
log
@Comment out tr at pcmcia.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.420 2001/09/01 21:52:27 atatat Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.420 $"
d55 4
a58 4
#options	SEMMNI=10	# number of semaphore identifiers
#options	SEMMNS=60	# number of semaphores in system
#options	SEMUME=10	# max number of undo entries per process
#options	SEMMNU=30	# number of undo structures in system
d91 2
a92 2
#options	COMPAT_MACH	# binary compatibility with Mach binaries
#options	EXEC_MACHO	# exec MACH-O binaries
d153 1
a153 1
#options	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
@


1.420
log
@Add bridge pseudo devices to GENERIC configs
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.419 2001/08/27 22:25:42 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.419 $"
d620 2
a621 1
tr*	at pcmcia? function ?		# TROPIC based Token-Ring
@


1.419
log
@Comment out the hme driver; it's not totally MI yet.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.418 2001/08/27 22:23:47 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.418 $"
d252 1
a252 1
pcmb*	at pci?	dev ? function ?	# PCI-MCA bridges
d946 1
@


1.418
log
@Add some missing network drivers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.417 2001/08/27 12:08:00 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.417 $"
d580 1
a580 1
hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
@


1.417
log
@Add 7 new PHYs.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.416 2001/08/22 15:28:57 hubertf Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.416 $"
a573 1
ex*	at pci? dev ? function ?	# 3Com 90x[BC]
d576 1
d580 1
d585 1
d589 2
d620 1
@


1.416
log
@90x[B] -> 90x[BC]
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.415 2001/08/14 13:15:45 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.415 $"
d668 4
d674 1
d680 1
d684 1
@


1.415
log
@Alphabetize two items.  Fix one whitespace glitch.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.414 $"
d574 1
a574 1
ex*	at pci? dev ? function ?	# 3Com 90x[B]
@


1.414
log
@Add a driver for Mylex AcceleRAID and eXtremeRAID controllers with v6
firmware. Based off the FreeBSD driver, and re-worked by tls, erh and I.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.413 2001/07/30 18:03:54 jdolecek Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.413 $"
d155 1
a155 1
options		MCAVERBOSE	# verbose MCA device autoconfig messages
d470 1
a471 1
scsibus* at mly?
d670 1
a674 1
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
@


1.413
log
@add MCA stuff, for IBM PS/2
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.412 2001/07/21 13:22:05 jdolecek Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.412 $"
d414 2
a416 1
pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI
d471 1
@


1.412
log
@add pcmb\*
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.411 2001/07/14 02:00:39 christos Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.411 $"
d155 1
d270 3
d375 2
d453 3
d560 4
d655 9
@


1.411
log
@Add COMPAT_MACH and EXEC_MACHO. Code works enough to start running a binary,
but we need to implement a few mach traps before the dynamic linker actually
works.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.410 2001/07/08 16:32:18 abs Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.410 $"
d251 1
@


1.410
log
@Standardise TCP_COMPAT_42 as commented out, grouped with other COMPAT options,
and with the comment '4.2BSD TCP/IP bug compat. Not recommended'
Add commented out 'TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG'
(All hail amiga and atari which make some attempt to automate the
multiplicity of config files...)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.409 2001/07/07 17:09:48 tsutsui Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.409 $"
d91 2
@


1.410.2.1
log
@update to -current
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.414 $"
a90 2
#options	COMPAT_MACH	# binary compatibility with Mach binaries
#options	EXEC_MACHO	# exec MACH-O binaries
a152 1
options		MCAVERBOSE	# verbose MCA device autoconfig messages
a248 1
pcmb*	at pci?	dev ? function ?	# PCI-MCA bridges
a265 3
# MCA bus support
mca0	at mainbus?

a367 2
# MCA serial interfaces
com*	at mca? slot ?			# 16x50s on comm boards
d405 1
a405 1
mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
a406 1
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
a443 3
# MCA SCSI cards
aha*	at mca? slot ?			# Adaptec AHA-1640

a457 1
scsibus* at mly?
a547 4
# MCA ESDI devices
edc*	at mca? slot ?			# IBM ESDI Disk Controllers
ed*	at edc?

a638 9

# MCA network cards
elmc*	at mca? slot ?			# 3Com EtherLink/MC (3c523)
ep*	at mca? slot ?			# 3Com EtherLink III (3c529)
we*	at mca? slot ?			# WD/SMC Ethernet
ate*	at mca? slot ?			# Allied Telesis AT1720
ne*	at mca? slot ?			# Novell NE/2 and clones
tr*	at mca? slot ?			# IBM Token Ring adapter
le*	at mca? slot ?			# SKNET Personal/MC2+
@


1.410.2.2
log
@Merge Aug 24 -current into the kqueue branch.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.410.2.1 2001/08/03 04:11:39 lukem Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.410.2.1 $"
d155 1
a155 1
options 	MCAVERBOSE	# verbose MCA device autoconfig messages
d470 1
a471 1
#scsibus* at nca?
d574 1
a574 1
ex*	at pci? dev ? function ?	# 3Com 90x[BC]
a669 1
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
d674 1
@


1.410.2.3
log
@Update the kqueue branch to HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.410.2.2 2001/08/25 06:15:23 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.410.2.2 $"
a24 2
options 	MTRR		# memory-type range register syscall support

d55 4
a58 4
#options 	SEMMNI=10	# number of semaphore identifiers
#options 	SEMMNS=60	# number of semaphores in system
#options 	SEMUME=10	# max number of undo entries per process
#options 	SEMMNU=30	# number of undo structures in system
d91 2
a92 2
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
d153 1
a153 1
#options 	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
d252 1
a252 1
pcmb*	at pci? dev ? function ?	# PCI-MCA bridges
a256 2
#agp* 	at pchb?

d574 1
a576 1
ex*	at pci? dev ? function ?	# 3Com 90x[BC]
a579 1
#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
a583 1
pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
a586 2
ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
a615 2
# tr at pcmcia has problems with Cardbus bridges
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
a667 4
acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
a669 1
glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
a674 1
makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
a677 1
pnaphy*	at mii? phy ?			# generic HomePNA PHYs
a933 1
pseudo-device	bridge			# simple inter-network bridging
@


1.410.2.4
log
@Sync kqueue branch with -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.464 2002/01/08 04:36:51 itojun Exp $
d3 1
a3 5
# GENERIC machine description file
# 
# This machine description file is used to generate the default NetBSD
# kernel.  The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
a4 11
# The machine description file can be customised for your specific
# machine to reduce the kernel size and improve its performance.
#
# For further information on compiling NetBSD kernels, see the config(8)
# man page.
#
# For further information on hardware support for this architecture, see
# the intro(4) man page.  For further information about kernel options
# for this architecture, see the options(4) man page.  For an explanation
# of each device driver in this file see the section 4 man page for the
# device.
d6 1
a6 1
include 	"arch/i386/conf/std.i386"
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.410.2.3 $"
d32 1
a32 1
#options 	CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
d73 1
a73 1
#options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
d119 1
a119 1
options 	SOFTDEP		# FFS soft updates support.
d262 2
a263 2
eisa0	at mainbus?
eisa0	at pceb?
d266 3
a268 3
isa0	at mainbus?
isa0	at pceb?
isa0	at pcib?
d293 1
a293 1
#cardslot*	at cbb?
d392 1
a392 1
# Hardware monitors
a405 1
dpti*	at iop? tid 0			# DPT/Adaptec control interface
a420 1
trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
a456 1
#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
a478 1
scsibus* at trm?
d511 1
a511 1
wdc*	at isapnp?
a544 1
st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
a602 1
wi*	at pci? dev ? function ?	# Intersil Prism Mini-PCI (802.11b)
d656 2
a657 2
tr0	at isa? port 0xa20 iomem 0xd8000 irq ?	# IBM TROPIC based Token-Ring
tr1	at isa? port 0xa24 iomem 0xd0000 irq ?	# IBM TROPIC based Token-Ring
d693 1
a694 1
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
a703 2
# The EHCI is not ready for prime time.
#ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
a707 1
#ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
a710 1
#usb*	at ehci?
a717 3
# USB HID device
uhidev*	at uhub? port ? configuration ? interface ?

d719 2
a720 2
ums*	at uhidev? reportid ?
wsmouse* at ums? mux 0
d723 1
a723 1
ukbd*	at uhidev? reportid ?
d727 1
a727 1
uhid*	at uhidev? reportid ?
a739 1
#wd* at umass?
a746 9
# USB IrDA
# USB-IrDA bridge spec
uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?

# SigmaTel STIr4200 USB/IrDA Bridge
ustir* at uhub? port ?
irframe* at ustir?

d761 1
a761 1
ucom*	at uplcom? portno ?
a782 4
# D-Link DSB-R100 USB radio
udsbr*	at uhub? port ?
radio*	at udsbr?

a786 7
# IrDA and Consumer Ir devices

# Toshiba Oboe
oboe* 	at pci? dev ? function ?
irframe* at oboe?


a790 1
autri*	at pci? dev ? function ?	# Trident 4DWAVE based AC'97 Audio
a795 2
emuxki*	at pci? dev ? function ?	# Creative SBLive! and PCI512
esa*	at pci? dev ? function ?	# ESS Allegro-1 / Maestro-3 PCI Audio
d816 2
a817 2
#pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
#sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
a820 3
# PCMCIA audio devices
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive

a824 2
opl*	at cmpci? flags 1
#opl*	at esl?
a836 1
audio*	at autri?
a840 1
audio*	at esa?
a841 2
audio*	at emuxki?
#audio*	at esl?
d851 1
a851 1
#audio*	at sp?
d859 1
a859 2
#mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
mpu*	at cmpci?
a866 1
midi*	at autri?		# Trident 4DWAVE MIDI port
d875 1
a875 1
midi*	at umidi?		# USB MIDI
a880 23
# FM-Radio devices
# ISA radio devices
#az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
#az1	at isa? port 0x358
#rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
#rt1	at isa? port 0x284
#rt2	at isa? port 0x30c
#rt3	at isa? port 0x384
#rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
#rtii1	at isa? port 0x30c
#sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card

# PCI radio devices
#mr*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card

# Radio support
#radio*	at az?
#radio*	at mr?
#radio*	at rt?
#radio*	at rtii?
#radio*	at sf2r?


a884 1
radio* at bktr?
a922 3
# Middle Digital, Inc. PCI-Weasel serial console board control
# devices (watchdog timer, etc.)
weasel* at pci?
a941 1
pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
a943 1
pseudo-device	irframetty		# IrDA frame line discipline
d964 2
a965 4
# wscons pseudo-devices
pseudo-device	wsmux			# mouse & keyboard multiplexor
pseudo-device	wsfont

@


1.410.2.5
log
@Sync w/ -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.410.2.4 2002/01/10 19:44:25 thorpej Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.410.2.4 $"
a80 2
#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)

d473 1
a474 1
#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
d899 1
a901 1
audio*	at esa?
d1022 2
a1023 10
pseudo-device	raid		8	# RAIDframe disk driver
options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
#Options to enable various other RAIDframe RAID types.
#options 	RF_INCLUDE_EVENODD=1
#options 	RF_INCLUDE_RAID5_RS=1
#options 	RF_INCLUDE_PARITYLOGGING=1
#options 	RF_INCLUDE_CHAINDECLUSTER=1
#options 	RF_INCLUDE_INTERDECLUSTER=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
@


1.410.2.6
log
@Catch up with -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.410.2.5 2002/02/11 20:08:20 jdolecek Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.410.2.5 $"
a296 1
pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
a340 1
#options	PMS_DISABLE_POWERHOOK
a341 1
#options	PMSI_DISABLE_POWERHOOK
d709 1
a709 1
icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
d1048 1
@


1.410.2.7
log
@catch up with -current on kqueue branch
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.410.2.6 2002/03/16 15:58:11 jdolecek Exp $
d23 1
a23 3
options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

#ident 		"GENERIC-$Revision$"
a40 1
options 	PERFCTRS	# performance-monitoring counters support
a80 1
#options 	USERCONF	# userconf(4) support
d276 1
a276 1
agp* 	at pchb?
d340 1
d342 4
a345 1
#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
d353 1
a441 1
#options 	SIOP_SYMLED		# drive the act. LED in software
a516 1
aac*	at pci? dev ? function ?	# Adaptec AAC family
a518 1
icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
d523 1
a523 3
ld*	at aac? unit ?			# logical disk devices
ld*	at cac? unit ?
ld*	at icp? unit ?
a526 3
icpsp*	at icp? unit ?			# SCSI pass-through
scsibus* at icpsp?

d600 1
d622 5
a626 1
tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
a628 1
wm*	at pci? dev ? function ?	# Intel 82543/82544 gigabit
a724 1
urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
a793 1
url*	at uhub? port ?		# Realtek RTL8150L based adapters
d795 1
a795 1
# Prolific PL2301/PL2302 host-to-host adapter
d799 2
a800 1
uftdi*	at uhub? port ?		# FTDI FT8U100AX serial adapter
a802 3
umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

d806 2
a807 2
uvscom*	at uhub? port ?		# SUNTAC Slipper U VS-10U serial adapter
ucom*	at uvscom? portno ?
d993 1
a1004 1
joy*	at eso?				# ESS Solo-1 on-board joystick
@


1.410.2.8
log
@sync kqueue with -current; this includes merge of gehenna-devsw branch,
merge of i386 MP branch, and part of autoconf rototil work
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.410.2.7 2002/06/23 17:37:17 jdolecek Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.410.2.7 $"
d43 1
a43 2
# doesn't work with MP just yet..
#options 	PERFCTRS	# performance-monitoring counters support
d66 1
a66 1
options 	INSECURE	# disable kernel security levels - X needs this
a71 1
options 	SYSTRACE	# system call vetting via systrace(1)
d80 1
a80 1
#options 	SHMMAXPGS=2048	# 2048 pages is the default
d84 1
a84 1
options 	USERCONF	# userconf(4) support
a163 1
#options	IPFILTER_DEFAULT_BLOCK	# block all packets by default
a203 6
# work around a hardware bug that loaded fonts don't work; found on ATI cards
#options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
# the following enables some functions to get mouse console support.
# if you want a really secure system, it may be better not to enable them,
# see wsmoused(8), section SECURITY CONSIDERATIONS for more info.
#options 	WSDISPLAY_CHARFUNCS		# mouse console support
a215 3
cpu* at mainbus?
#ioapic* at mainbus?

a270 3
# System Controllers
elansc* at pci? dev ? function ?	# AMD Elan SC520 System Controller

a281 5
#

p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC


d351 1
a351 1
wskbd*		at pckbd? console ?
d485 20
a504 1
scsibus* at scsi?
d532 1
d569 2
a570 1
atapibus* at atapi?
a606 1
bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
d655 1
a655 1
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
a742 3
# ISA USB controllers
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS

a746 1
#usb*	at slhci?
d775 2
d828 1
d904 26
a929 1
audio*	at audiobus?
d941 7
a947 1
midi*	at midibus?
d949 2
d969 1
a969 1
#gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d973 1
a973 1
#radio*	at gtp?
d1034 2
a1035 3
# RAIDframe is broken with MULTIPROCESSOR / LOCKDEBUG
#pseudo-device	raid		8	# RAIDframe disk driver
#options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
a1043 1

a1070 1
pseudo-device	clockctl		# user control of clock subsystem
d1078 1
@


1.409
log
@Remove (commented out) ncr* at pci? lines.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.408 2001/06/27 13:40:12 darcy Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.408 $"
d85 1
d139 1
a139 3

# Compatibility with 4.2BSD implementation of TCP/IP.  Not recommended.
#options 	TCP_COMPAT_42
@


1.408
log
@Added the commented lines with the defaults for the system values associated
with System V semaphores.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.407 2001/06/18 22:45:54 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.407 $"
a405 1
#ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI (old driver)
a458 1
#scsibus* at ncr?
@


1.407
log
@Add gsip(4), gphyter(4), and sf(4) drivers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.406 2001/06/03 13:46:58 tsutsui Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.406 $"
d55 4
@


1.406
log
@Add iha at pci .
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.405 2001/05/10 22:12:38 tron Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.405 $"
d560 1
d566 2
a567 1
sip*	at pci? dev ? function ?	# SiS 900 Ethernet
d646 1
@


1.405
log
@Fix typo: Pnp -> PnP
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.404 2001/05/06 19:55:01 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.404 $"
d400 1
d452 1
@


1.404
log
@Add an (untested) EISA front-end for the `mlx' driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.403 2001/04/21 20:49:14 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.403 $"
d148 1
a148 1
#options	PNPBIOSDEBUG	# more fulsome Pnp BIOS debugging messages
@


1.403
log
@Move the DIAGNOSTIC option to a seperate config file, it's too expensive
to be in GENERIC (which should be a kernel ready for production use).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.402 2001/03/30 14:47:49 minoura Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.402 $"
d472 1
a472 1
cac*	at eisa?			# Compaq EISA array controllers
d475 1
@


1.402
log
@Add yds at pci and children.
Alpha and i386 are the only tested ports.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.401 2001/03/28 18:45:07 ichiro Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.401 $"
d61 1
a61 1
options 	DIAGNOSTIC	# cheap kernel consistency checks
@


1.401
log
@support umct USB-serial device
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.400 2001/02/04 17:36:03 perry Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.400 $"
d750 1
d780 1
d804 1
d812 1
@


1.400
log
@keep joystick lines together
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.399 2001/02/04 17:05:15 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.399 $"
d711 3
@


1.400.2.1
log
@Catch up with -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.402 2001/03/30 14:47:49 minoura Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.402 $"
a711 3
umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

a746 1
yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio
a775 1
opl*	at yds?
a798 1
audio*	at yds?
a805 1
mpu*	at yds?
@


1.400.2.2
log
@Catch up to -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.400.2.1 2001/04/09 01:53:26 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.400.2.1 $"
d61 1
a61 1
#options 	DIAGNOSTIC	# expensive kernel consistency checks
d148 1
a148 1
#options	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
a399 1
iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
a450 1
scsibus* at iha?
d472 1
a472 1
cac*	at eisa? slot ?			# Compaq EISA array controllers
a474 1
mlx*	at eisa? slot ?			# Mylex DAC960 & DEC SWXCR family
a556 1
gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
d562 1
a562 2
sf*	at pci? dev ? function ?	# Adaptec AIC-6915 Ethernet
sip*	at pci? dev ? function ?	# SiS 900/DP83815 Ethernet
a640 1
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
@


1.400.2.3
log
@Catch up with -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.400.2.2 2001/06/21 19:25:12 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.400.2.2 $"
a54 4
#options	SEMMNI=10	# number of semaphore identifiers
#options	SEMMNS=60	# number of semaphores in system
#options	SEMUME=10	# max number of undo entries per process
#options	SEMMNU=30	# number of undo structures in system
a80 1
#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
a85 2
#options	COMPAT_MACH	# binary compatibility with Mach binaries
#options	EXEC_MACHO	# exec MACH-O binaries
d134 3
a136 1
#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
a149 1
options 	MCAVERBOSE	# verbose MCA device autoconfig messages
a245 1
pcmb*	at pci?	dev ? function ?	# PCI-MCA bridges
a262 3
# MCA bus support
mca0	at mainbus?

a364 2
# MCA serial interfaces
com*	at mca? slot ?			# 16x50s on comm boards
d402 2
a403 1
mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
a404 1
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
a441 3
# MCA SCSI cards
aha*	at mca? slot ?			# Adaptec AHA-1640

a454 1
scsibus* at mly?
d456 1
a546 4
# MCA ESDI devices
edc*	at mca? slot ?			# IBM ESDI Disk Controllers
ed*	at edc?

a638 9
# MCA network cards
elmc*	at mca? slot ?			# 3Com EtherLink/MC (3c523)
ep*	at mca? slot ?			# 3Com EtherLink III (3c529)
we*	at mca? slot ?			# WD/SMC Ethernet
ate*	at mca? slot ?			# Allied Telesis AT1720
ne*	at mca? slot ?			# Novell NE/2 and clones
tr*	at mca? slot ?			# IBM Token Ring adapter
le*	at mca? slot ?			# SKNET Personal/MC2+

a641 1
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
d646 1
@


1.400.2.4
log
@Catch up to -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.400.2.3 2001/08/24 00:08:26 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.400.2.3 $"
a24 2
options 	MTRR		# memory-type range register syscall support

d55 4
a58 4
#options 	SEMMNI=10	# number of semaphore identifiers
#options 	SEMMNS=60	# number of semaphores in system
#options 	SEMUME=10	# max number of undo entries per process
#options 	SEMMNU=30	# number of undo structures in system
d91 2
a92 2
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
d153 1
a153 1
#options 	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
d252 1
a252 1
pcmb*	at pci? dev ? function ?	# PCI-MCA bridges
a256 2
#agp* 	at pchb?

d258 2
a259 2
eisa0	at mainbus?
eisa0	at pceb?
d262 3
a264 3
isa0	at mainbus?
isa0	at pceb?
isa0	at pcib?
d574 1
a576 1
ex*	at pci? dev ? function ?	# 3Com 90x[BC]
a579 1
#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
a583 1
pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
a586 2
ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
a615 2
# tr at pcmcia has problems with Cardbus bridges
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
a667 4
acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
a669 1
glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
a674 1
makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
a677 1
pnaphy*	at mii? phy ?			# generic HomePNA PHYs
a933 1
pseudo-device	bridge			# simple inter-network bridging
@


1.400.2.5
log
@Catch up to -current.
Again.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.400.2.4 2001/09/21 22:35:00 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.400.2.4 $"
a405 1
dpti*	at iop? tid 0			# DPT/Adaptec control interface
@


1.400.2.6
log
@Catch up to -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.400.2.5 2001/09/26 19:54:43 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.400.2.5 $"
a821 3
# PCMCIA audio devices
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive

a825 1
#opl*	at esl?
a842 1
#audio*	at esl?
@


1.400.2.7
log
@Catch up to -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.400.2.6 2001/10/08 20:10:44 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.400.2.6 $"
a603 1
wi*	at pci? dev ? function ?	# Intersil Prism Mini-PCI (802.11b)
d694 1
a695 1
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
a796 1
emuxki*	at pci? dev ? function ?	# Creative SBLive! and PCI512
a846 1
audio*	at emuxki?
@


1.400.2.8
log
@Catch up to -current.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
a421 1
trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
a457 1
#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
a479 1
scsibus* at trm?
a830 1
opl*	at cmpci? flags 1
a868 1
mpu*	at cmpci?
d974 1
a974 1
pseudo-device	wsmux
@


1.400.2.9
log
@Catch up to -current.
@
text
@d1 1
a1 1
# $NetBSD$
d3 1
a3 5
# GENERIC machine description file
# 
# This machine description file is used to generate the default NetBSD
# kernel.  The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
a4 11
# The machine description file can be customised for your specific
# machine to reduce the kernel size and improve its performance.
#
# For further information on compiling NetBSD kernels, see the config(8)
# man page.
#
# For further information on hardware support for this architecture, see
# the intro(4) man page.  For further information about kernel options
# for this architecture, see the options(4) man page.  For an explanation
# of each device driver in this file see the section 4 man page for the
# device.
d6 1
a6 1
include 	"arch/i386/conf/std.i386"
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.400.2.8 $"
d32 1
a32 1
#options 	CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
d73 1
a73 1
#options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
d119 1
a119 1
options 	SOFTDEP		# FFS soft updates support.
d293 1
a293 1
#cardslot*	at cbb?
d392 1
a392 1
# Hardware monitors
d515 1
a515 1
wdc*	at isapnp?
a548 1
st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
d661 2
a662 2
tr0	at isa? port 0xa20 iomem 0xd8000 irq ?	# IBM TROPIC based Token-Ring
tr1	at isa? port 0xa24 iomem 0xd0000 irq ?	# IBM TROPIC based Token-Ring
a708 2
# The EHCI is not ready for prime time.
#ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
a712 1
#ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
a715 1
#usb*	at ehci?
a722 3
# USB HID device
uhidev*	at uhub? port ? configuration ? interface ?

d724 2
a725 2
ums*	at uhidev? reportid ?
wsmouse* at ums? mux 0
d728 1
a728 1
ukbd*	at uhidev? reportid ?
d732 1
a732 1
uhid*	at uhidev? reportid ?
a744 1
#wd* at umass?
a751 4
# USB IrDA bridges
uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?

d766 1
a766 1
ucom*	at uplcom? portno ?
a787 4
# D-Link DSB-R100 USB radio
#udsbr*	at uhub? port ?
#radio*	at udsbr?

a791 7
# IrDA and Consumer Ir devices

# Toshiba Oboe
oboe* 	at pci? dev ? function ?
irframe* at oboe?


a795 1
autri*	at pci? dev ? function ?	# Trident 4DWAVE based AC'97 Audio
d822 1
a822 1
pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
a847 1
audio*	at autri?
d872 1
a872 1
#mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
a880 1
midi*	at autri?		# Trident 4DWAVE MIDI port
d889 1
a889 1
midi*	at umidi?		# USB MIDI
a894 23
# FM-Radio devices
# ISA radio devices
#az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
#az1	at isa? port 0x358
#rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
#rt1	at isa? port 0x284
#rt2	at isa? port 0x30c
#rt3	at isa? port 0x384
#rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
#rtii1	at isa? port 0x30c
#sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card

# PCI radio devices
#mr*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card

# Radio support
#radio*	at az?
#radio*	at mr?
#radio*	at rt?
#radio*	at rtii?
#radio*	at sf2r?


a936 3
# Middle Digital, Inc. PCI-Weasel serial console board control
# devices (watchdog timer, etc.)
weasel* at pci?
a955 1
pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
a957 1
pseudo-device	irframetty		# IrDA frame line discipline
d978 2
a979 4
# wscons pseudo-devices
pseudo-device	wsmux			# mouse & keyboard multiplexor
pseudo-device	wsfont

@


1.400.2.10
log
@More catchup.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.400.2.9 2002/01/08 00:25:10 nathanw Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.400.2.9 $"
d776 1
a776 2
# USB IrDA
# USB-IrDA bridge spec
a779 4
# SigmaTel STIr4200 USB/IrDA Bridge
ustir* at uhub? port ?
irframe* at ustir?

d817 2
a818 2
udsbr*	at uhub? port ?
radio*	at udsbr?
a841 1
esa*	at pci? dev ? function ?	# ESS Allegro-1 / Maestro-3 PCI Audio
d862 2
a863 2
#pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
#sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
a892 1
audio*	at esa?
d905 1
a905 1
#audio*	at sp?
a963 1
radio* at bktr?
@


1.400.2.11
log
@Catch up to -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.400.2.10 2002/01/11 23:38:27 nathanw Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.400.2.10 $"
a80 2
#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)

a294 1
pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
a338 1
#options	PMS_DISABLE_POWERHOOK
a339 1
#options	PMSI_DISABLE_POWERHOOK
d473 1
a474 1
#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
d707 1
a707 1
icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
a901 1
audio*	at esa?
d1022 2
a1023 10
pseudo-device	raid		8	# RAIDframe disk driver
options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
#Options to enable various other RAIDframe RAID types.
#options 	RF_INCLUDE_EVENODD=1
#options 	RF_INCLUDE_RAID5_RS=1
#options 	RF_INCLUDE_PARITYLOGGING=1
#options 	RF_INCLUDE_CHAINDECLUSTER=1
#options 	RF_INCLUDE_INTERDECLUSTER=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
@


1.400.2.12
log
@Catch up to -current.
(CVS: It's not just a program. It's an adventure!)
@
text
@d1 1
a1 1
# $NetBSD$
d23 1
a23 1
#ident 		"GENERIC-$Revision$"
a723 1
urlphy*	at mii? phy ?			# Realtek RTL8150L internal PHYs
a793 1
url*	at uhub? port ?		# Realtek RTL8150L based adapters
d795 1
a795 1
# Prolific PL2301/PL2302 host-to-host adapter
d799 2
a800 1
uftdi*	at uhub? port ?		# FTDI FT8U100AX serial adapter
a802 3
umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

d806 2
a807 2
uvscom*	at uhub? port ?		# SUNTAC Slipper U VS-10U serial adapter
ucom*	at uvscom? portno ?
d1052 1
@


1.400.2.13
log
@Catch up to -current.
@
text
@a80 1
#options 	USERCONF	# userconf(4) support
d276 1
a276 1
agp* 	at pchb?
d340 1
a340 1
# "opms" should not be enabled together with "pms"
d343 2
d353 1
a628 1
wm*	at pci? dev ? function ?	# Intel 82543/82544 gigabit
d724 1
a725 1
urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
d908 1
@


1.400.2.14
log
@Catch up to -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.400.2.13 2002/04/17 00:03:14 nathanw Exp $
a22 2
options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

a40 1
options 	PERFCTRS	# performance-monitoring counters support
a68 1
options 	SYSTRACE	# system call vetting via systrace(1)
d341 1
d343 2
a344 1
#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
a439 1
#options 	SIOP_SYMLED		# drive the act. LED in software
a514 1
aac*	at pci? dev ? function ?	# Adaptec AAC family
a516 1
icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
d521 1
a521 3
ld*	at aac? unit ?			# logical disk devices
ld*	at cac? unit ?
ld*	at icp? unit ?
a524 3
icpsp*	at icp? unit ?			# SCSI pass-through
scsibus* at icpsp?

d598 1
d620 5
a624 1
tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
d996 1
a1007 1
joy*	at eso?				# ESS Solo-1 on-board joystick
a1066 1
pseudo-device	clockctl		# user control of clock subsystem
@


1.400.2.15
log
@Catch up to -current.
@
text
@d1 1
a1 1
# $NetBSD$
d81 1
a81 1
#options 	SHMMAXPGS=2048	# 2048 pages is the default
a204 6
# work around a hardware bug that loaded fonts don't work; found on ATI cards
#options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
# the following enables some functions to get mouse console support.
# if you want a really secure system, it may be better not to enable them,
# see wsmoused(8), section SECURITY CONSIDERATIONS for more info.
#options 	WSDISPLAY_CHARFUNCS		# mouse console support
d352 1
a352 1
wskbd*		at pckbd? console ?
d486 20
a505 1
scsibus* at scsi?
d533 1
d570 2
a571 1
atapibus* at atapi?
a607 1
bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
d776 2
d829 1
d905 26
a930 1
audio*	at audiobus?
d942 7
a948 1
midi*	at midibus?
d950 2
d1080 1
@


1.400.2.16
log
@Catch up to -current.
@
text
@d66 1
a66 1
options 	INSECURE	# disable kernel security levels - X needs this
a277 3
# System Controllers
elansc*	at pci? dev ? function ?	# AMD Elan SC520 System Controller

d642 1
a642 1
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
a729 3
# ISA USB controllers
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS

a733 1
#usb*	at slhci?
@


1.400.2.17
log
@Catch up to -current.
@
text
@d927 1
a927 1
#gtp*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
d931 1
a931 1
#radio*	at gtp?
@


1.400.2.18
log
@Catch up to -current.
@
text
@d43 1
a43 2
# doesn't work with MP just yet..
#options 	PERFCTRS	# performance-monitoring counters support
d85 1
a85 1
options 	USERCONF	# userconf(4) support
a164 1
#options 	IPFILTER_DEFAULT_BLOCK	# block all packets by default
a210 2
# enable VGA raster mode capable of displaying multilingual text on console
#options 	VGA_RASTERCONSOLE
a222 3
cpu* at mainbus?
#ioapic* at mainbus?

d279 1
a279 1
elansc* at pci? dev ? function ?	# AMD Elan SC520 System Controller
a291 5
#

p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC


a630 1
le*	at isapnp?			# AMD PCnet-ISA Ethernet
a795 3
ubsa*	at uhub? port ?		# Belkin serial adapter
ucom*	at ubsa? portno ?

d992 2
a993 4
#pseudo-device	cgd		4	# cryptographic disk devices
# RAIDframe is broken with MULTIPROCESSOR / LOCKDEBUG
#pseudo-device	raid		8	# RAIDframe disk driver
#options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
a1001 1

@


1.400.2.19
log
@Catch up to -current
@
text
@a88 4
# Enable experimental buffer queue strategy for better responsiness under 
# high disk I/O load. Use it with caution - it's not proven to be stable yet.
#options 	NEW_BUFQ_STRATEGY

a370 1
#machfb* 	at pci? dev ? function ? # ATI Mach64 framebuffer driver
a372 1
#wsdisplay* 	at machfb? console ?
a619 1
mtd*	at pci? dev ? function ?	# Myson MTD803 3-in-1 Ethernet
a642 1
fmv*	at isapnp?			# Fujitsu FMV-183
d674 1
a674 1
fmv0	at isa? port 0x2a0 irq ?		# FMV-181/182
@


1.400.2.20
log
@Sync with HEAD.
@
text
@d89 1
a89 1
# Enable experimental buffer queue strategy for better responsiveness under 
a120 1
#options 	COMPAT_DARWIN	# binary compatibility with Darwin binaries
a233 3
# Doesn't do anything yet.
#p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC

d303 4
d340 2
a341 2
cbb*		at pci? dev ? function ?
cardslot*	at cbb?
d344 2
a345 2
cardbus*	at cardslot?
pcmcia* 	at cardslot?
a861 12
# PCI IEEE1394 controllers
#fwohci* at pci? dev ? function ?	# IEEE1394 Open Host Controller

# CardBus IEEE1394 controllers
#fwohci* at cardbus? dev ? function ?	# IEEE1394 Open Host Controller

#fw*	at fwbus?			# IP over 1394

# IEEE1394 nodes
#fwnode* at fwbus? idhi ? idlo ?
#sbpscsi* at fwnode?
#scsibus* at sbpscsi?
d1017 3
a1019 2
pseudo-device	raid		8	# RAIDframe disk driver
options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
@


1.400.2.21
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.400.2.20 2002/12/11 06:00:49 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.400.2.20 $"
d1031 1
a1031 1
# Options to enable various other RAIDframe RAID types.
@


1.400.2.22
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.400.2.21 2002/12/29 19:29:08 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.400.2.21 $"
a238 1
#acpi0	at mainbus0			# Advanced Control and Power Interface
@


1.400.2.23
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.400.2.22 2003/01/03 16:48:18 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.400.2.22 $"
a175 1
#options 	ACPIVERBOSE	# verbose ACPI device autoconfig messages
d239 1
a249 31

# Advanced Control and Power Interface

# This option can be used to retrieve CPU and APIC information.
# that I/O APICs can be used if ACPI is enabled below.
# To use the I/O APIC(s), enable the ioapic line above.
#options 	MPACPI

#acpi0 		at mainbus0
#options 	ACPI_PCI_FIXUP=1	# PCI interrupt routing via ACPI
#options 	ACPI_ACTIVATE_DEV=0	# If set, activate inactive devices

# ACPI devices
#acpiacad* 	at acpi?		# ACPI AC Adapter
#acpibat* 	at acpi?		# ACPI Battery
#acpibut* 	at acpi?		# ACPI Button
#acpiec* 	at acpi?		# ACPI Embedded Controller
#acpilid* 	at acpi?		# ACPI Lid Switch
#acpitz* 	at acpi?		# ACPI Thermal Zone

# Mainboard devices
#com* 		at acpi?		# Serial communications interface
#fdc* 		at acpi?		# Floppy disk controller
#lpt* 		at acpi?		# Parallel port
#npx*		at acpi?		# Math coprocessor
#pckbc* 	at acpi?		# PC keyboard controller
#wss* 		at acpi?		# NeoMagic 256AV in wss mode

# Sony Vaio jog dial
#spic* 		at acpi?		# Sony Programmable I/O Controller
#wsmouse* 	at spic?
@


1.400.2.24
log
@Sync with HEAD.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.400.2.23 2003/01/07 21:11:35 thorpej Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.400.2.23 $"
d39 2
a40 2
# insert delay no-ops in interrupts; recommended on very old machines
#options 	PIC_DELAY
d275 1
a275 1
#pckbc*  	at acpi?		# PC keyboard controller
@


1.399
log
@Add a driver for the Mylex DAC960 family (including DEC SWXCR).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.398 2001/02/02 10:53:48 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.398 $"
a226 2
#joy*		at pnpbios? index ?	# Game port

d847 2
@


1.398
log
@Add COMPAT_15
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.397 2001/01/30 23:32:35 tshiozak Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.397 $"
d476 1
a477 2
ld*	at cac? unit ?			# Compaq array disk devices
ld*	at twe? unit ?			# 3ware array disk devices
d479 3
@


1.397
log
@add umidi.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.396 2001/01/28 00:50:23 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.396 $"
d78 1
@


1.396
log
@Add joy at pnpbios.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.395 2001/01/23 01:44:38 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.395 $"
d692 3
d816 1
@


1.395
log
@Uncomment the uftdi driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.394 2001/01/23 01:27:23 ichiro Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.394 $"
d225 2
@


1.394
log
@add I/O DATA USB-RSAQ2 serial adapter

uplcom* at uhub? port ?
ucom*   at uplcom? portno ?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.393 2001/01/22 01:39:05 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.393 $"
d700 2
a701 2
#uftdi*	at uhub? port ?
#ucom*	at uftdi? portno ?
@


1.393
log
@Add clct(4) driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.392 2001/01/16 03:38:23 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.392 $"
d702 3
@


1.392
log
@Add uyap.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.391 2001/01/11 06:03:21 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.391 $"
d730 1
d774 1
d801 1
@


1.391
log
@Add usscanner.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.390 2001/01/09 00:40:53 lukem Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.390 $"
d716 3
@


1.390
log
@sort auich in respect to auvia
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.389 2001/01/08 20:48:11 rh Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.389 $"
d712 4
@


1.389
log
@Add and enable the esm PCI audio driver
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.388 2000/12/22 16:35:51 tv Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.388 $"
d720 1
a721 1
auich*	at pci? dev ? function ?	# Intel ICH integrated AC'97 Audio
d763 1
a764 1
audio*	at auich?
@


1.388
log
@Undo 1.385; put wss0 back in GENERIC.

Just like any ISA device, if you don't have the device at the configured IRQ,
you could lose if something else decides it wants that IRQ.  wss is not
a special case.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.387 2000/12/20 10:44:29 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.387 $"
d725 1
d768 1
@


1.387
log
@Put 'an* at isapnp?' in alphabetical order.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.386 2000/12/19 10:34:11 bouyer Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.386 $"
d746 1
a746 1
#wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
@


1.386
log
@Add peudo-device vlan
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.385 2000/12/17 22:53:52 jmc Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.385 $"
d575 1
a578 1
an*	at isapnp?			# Aironet 802.11
@


1.385
log
@Comment out the isa wss driver.

GENERIC is the kernel used on new installs and too many things overlap the
resources (irq mostly) the default isa version may be using which causes
panics on reboot.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.384 2000/12/17 20:35:45 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.384 $"
d868 1
@


1.384
log
@Add an at isapnp.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.383 2000/12/14 04:11:26 onoe Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.383 $"
d746 1
a746 1
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
@


1.383
log
@Add PCI version of Aironet, not tested at all.
ISA/ISApnp version won't come since I don't know about isa...
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.382 2000/12/11 23:16:51 onoe Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.382 $"
d578 1
@


1.382
log
@Port 'an' driver for Aironet PC4500/PC4800 IEEE802.11 card from FreeBSD.
This is very adhoc work for IETF meeting.
- Since it seems that 'an' and 'wi' have similar hardware, low level
  functions should be shared.
- There are PCI/ISA cards of Aironet but not supported yet.
- The wiconfig interface is changed so that wiconfig cannot be used.
- 'ancontrol' of FreeBSD is not ported.
- Only infrastructure mode is tested.
- WEP is not supported.

Though I only have an Aironet card, Cisco card should be expected to work.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.381 2000/11/28 19:44:07 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.381 $"
d545 1
@


1.381
log
@Put neo* in alphabetical position.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.380 2000/11/28 05:18:42 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.380 $"
d579 1
@


1.380
log
@Add auich(4) and neo(4).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.379 2000/11/26 17:44:09 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.379 $"
d724 1
a725 1
neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
@


1.379
log
@lsu -> ld, by popular request.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.378 2000/11/20 19:53:43 jdolecek Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.378 $"
d718 1
d725 1
d760 1
d769 1
@


1.378
log
@add moxa0 at isa entry, marked as experimental

This was not added also to other config files primarily because the
driver is not properly tested yet; this entry is primarily meant as an example
for those brave souls who want to try moxa.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.377 2000/11/14 19:52:05 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.377 $"
d388 1
a388 1
lsu*	at iop? tid ?			# block devices
d474 2
a475 2
lsu*	at cac? unit ?			# Compaq array disk devices
lsu*	at twe? unit ?			# 3ware array disk devices
@


1.377
log
@Add uscanner.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.376 2000/11/08 21:47:25 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.376 $"
d361 2
@


1.376
log
@Sort.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.375 2000/11/08 19:50:07 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.375 $"
d148 1
a148 1
options		I2OVERBOSE	# verbose I2O driver messages
d382 1
d388 1
d704 3
@


1.375
log
@Add I2O stuff.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.374 2000/10/19 14:32:20 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.374 $"
d446 1
a447 1
scsibus* at iopsp?
@


1.374
log
@- ca -> lsu
- Hook in twe.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.373 2000/10/15 10:08:00 minoura Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.373 $"
d148 1
d382 4
d447 1
@


1.373
log
@WSCONS_DEFAULT_TYPE is obsolete; use VGA_CONSOLE_SCREENTYPE instead.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.372 2000/09/26 11:51:14 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.372 $"
d463 3
a465 1
ca*	at cac? unit ?			# Compaq array disk devices
@


1.372
log
@cac* at eisa? reported as working.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.371 2000/09/24 15:59:33 jdolecek Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.371 $"
d172 1
a172 1
#options 	WSCONS_DEFAULT_TYPE="80x24"
@


1.371
log
@don't specify number of ptys if >= 16 (current default initial number)
pty comments: normalize and g/c what is no longer relevant
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.370 2000/09/20 18:22:22 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.370 $"
d459 1
d461 3
a463 2
cac*	at pci? dev ? function ?	# Compaq array controller
ca*	at cac? unit ?			# Compaq array disk device
@


1.370
log
@Enable VM86 -- it's needed for some X servers (notably, S3 Savage,
which runs the VESA BIOS in VM86 emulation in order to switch video
modes).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.369 2000/09/10 11:48:38 lukem Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.369 $"
d846 1
a846 1
pseudo-device	pty		64	# pseudo-terminals
@


1.369
log
@add (commented out) entry for WSCONS_DEFAULT_TYPE
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.368 2000/08/21 07:39:42 itohy Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.368 $"
d20 1
a20 1
#options 	VM86		# virtual 8086 emulation
@


1.368
log
@Fix typos.
No functional changes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.367 2000/08/15 20:09:26 ross Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.367 $"
d171 2
@


1.367
log
@Edit adv0 comment to include "SCSI"; now 'grep -v -i SCSI GENERIC' works.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.366 2000/08/13 01:31:18 itojun Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.366 $"
d85 1
a85 1
#options        COMPAT_PECOFF   # kernel support to run Win32 apps
d147 1
a147 1
#options	PNPBIOSDEBUG	# more fullsome Pnp BIOS debugging messages
d418 1
a418 1
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 contoller
@


1.366
log
@move "options PULLDOWN_TEST" into sys/sys/mbuf.h (in #ifdef _KERNEL),
as it is no wthe default setting for everyone.

the reason we still use the name "PULLDOWN_TEST" while it is now default:
kame code sharing.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.365 2000/08/10 21:33:18 soda Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.365 $"
d409 1
a409 1
adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02]
@


1.365
log
@add commented out PCIBIOS_INTR_GUESS
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.364 2000/08/04 11:51:37 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.364 $"
a117 1
options 	PULLDOWN_TEST	# use m_pulldown for IPv4/v6 processing
@


1.364
log
@Alphabetize.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.363 2000/08/01 08:16:54 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.363 $"
d232 2
d236 1
a237 2
#options 	PCIBIOS_BUS_FIXUP	# fixup PCI bus numbering
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O addresses
@


1.363
log
@Add midi at clcs.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.362 2000/07/27 14:34:07 mrg Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.362 $"
d149 1
d763 1
a764 1
midi*	at clcs?		# Cirrus Logic CS4280 MIDI port
@


1.362
log
@remove COMPAT_AOUT option.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.361 2000/07/18 11:41:32 soda Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.361 $"
d763 1
@


1.361
log
@hexadecimal constant in "options" value doesn't need quotation.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.360 2000/07/17 14:37:53 minoura Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.360 $"
a85 2

options 	COMPAT_AOUT	# binary compat for NetBSD a.out binaries
@


1.360
log
@Add (but commented) COMPAT_PECOFF entry.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.359 2000/07/09 00:41:24 mycroft Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.359 $"
d234 1
a234 1
#options 	PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
@


1.359
log
@Turn on DDB history by default.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.358 $"
d85 1
@


1.358
log
@Comment out EON ISO-over-ip tunneling pseudo-driver, and document as
broken/fragile.  Unlikely to be of much use, and confuses new users
when their system crashes when they, or their dhclient stumble over
it.  See kern/10500, kern/8994 for the gory details.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.357 2000/07/03 01:17:35 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.357 $"
d65 1
a65 1
#options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
@


1.357
log
@White-space improvements.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.356 2000/06/30 17:10:17 itojun Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.356 $"
d127 1
a127 1
options 	EON		# OSI tunneling over IP
@


1.356
log
@add PULLDOWN_TEST for all the platforms.
XXX should be moved to somewhere else when stabilized
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.355 2000/06/22 20:27:52 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.355 $"
d222 1
a222 1
#pciide* at pnpbios? index ?
d337 1
a337 1
#com*	at cardbus? function ?		# Modems and serial cards
d359 1
d370 2
d379 1
d461 1
d627 1
d694 1
d773 1
d778 1
@


1.355
log
@Remove prefix construction for softdeps. Add SOFTDEP option to GENERIC.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354 2000/06/16 10:31:03 hubertf Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354 $"
d119 1
@


1.354
log
@Change comment: APM_POWER_PRINT _does_ print stats on the console.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.353 2000/06/14 22:02:27 veego Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.353 $"
d110 1
a110 1
#options 	SOFTDEP         # FFS soft updates support.
@


1.354.2.1
log
@As on the trunk, update these for the move of ffs_softdep.c into the
kernel source itself. Remove prefix construction, and add the SOFTDEP
option to GENERIC kernels.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.355 2000/06/22 20:27:52 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.355 $"
d110 1
a110 1
options 	SOFTDEP         # FFS soft updates support.
@


1.354.2.2
log
@Comment out EON ISO-over-ip tunneling pseudo-driver, and document as
broken/fragile.  Unlikely to be of much use, and confuses new users
when their system crashes when they, or their dhclient stumble over
it.  See kern/10500, kern/8994 for the gory details.
[pull up approved by thorpej]
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
d126 1
a126 1
#options 	EON		# OSI tunneling over IP
@


1.354.2.3
log
@Pull up rev. 1.360 (approved by jhawk).
Add (but commented) COMPAT_PECOFF entry.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.2 2000/07/06 14:10:34 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.2 $"
a84 1
#options 	COMPAT_PECOFF   # kernel support to run Win32 apps
@


1.354.2.4
log
@Approved by thorpej:
Enable DDB history by default, and increase the default size to .5k.

syssrc/sys/arch/i386/conf/BIKINI			1.28 -> 1.29
syssrc/sys/arch/i386/conf/CARDBUS			1.16 -> 1.17
syssrc/sys/arch/i386/conf/DISKLESS			1.73 -> 1.74
syssrc/sys/arch/i386/conf/GENERIC			1.358 -> 1.359
syssrc/sys/arch/i386/conf/GENERIC_TINY			1.16 -> 1.17
syssrc/sys/arch/i386/conf/HOMEWORLD			1.48 -> 1.49
syssrc/sys/arch/i386/conf/INSTALL			1.148 -> 1.149
syssrc/sys/arch/i386/conf/INSTALL_SMALL			1.49 -> 1.50
syssrc/sys/arch/i386/conf/INSTALL_TINY			1.18 -> 1.19
syssrc/sys/arch/i386/conf/IOPENER			1.4 -> 1.5
syssrc/sys/arch/i386/conf/MINBAR			1.17 -> 1.18
syssrc/sys/arch/i386/conf/PS2				1.2 -> 1.3
syssrc/sys/arch/i386/conf/TRINITY			1.96 -> 1.97
syssrc/sys/arch/i386/conf/ZHADUM			1.22 -> 1.23
syssrc/sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS	1.32 -> 1.33
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.3 2000/07/25 14:58:41 minoura Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.3 $"
d65 1
a65 1
options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
@


1.354.2.5
log
@Add `midi at clcs'.
Approved by thorpej.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.4 2000/07/27 02:10:48 mycroft Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.4 $"
a755 1
midi*	at clcs?		# Cirrus Logic CS4280 MIDI port
@


1.354.2.6
log
@Pull up to netbsd-1-5 branch
Approved by: thorpej

- remove quotation from hexadecimal constant in "options" value.

 Revisions pulled up:
 > cvs rdiff -r1.17 -r1.18 syssrc/sys/arch/i386/conf/CARDBUS
 > cvs rdiff -r1.21 -r1.22 syssrc/sys/arch/i386/conf/DR-EVIL
 > cvs rdiff -r1.360 -r1.361 syssrc/sys/arch/i386/conf/GENERIC
 > cvs rdiff -r1.5 -r1.6 syssrc/sys/arch/i386/conf/IOPENER

- add commented out PCIBIOS_INTR_GUESS.

 Revisions pulled up:
 > cvs rdiff -r1.19 -r1.20 syssrc/sys/arch/i386/conf/CARDBUS
 > cvs rdiff -r1.23 -r1.24 syssrc/sys/arch/i386/conf/DR-EVIL
 > cvs rdiff -r1.364 -r1.365 syssrc/sys/arch/i386/conf/GENERIC
 > cvs rdiff -r1.7 -r1.8 syssrc/sys/arch/i386/conf/IOPENER
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.5 2000/08/01 22:35:52 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.5 $"
a231 2
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O addresses
#options 	PCIBIOS_BUS_FIXUP	# fixup PCI bus numbering
d233 1
a233 2
#options 	PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
#options 	PCIBIOS_INTR_GUESS	# see pcibios(4)
d235 2
@


1.354.2.7
log
@Remove COMPAT_AOUT from GENERIC and GENERIC_TINY. Done on the trunk
as revisions 1.362 and 1.18 respectively.

Approved by thorpej
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.6 2000/08/10 23:10:28 soda Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.6 $"
d86 2
@


1.354.2.8
log
@Pull up rev 1.370 (ok'd by fvdl):
Enable VM86 -- it's needed for some X servers (notably, S3 Savage,
which runs the VESA BIOS in VM86 emulation in order to switch video
modes).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.7 2000/09/12 00:48:39 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.7 $"
d20 1
a20 1
options 	VM86		# virtual 8086 emulation
@


1.354.2.9
log
@Pull up revision 1.382 (requested by he):
  Add a driver for an(4), Aironet and Cisco wireless pcmcia cards.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.8 2000/09/20 18:26:06 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.8 $"
a556 1
an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
@


1.354.2.10
log
@Pull up revision 1.403 (requested by fvdl):
  Not all DIAGNOSTIC checks are all that cheap, so disable that
  option in meant-for-production kernels.  Introduces GENERIC_DIAGNOSTIC.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.9 2000/12/12 21:28:24 he Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.9 $"
d61 1
a61 1
#options 	DIAGNOSTIC	# expensive kernel consistency checks
@


1.354.2.11
log
@Pull up revision 1.402 (requested by minoura):
  Add Yamaha YMF724/740/744/745-based sound driver and
  its subordinates.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.10 2001/04/25 08:55:50 he Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.10 $"
a697 1
yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio
a726 1
opl*	at yds?
a745 1
audio*	at yds?
a752 1
mpu*	at yds?
@


1.354.2.12
log
@Pull up revision 1.386 (requested by he):
  Add pseudo-device vlan.
  Make sure "rnd is EXPERIMENTAL" comment is removed.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
a836 1
pseudo-device	vlan			# IEEE 802.1q encapsulation
@


1.354.2.13
log
@Pull up revision 1.389 (requested by skrll):
  Add a driver for the ESS Technology Maestro-1/2/2E AC97 audio chips,
  ES1968 and ES1978.
@
text
@a694 1
esm*	at pci? dev ? function ?	# ESS Maestro-1/2/2e PCI Audio Accelerator
a736 1
audio*	at esm?
@


1.354.2.14
log
@Apply patch (requested by sommerfeld):
  Add a driver for the NeoMagic 256 AC'97 chip.
@
text
@a697 1
neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
a743 1
audio*	at neo?
@


1.354.2.15
log
@Pull up revision 1.393 (requested by he):
  Add clct(4) driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.14 2001/05/06 14:44:50 he Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.14 $"
a692 1
clct*	at pci? dev ? function ?	# Cirrus Logic CS4281
a736 1
audio*	at clct?
a764 1
#midi*	at clct?		# Cirrus Logic CS4281 MIDI port
@


1.354.2.16
log
@Apply patch (requested by ad):
  Add Mylex DACC960, CAC-EISA, and I2O block/SCSI drivers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.15 2001/05/06 15:18:54 he Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.15 $"
a145 1
options		I2OVERBOSE	# verobse I2O driver messages
a374 5
# I2O devices
iop*	at pci? dev ? function ?	# I/O processors
iopsp*	at iop? tid ?			# SCSI ports
ld*	at iop? tid ?			# block devices

a433 1
scsibus* at iopsp?
d453 2
a454 8
cac*	at eisa? slot ?			# Compaq array controllers
cac*	at pci? dev ? function ?	# Compaq array controllers
mlx*	at pci? dev ? function ?	# Mylex DAC960 family
twe*	at pci? dev ? function ?	# 3ware Escalade family

ld*	at cac? unit ?
ld*	at mlx? unit ?
ld*	at twe? unit ?
@


1.354.2.17
log
@Apply patch (requested by ad):
  Add driver for DPT/Adaptec I2O RAID management interface.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.16 2001/10/25 18:05:28 he Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.16 $"
a379 1
dpti*	at iop? tid 0			# Adaptec/DPT control interface
@


1.354.2.18
log
@Pull up revision 1.432 (via patch, requested by he):
  Add driver for Creative Labs SBLive! EMU10000 and (probably) PCI512.
  Fixes PR#15260.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.17 2001/12/09 19:14:43 he Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.17 $"
a709 1
emuxki*	at pci? dev ? function ?	# Creative SBLive! and PCI512
a754 1
audio*	at emuxki?
@


1.354.2.19
log
@Pull up revision 1.461 (requested by he):
  Add driver for the ESS Allegro-1 / Maestro-3 audio hardware.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354.2.18 2002/01/19 21:56:32 he Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354.2.18 $"
a710 1
esa*	at pci? dev ? function ?	# ESS Allegro-1 / Maestro-3 PCI Audio
a754 1
audio*	at esa?
@


1.353
log
@Remove the obsolete config fragments for kernel crypto, because the IPsec
crypto code is now in the kernel source tree.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.352 2000/06/11 02:41:10 mycroft Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.352 $"
d189 1
a189 1
#options 	APM_POWER_PRINT		# Don't print stats on the console
@


1.352
log
@Remove pcvt tentacles.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.351 2000/06/11 00:21:01 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.351 $"
a113 13

# Pull in config fragments for kernel crypto.  This is required for
# options IPSEC etc. to work. If you want to run with IPSEC, uncomment
# one of these, based on whether you use crypto-us or crypto-intl, and
# adjust the prefixes as necessary.

#prefix ../crypto-us/sys
#cinclude "conf/files.crypto-us"
#prefix

#prefix ../crypto-intl/sys
#cinclude "conf/files.crypto-intl"
#prefix
@


1.351
log
@Alphabetize.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.350 2000/06/08 21:42:14 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.350 $"
d301 1
a301 1
# ISA console.  You can only configure one of these!
a302 1
#vt0	at isa? port 0x60 irq 1		# PCVT console driver
d308 1
a308 1
# pccons-specific option:
a309 1
# pccons/pcvt -specific option:
a797 1
#opms0	at vt? irq 12		# PS/2 auxiliary port mouse
@


1.350
log
@Make siop the default instead of ncr. The siop driver has proven to
be reliable, and, although it does not do tagged queueing yet, this
makes it a better choice.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.349 2000/06/05 23:18:51 gmcgarry Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.349 $"
d463 1
a464 1
ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devices
@


1.349
log
@Replace references to xe with xi.  Clarify description to avoid
confusion with the Xircom tlp-based cards.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.348 2000/06/05 13:34:13 joda Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.348 $"
d399 2
a400 2
ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI
#siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI (experimental)
d451 1
a451 1
scsibus* at ncr?
d454 1
a454 1
#scsibus* at siop?
@


1.348
log
@fix `#scsibus at siop?' line
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.347 2000/06/01 04:24:01 david Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.347 $"
d580 1
a580 1
#xe*	at pcmcia? function ?		# Xircom PCMCIA cards
@


1.347
log
@Remove entry for non-existant driver that entered GENERIC in 1.289
and propagated to others when sync'd.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.346 2000/05/28 21:46:04 jhawk Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.346 $"
d454 1
a454 1
#scsibus at siop?
@


1.346
log
@Add patchable "pnpbiosdebug" global if PNPBIOSDEBUG is compiled in,
and add PNPBIOSDEBUG_VALUE to initialize its value, defaulting to 1.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.345 2000/05/28 21:12:00 jhawk Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.345 $"
a710 1
#sbl*	at pci? dev ? function ?	# SoundBlaster Live!
a755 1
#audio*	at sbl?
@


1.345
log
@pnpbios from 1.344 didn't config. s/pnpbios0/pnpbios?/
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.344 2000/05/28 20:11:59 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.344 $"
d161 1
a161 1

@


1.344
log
@Tidy up a little, improve PnP BIOS section.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.343 2000/05/28 02:42:16 tv Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.343 $"
d213 4
a216 4
#ess*		at pnpbios0 index ?	# ESS AudioDrive
#sb*		at pnpbios0 index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios0 index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios0 index ?	# OPL3-SA3
d220 1
a220 1
# Interfaces" to "com*", otherwise com2 will attach at pnpbios0 and there
d234 1
a234 1
#pciide* at pnpbios0 index ?
@


1.343
log
@`ep' has `plug-and-play' support on all buses, including non-PnP ISA.
Attach ep* at isa instead of ep0, so we will autoconfigure all 3c5x9s.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.342 2000/05/25 01:34:18 mason Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.342 $"
d208 28
d245 1
a245 1
#options 	PCIBIOS_IRQS_HINT="0x0a00"	# PCI interrupts hint. IRQ 9 or 11
d248 1
a248 1
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O address
d285 1
a285 1
# CardBus bus support
d289 1
d388 1
a388 1
#viaenv*	at viapm?
d400 1
d454 1
d552 1
d602 1
a603 1
le*	at nele?
d622 1
a700 27


# Plug-and-Play BIOS and attached devices

#pnpbios0 at mainbus0

# mainboard audio chips
#ess*	at pnpbios0 index ?	# ESS AudioDrive
#sb*	at pnpbios0 index ?	# NeoMagic 256AV in sb mode
#wss*	at pnpbios0 index ?	# NeoMagic 256AV in wss mode
#ym*	at pnpbios0 index ?	# OPL3-SA3

# com port
# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
# Interfaces" to "com*", otherwise com2 will attach at pnpbios0 and there
# will be no com0.  A side effect is pcmcia (and other) com? previously
# starting at com3 may attach as com1 or com2.
#com*	at pnpbios0 index ?

# parallel port
# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
# "printer interfaces".
#lpt*	at pnpbios0 index ?

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide* at pnpbios0 index ?

@


1.342
log
@Fixed typo in ses comment - devies -> devices
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.341 2000/05/22 16:48:41 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.341 $"
d560 1
a560 1
ep0	at isa? port ? irq ?			# 3C509 ethernet cards
@


1.342.2.1
log
@Sync w/ netbsd-1-5-base.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.354 2000/06/16 10:31:03 hubertf Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.354 $"
d115 13
d161 1
a161 1
#options	PNPBIOSDEBUG	# more fullsome Pnp BIOS debugging messages
d202 1
a202 1
#options 	APM_POWER_PRINT		# Print stats on the console
a207 28
# Plug-and-Play BIOS and attached devices

#pnpbios*	at mainbus?

# mainboard audio chips
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# OPL3-SA3

# com port
# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
# will be no com0.  A side effect is pcmcia (and other) com? previously
# starting at com3 may attach as com1 or com2.
#com*		at pnpbios? index ?	# serial ports

# parallel port
# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
# "printer interfaces".
#lpt*		at pnpbios? index ?	# parallel ports

#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide* at pnpbios? index ?

d217 1
a217 1
#options 	PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
d220 1
a220 1
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O addresses
d257 1
a257 1
# CardBus bridge support
a260 1
# CardBus bus support
d272 1
a272 1
# ISA console
d274 1
d280 1
a280 1
# pccons-specific options:
d282 1
d359 1
a359 1
#viaenv* at viapm?
d370 1
a370 2
#ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI (old driver)
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
d421 1
a421 1
#scsibus* at ncr?
a423 1
scsibus* at siop?
d432 1
a433 1
ss*	at scsibus? target ? lun ?	# SCSI scanners
a520 1
ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
d548 1
a548 1
xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
d560 1
a560 1
ep*	at isa? port ? irq ?			# 3C509 ethernet cards
d570 1
a571 1
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
a589 1
dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
d669 27
d705 1
d751 1
d796 1
@


1.341
log
@Add `ses' (SCSI Enclosure Services) device.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.340 2000/05/20 21:34:48 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.340 $"
d433 1
a433 1
ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devies
@


1.340
log
@Alphabetize.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.339 2000/05/19 10:23:36 veego Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.339 $"
d433 1
@


1.339
log
@Disable the viaenv driver and remove the siop entry which was added
in the last commit.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.338 2000/05/17 18:08:50 thorpej Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.338 $"
d515 1
d518 1
a526 2
lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
rtk*	at pci? dev ? function ?	# Realtek 8129/8139
d585 1
a586 1
#rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
d605 1
a606 1
ohci*	at pci?	dev ? function ?	# Open Host Controller
d612 1
a613 1
usb*	at ohci?
@


1.338
log
@Add Cyclades-Z serial.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.337 2000/05/14 04:36:09 jhawk Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.337 $"
d358 2
a359 2
viapm*	at pci? dev ? function ?
viaenv*	at viapm?
a370 1
siop*	at pci? dev ? function ?	# Symbios Logic 53c8xx SCSI
@


1.337
log
@Comment out XSERVER and XSERVER_DDB and move them to the pccons-specific
section. They are not used with wscons.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.336 2000/05/08 18:41:26 joda Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.336 $"
d310 1
d358 2
a359 2
#viapm*	at pci? dev ? function ?
#viaenv*	at viapm?
d371 1
@


1.336
log
@add viaenv template
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.335 2000/05/08 13:49:47 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.335 $"
a27 4
# Misc. i386-specific options
options 	XSERVER		# X server support in console drivers
#options 	XSERVER_DDB	# PF12 gets you into DDB when X is running

a274 1

d280 5
@


1.335
log
@Add (sometimes commented out) MIIVERBOSE option.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.334 2000/05/07 00:44:45 wiz Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.334 $"
d355 4
@


1.334
log
@add bktr device
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.333 2000/05/04 19:41:44 jhawk Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.333 $"
d158 1
@


1.333
log
@Add comment suggesting s/com[0-9]/com*/ and s/lpt0/lpt*/
if you enable com*/lpt* at pnpbios0, to avoid attaching
com0 as com3.
Don't actually change the "com0 at isa" line, since doing so
would cause some com* (e.g. pcmcia) to be renumbered from com3
to something lower, at least on some systems.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.332 2000/05/02 11:00:56 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.332 $"
d769 4
@


1.332
log
@Add (commented out) cms(4) driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.331 2000/04/30 22:00:54 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.331 $"
d674 4
d681 2
@


1.331
log
@Add C-Media CMI8x38, cmpci.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.330 2000/04/30 19:08:19 dante Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.330 $"
d713 2
d753 1
@


1.330
log
@Update comment in adw*
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.329 2000/04/28 17:23:52 uch Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.329 $"
d688 1
d727 1
@


1.329
log
@add PCIBIOS_ADDR_FIXUP, PCIBIOS_IRQS_HINT configuration. and its sample.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.328 2000/04/21 17:52:06 explorer Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.328 $"
d359 1
a359 1
adw*	at pci? dev ? function ?	# AdvanSys 9xxUW SCSI
@


1.328
log
@Add (commented out) addcom0 and com* at addcom?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.327 2000/04/19 08:44:33 haya Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.327 $"
d220 1
d223 1
@


1.327
log
@Changes the name of RealTek driver.  The new name is `rtk'.  This used
to be called `rl' and it conflict with RL vax disks, canonical and
historical unix driver name.

This changes are minimal: it only changes the name of RealTek driver.
The filename of source code and a lot of the letter `rl' in source
files should be changed shortly.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.326 2000/04/19 06:50:31 itojun Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.326 $"
d337 2
a338 1

@


1.326
log
@add stf pseudo interface (commented out due to possible security risks)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.325 $"
d517 1
a517 1
rl*	at pci? dev ? function ?	# Realtek 8129/8139
d577 1
a577 1
#rl*	at cardbus? dev ? function ?	# Realtek 8129/8139
@


1.325
log
@Add FTDI FT8U100AX driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.324 2000/04/14 14:46:17 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.324 $"
d817 1
@


1.324
log
@Add Rio 500 device.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.323 2000/04/13 11:20:06 joda Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.323 $"
d643 5
@


1.323
log
@add com at cardbus comment
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.322 2000/04/10 07:58:18 haya Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.322 $"
d643 3
@


1.322
log
@Add rl cardbus attachment.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.321 2000/04/09 18:34:02 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.321 $"
d316 3
@


1.321
log
@Add upl(4) driver.  Uncomment uvisor(4) driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.320 2000/04/03 00:03:30 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.320 $"
d574 1
@


1.320
log
@Add atapibus* at umass?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.319 2000/03/31 04:47:52 tsarna Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.319 $"
d637 3
d641 2
a642 2
#uvisor*	at uhub? port ?
#ucom*	at uvisor?
@


1.319
log
@Add and enable auvia
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.318 2000/03/30 17:01:01 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.318 $"
d626 1
@


1.318
log
@Add (commented out) uvisor driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.317 2000/03/26 15:36:49 martin Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.317 $"
d667 1
d705 1
@


1.317
log
@Added a PCI frontend for the legacy ISA joystick driver.
Some PCI soundcards don't seem to use the generic gameport function with
interface 0x10 used here, but have either an own BAR dedicated to this
(i.e. Sonic Vibes or ESS Solo-1) or specify their own device (see
PCI_PRODUCT_CREATIVELABS_SBJOY in sys/dev/pci/pcidevs.h).
Probably these use a similar simple sheme and adding a frontend for them would
be trivial, but I don't own any of these cards, so I didn't.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.316 2000/03/22 11:22:21 onoe Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.316 $"
d635 4
@


1.316
log
@Update awi driver, which now supports AMD 79c930 based 802.11 DS cards
as well as 802.11 FH cards.  Also, it can operate in infrastructure mode,
adhoc mode, and wi(4) (aka WaveLAN/IEEE) compatible adhoc mode.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.315 2000/03/22 00:58:20 cgd Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.315 $"
d756 3
@


1.315
log
@add commented out option PCI_CONFIG_DUMP whever there's a PCIVERBOSE.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.314 2000/03/19 22:35:43 mycroft Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.314 $"
d527 1
a527 1
awi*	at pcmcia? function ?		# BayStack 650 (802.11FH)
@


1.314
log
@Add scsibus at esp.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.313 2000/03/19 22:32:59 mycroft Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.313 $"
d159 1
@


1.313
log
@Add esp at pcmcia.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.312 2000/03/16 15:05:18 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.312 $"
d405 1
@


1.312
log
@Attach cac* at pci?, ca* at cac?. Commented out where needs be.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.311 2000/03/14 22:37:55 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.311 $"
d369 1
@


1.311
log
@Some whitespace changes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.310 2000/03/10 06:03:18 groo Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.310 $"
d420 3
@


1.310
log
@clean up lm0 example
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.309 2000/03/09 16:49:22 hubertf Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.309 $"
d290 1
a290 1
vga*		at pci?
d298 1
a298 1
pcppi0	at isa?
d426 1
a426 1
pciide* at pci ? dev ? function ? flags 0x0000
@


1.309
log
@fix typo
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.308 2000/03/09 04:12:42 groo Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.308 $"
d346 1
a346 3
#lm0	at isa?	port 0x290
#lm0	at isa?	port 0x280
#lm0	at isa?	port 0x310
@


1.308
log
@Add (commented out) lm driver examples
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.307 2000/03/06 18:45:42 itojun Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.307 $"
d219 1
a219 1
#options 	PCIINTR_DEBUG		# super-verbse PCI interrupt fixup
@


1.307
log
@beautify APM_DISABLE_INTERRUPTS line (s/options\t/options \t/)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.306 2000/03/04 21:37:23 mycroft Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.306 $"
d345 4
@


1.306
log
@Invert the APM_NO_POWER_PRINT flag, and make sure it's off by default.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.305 2000/02/29 06:32:25 simonb Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.305 $"
d205 1
a205 1
#options	APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
@


1.305
log
@Do the "<space><tab>" thing with the RAID_AUTOCONFIG option.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.304 2000/02/27 16:51:39 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.304 $"
d204 1
a204 1
#options 	APM_NO_POWER_PRINT	# Don't print stats on the console
@


1.304
log
@Add (commented out) PCIBIOS options so people can find them easily.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.303 2000/02/26 17:35:37 oster Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.303 $"
d768 1
a768 1
#options	RAID_AUTOCONFIG		# auto-configuration of RAID components
@


1.303
log
@Defopt 'RAID_AUTOCONFIG'.  Adding 'options RAID_AUTOCONFIG' turns on
the component auto-detection and auto-configuration of RAID sets.
Also, add "#options RAID_AUTOCONFIG" to the GENERIC config files.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.302 2000/02/26 17:12:37 itojun Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.302 $"
d214 7
@


1.302
log
@s/options\t/options \t/ for CONS_OVERRIDE line, so that addition/removal of
"#" does not affect indentation.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.301 2000/02/24 18:49:40 ad Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.301 $"
d761 1
@


1.301
log
@- Attach dpt0 to the isa bus. Commented out since (a) at any valid address it
  conflicts with too much other stuff (b) if I UTSLed correctly, EISA boards
  may be picked up at an "ISA address and an EISA address" - I don't have
  enough info on this yet to fix it (c) a DPT HBA at an address usually
  assigned to wdc0/1 may get detected as a WD100x controller. Some of them can
  emulate a WD100x controller, but the one I tested with doesn't.
- Sync with GENERIC just a little.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300 2000/02/15 17:14:50 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300 $"
d37 1
a37 1
#options	CONS_OVERRIDE	# Always use above! independent of boot info
@


1.300
log
@Add ess at pnpbios
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.299 2000/02/03 20:31:42 dante Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.299 $"
d373 2
a374 1
# The "nca" probe might give false hits or hang your machine.
@


1.300.2.1
log
@Add cpu* and (commented-out) ioapic*
Needed on both uniprocessor and MP systems.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300 2000/02/15 17:14:50 nathanw Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300 $"
a196 3
cpu* at mainbus? apid ?

#ioapic* at mainbus? apid ?
@


1.300.2.2
log
@whitespace cleanup
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.1 2000/02/20 18:37:36 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.1 $"
d198 1
@


1.300.2.3
log
@Catch up sommerfeld_i386mp_1 branch with -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.325 2000/04/14 14:53:32 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.325 $"
d37 1
a37 1
#options 	CONS_OVERRIDE	# Always use above! independent of boot info
a158 1
#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
d206 2
a207 2
#options 	APM_POWER_PRINT		# Don't print stats on the console
#options 	APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
a216 7
# Configure PCI using BIOS information
#options 	PCIBIOS			# PCI BIOS support
#options 	PCIBIOSVERBOSE		# PCI BIOS verbose info
#options 	PCIBIOS_INTR_FIXUP	# fixup PCI interrupt routing
#options 	PCIINTR_DEBUG		# super-verbose PCI interrupt fixup
#options 	PCIBIOS_BUS_FIXUP	# fixup PCI bus numbering

d285 1
a285 1
vga*		at pci? dev ? function ?
d293 1
a293 1
pcppi0		at isa?
a310 3
# CardBus serial interfaces
#com*	at cardbus? function ?		# Modems and serial cards

a339 2
# LM7[89] and compatible hardware monitors
#lm0	at isa?	port 0x290		# other common ports: 0x280, 0x310
a361 1
esp*	at pcmcia? function ?		# Qlogic ESP406/FAS408 SCSI
d375 1
a375 2
# The "nca" and "dpt" probes might give false hits or hang your machine.
#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
a395 1
scsibus* at esp?
a411 3
# RAID controllers and devices
cac*	at pci? dev ? function ?	# Compaq array controller
ca*	at cac? unit ?			# Compaq array disk device
d418 1
a418 1
pciide* at pci? dev ? function ? flags 0x0000
d513 1
a513 1
awi*	at pcmcia? function ?		# BayStack 650/660 (802.11FH/DS)
a559 1
#rl*	at cardbus? dev ? function ?	# Realtek 8129/8139
a611 1
atapibus* at umass? channel ?
a621 15
# Prolofic PL2301/PL2302 host-to-host adapter
upl*	at uhub? port ?

# Serial adapters
# FTDI FT8U100AX serial adapter
#uftdi*	at uhub? port ?
#ucom*	at uftdi? portno ?

# Diamond Multimedia Rio 500
urio*	at uhub? port ?

# USB Handspring Visor
uvisor*	at uhub? port ?
ucom*	at uvisor?

a648 1
auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
a685 1
audio*	at auvia?
a742 3
# PCI joysticks
joy*	at pci?				# Game ports (usually on audio cards)

a761 1
#options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
@


1.300.2.4
log
@Merge up to -current.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
d339 1
a339 2
#addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
#com*	at addcom? slave ?
d519 1
a519 1
rtk*	at pci? dev ? function ?	# Realtek 8129/8139
d579 1
a579 1
#rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
a818 1
#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
@


1.300.2.5
log
@Merge with -current
@
text
@a221 1
#options 	PCIBIOS_IRQS_HINT="0x0a00"	# PCI interrupts hint. IRQ 9 or 11
a223 1
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O address
d359 1
a359 1
adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
a687 1
cmpci*	at pci? dev ? function ?	# C-Media CMI8338/8738
a725 1
audio*	at cmpci?
@


1.300.2.6
log
@Merge up to just-post-1.5 -current
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.5 2000/05/03 14:42:30 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.5 $"
d28 4
d114 1
a114 1
options 	SOFTDEP         # FFS soft updates support.
d119 13
a157 1
options 	MIIVERBOSE	# verbose PHY autoconfig messages
d164 1
a164 1
#options	PNPBIOSDEBUG	# more fullsome Pnp BIOS debugging messages
d207 1
a207 1
#options 	APM_POWER_PRINT		# Print stats on the console
a212 28
# Plug-and-Play BIOS and attached devices

#pnpbios*	at mainbus?

# mainboard audio chips
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# OPL3-SA3

# com port
# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
# will be no com0.  A side effect is pcmcia (and other) com? previously
# starting at com3 may attach as com1 or com2.
#com*		at pnpbios? index ?	# serial ports

# parallel port
# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
# "printer interfaces".
#lpt*		at pnpbios? index ?	# parallel ports

#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide* at pnpbios? index ?

d222 1
a222 1
#options 	PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
d225 1
a225 1
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O addresses
d262 1
a262 1
# CardBus bridge support
a265 1
# CardBus bus support
d277 1
a277 1
# ISA console
d279 2
a285 4
# pccons-specific options:
#options 	XSERVER_DDB	# PF12 gets you into DDB when X is running
#options 	XSERVER		# X server support

a310 1
cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards
a356 4
# VIA VT82C686A hardware monitor
#viapm*	at pci? dev ? function ?
#viaenv* at viapm?

d366 1
a366 2
#ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI (old driver)
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
d417 1
a417 1
#scsibus* at ncr?
a419 1
scsibus* at siop?
a427 1
ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devices
a510 1
lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
a512 1
rtk*	at pci? dev ? function ?	# Realtek 8129/8139
a513 1
ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
d521 2
d543 1
a543 1
xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
d555 1
a555 1
ep*	at isa? port ? irq ?			# 3C509 ethernet cards
d565 1
a566 1
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
d581 1
a582 1
#tlp*	at cardbus? dev ? function ?	# DECchip 21143
a584 1
dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
d601 1
a602 1
uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)
d608 1
a609 1
usb*	at uhci?
d664 21
d694 1
a714 2
#cms0	at isa? port 0x220			# Creative Music System

d738 1
a752 1
#midi*	at cms?			# Creative Music System
a761 4
# TV cards

# Brooktree 848/849/878/879 based TV cards
bktr* at pci? dev ? function ?
d778 1
@


1.300.2.7
log
@Merge sommerfeld_i386mp_1 branch forward to 20000806 sources
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.6 2000/06/25 19:36:55 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.6 $"
d65 1
a65 1
options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
d85 2
a86 1
#options        COMPAT_PECOFF   # kernel support to run Win32 apps
a118 1
options 	PULLDOWN_TEST	# use m_pulldown for IPv4/v6 processing
d126 1
a126 1
#options 	EON		# OSI tunneling over IP
a148 1

d223 1
a223 1
#pciide*	at pnpbios? index ?
d234 1
a234 1
#options 	PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
d338 1
a338 1
#com*	at cardbus? dev ? function ?	# Modems and serial cards
a359 1

a369 2
# Hardware monitors 

a376 1

a457 1

a622 1

a688 1

a756 1
midi*	at clcs?		# Cirrus Logic CS4280 MIDI port
a766 1

a770 1

@


1.300.2.8
log
@Catch up to -current for this one file..
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.7 2000/08/07 01:08:27 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.7 $"
d118 1
a118 1
#options 	PULLDOWN_TEST	# use m_pulldown for IPv4/v6 processing
@


1.300.2.9
log
@Catch up to -current
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.8 2000/08/25 00:40:06 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.8 $"
d461 1
a461 1
lsu*	at cac? unit ?			# Compaq array disk device
@


1.300.2.10
log
@Catch up to the raid shuffle.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.9 2000/11/18 23:25:50 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.9 $"
a459 1
cac*	at eisa?			# Compaq EISA array controllers
d461 1
a461 3
twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
ld*	at cac? unit ?			# Compaq array disk device
ld*	at twe? unit ?			# 3ware array disk devices
@


1.300.2.11
log
@Comment out the mismatched COMPAT_* for now
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.10 2000/12/29 21:38:40 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.10 $"
d81 4
a84 4
#options 	COMPAT_SVR4	# binary compatibility with SVR4
#options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
#options 	COMPAT_LINUX	# binary compatibility with Linux
#options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
@


1.300.2.12
log
@Snapshot of merge-in-progress with -current.

[Not expected to build].  Catch up with the last N months worth of
changes to -current.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
d20 1
a20 1
options 	VM86		# virtual 8086 emulation
d81 5
a85 5
options 	COMPAT_SVR4	# binary compatibility with SVR4
options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
options 	COMPAT_LINUX	# binary compatibility with Linux
options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD
#options 	COMPAT_PECOFF	# kernel support to run Win32 apps
d118 1
d148 1
a148 2
#options	PNPBIOSDEBUG	# more fulsome Pnp BIOS debugging messages
options 	I2OVERBOSE	# verbose I2O driver messages
a171 2
# modify the screen type of the console; defaults to "80x25"
#options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
a233 2
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O addresses
#options 	PCIBIOS_BUS_FIXUP	# fixup PCI bus numbering
a235 1
#options 	PCIBIOS_INTR_GUESS	# see pcibios(4)
d237 2
a359 2
#moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
#com*	at moxa? slave ?
a381 6
# I2O devices
iop*	at pci? dev ? function ?	# I/O processor
iopsp*	at iop? tid ?			# SCSI/FC-AL ports
ld*	at iop? tid ?			# block devices


d411 1
a411 1
adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02] SCSI
d420 1
a420 1
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
a440 1
scsibus* at iopsp?
a458 1

d461 1
a461 1
cac*	at pci? dev ? function ?	# Compaq PCI array controllers
d463 1
a463 1
ld*	at cac? unit ?			# Compaq array disk devices
a533 1
an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
a562 1
an*	at isapnp?			# Aironet 802.11
a567 1
an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
a695 3
# USB scanners
uscanner* at uhub? port ?

a703 1
auich*	at pci? dev ? function ?	# Intel ICH integrated AC'97 Audio
a708 1
neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
a743 1
audio*	at auich?
a751 1
audio*	at neo?
a846 1
pseudo-device	vlan			# IEEE 802.1q encapsulation
d849 1
a849 1
pseudo-device	pty			# pseudo-terminals
@


1.300.2.13
log
@Sync with the trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.12 2001/01/07 22:12:38 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.12 $"
d702 2
a703 5
uftdi*	at uhub? port ?
ucom*	at uftdi? portno ?

uplcom*	at uhub? port ?		# I/O DATA USB-RSAQ2 serial adapter
ucom*	at uplcom? portno ? 
a714 7
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
scsibus* at usscanner? channel ?

# Y@@P firmware loader
uyap* at uhub? port ?

d722 1
a723 1
auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
a724 1
clct*	at pci? dev ? function ?	# Cirrus Logic CS4281
a726 1
esm*	at pci? dev ? function ?	# ESS Maestro-1/2/2e PCI Audio Accelerator
d764 1
a765 1
audio*	at auvia?
a766 1
audio*	at clct?
a768 1
audio*	at esm?
a791 1
#midi*	at clct?		# Cirrus Logic CS4281 MIDI port
@


1.300.2.14
log
@Merge sommerfeld_i386mp_1 branch with -current as of today.
GENERIC.MP kernel boots and runs multiuser on my ABIT BP6
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
d61 1
a61 1
#options 	DIAGNOSTIC	# expensive kernel consistency checks
a77 1
options 	COMPAT_15	# NetBSD 1.5,
a474 1
mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
d476 2
a478 3
ld*	at cac? unit ?			# logical disk devices
ld*	at twe? unit ?
ld*	at mlx? unit ?
a691 3
# USB MIDI
umidi* at uhub? port ? configuration ?

a707 3
umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

a742 1
yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio
a771 1
opl*	at yds?
a794 1
audio*	at yds?
a801 1
mpu*	at yds?
a812 1
midi*   at umidi?               # USB MIDI
a841 2

#joy*		at pnpbios? index ?	# Game port
@


1.300.2.15
log
@yet another merge-up
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.14 2001/04/30 16:23:08 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.14 $"
d474 1
a474 1
cac*	at eisa? slot ?			# Compaq EISA array controllers
a476 1
mlx*	at eisa? slot ?			# Mylex DAC960 & DEC SWXCR family
@


1.300.2.16
log
@Merge up with -current
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.15 2001/05/07 17:07:21 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.15 $"
d148 1
a148 1
#options	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
@


1.300.2.17
log
@checkpoint merge-in-progress from mainline.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
a401 1
iha*	at pci? dev ? function ?	# Initio INIC-940/950 SCSI
a452 1
scsibus* at iha?
@


1.300.2.18
log
@Merge up with -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.17 2001/06/18 03:33:27 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.17 $"
a561 1
gsip*	at pci? dev ? function ?	# NS83820 Gigabit Ethernet
d567 1
a567 2
sf*	at pci? dev ? function ?	# Adaptec AIC-6915 Ethernet
sip*	at pci? dev ? function ?	# SiS 900/DP83815 Ethernet
a645 1
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
@


1.300.2.19
log
@Catch up with -current
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
a54 4
#options	SEMMNI=10	# number of semaphore identifiers
#options	SEMMNS=60	# number of semaphores in system
#options	SEMUME=10	# max number of undo entries per process
#options	SEMMNU=30	# number of undo structures in system
@


1.300.2.20
log
@catch up with -current
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.19 2001/07/04 20:11:12 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.19 $"
a84 1
#options 	TCP_COMPAT_42	# 4.2BSD TCP/IP bug compat. Not recommended.
a89 2
#options	COMPAT_MACH	# binary compatibility with Mach binaries
#options	EXEC_MACHO	# exec MACH-O binaries
d138 3
a140 1
#options 	TCP_DEBUG	# Record last TCP_NDEBUG packets with SO_DEBUG
d408 1
d462 1
@


1.300.2.21
log
@Merge with -current once more.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.300.2.20 2001/07/19 08:57:25 sommerfeld Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.300.2.20 $"
a154 1
options 	MCAVERBOSE	# verbose MCA device autoconfig messages
a252 1
pcmb*	at pci? dev ? function ?	# PCI-MCA bridges
a269 3
# MCA bus support
mca0	at mainbus?

a371 2
# MCA serial interfaces
com*	at mca? slot ?			# 16x50s on comm boards
d409 1
a409 1
mly*	at pci? dev ? function ?	# Mylex AcceleRAID and eXtremeRAID
a410 1
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
a447 3
# MCA SCSI cards
aha*	at mca? slot ?			# Adaptec AHA-1640

a460 1
scsibus* at mly?
a551 4
# MCA ESDI devices
edc*	at mca? slot ?			# IBM ESDI Disk Controllers
ed*	at edc?

d560 1
a562 1
ex*	at pci? dev ? function ?	# 3Com 90x[BC]
a565 1
#hme*	at pci? dev ? function ?	# Sun Microelectronics STP2002-STQ
a569 1
pcn*	at pci? dev ? function ?	# AMD PCnet-PCI Ethernet
a572 2
ste*	at pci? dev ? function ?	# Sundance ST-201 Ethernet
stge*	at pci? dev ? function ?	# Sundance/Tamarack TC9021 Gigabit
a601 1
tr*	at pcmcia? function ?		# TROPIC based Token-Ring
a643 9
# MCA network cards
elmc*	at mca? slot ?			# 3Com EtherLink/MC (3c523)
ep*	at mca? slot ?			# 3Com EtherLink III (3c529)
we*	at mca? slot ?			# WD/SMC Ethernet
ate*	at mca? slot ?			# Allied Telesis AT1720
ne*	at mca? slot ?			# Novell NE/2 and clones
tr*	at mca? slot ?			# IBM Token Ring adapter
le*	at mca? slot ?			# SKNET Personal/MC2+

a644 4
acphy*	at mii? phy ?			# DAltima AC101 and AMD Am79c874 PHYs
amhphy*	at mii? phy ?			# AMD 79c901 Ethernet PHYs
bmtphy*	at mii? phy ?			# Broadcom BCM5201 and BCM5202 PHYs
brgphy*	at mii? phy ?			# Broadcom BCM5400-family PHYs
a646 2
glxtphy* at mii? phy ?			# Level One LXT-1000 PHYs
gphyter* at mii? phy ?			# NS83861 Gig-E PHY
d651 1
a651 1
makphy*	at mii? phy ?			# Marvell Semiconductor 88E1000 PHYs
a654 1
pnaphy*	at mii? phy ?			# generic HomePNA PHYs
a910 1
pseudo-device	bridge			# simple inter-network bridging
@


1.300.2.22
log
@Merge branch with current, post ubcperf, MTRR, etc., etc.,
with the recent fifo_putpages fix to the trunk, GENERIC.MPDEBUG config
boots multiuser on my BP6.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
a24 2
options 	MTRR		# memory-type range register syscall support

d55 4
a58 4
#options 	SEMMNI=10	# number of semaphore identifiers
#options 	SEMMNS=60	# number of semaphores in system
#options 	SEMUME=10	# max number of undo entries per process
#options 	SEMMNU=30	# number of undo structures in system
d91 2
a92 2
#options 	COMPAT_MACH	# binary compatibility with Mach binaries
#options 	EXEC_MACHO	# exec MACH-O binaries
d153 1
a153 1
#options 	PNPBIOSDEBUG	# more fulsome PnP BIOS debugging messages
a258 2
#agp* 	at pchb?

d260 2
a261 2
eisa0	at mainbus?
eisa0	at pceb?
d264 3
a266 3
isa0	at mainbus?
isa0	at pceb?
isa0	at pcib?
a403 1
dpti*	at iop? tid 0			# DPT/Adaptec control interface
d622 1
a622 2
# tr at pcmcia has problems with Cardbus bridges
#tr*	at pcmcia? function ?		# TROPIC based Token-Ring
@


1.300.2.23
log
@Yet another mergeup.

New work:
 - Frank van der Linden's tlb shootdown fix.
Mainline functionality merged:
 - IrDA
 - Kernel RCSID's
 - Transmeta CPU support
 - ACPI
 - XMM register access through procfs
@
text
@d1 1
a1 1
# $NetBSD$
d3 1
a3 5
# GENERIC machine description file
# 
# This machine description file is used to generate the default NetBSD
# kernel.  The generic kernel does not include all options, subsystems
# and device drivers, but should be useful for most applications.
a4 11
# The machine description file can be customised for your specific
# machine to reduce the kernel size and improve its performance.
#
# For further information on compiling NetBSD kernels, see the config(8)
# man page.
#
# For further information on hardware support for this architecture, see
# the intro(4) man page.  For further information about kernel options
# for this architecture, see the options(4) man page.  For an explanation
# of each device driver in this file see the section 4 man page for the
# device.
d6 1
a6 1
include 	"arch/i386/conf/std.i386"
d32 1
a32 1
#options 	CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
d73 1
a73 1
#options 	KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
d119 1
a119 1
options 	SOFTDEP		# FFS soft updates support.
d295 1
a295 1
#cardslot*	at cbb?
d394 1
a394 1
# Hardware monitors
a423 1
trm*	at pci? dev ? function ?	# Tekram DC-395U/UW/F, DC-315/U SCSI
a459 1
#adv*	at cardbus? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
a481 1
scsibus* at trm?
d514 1
a514 1
wdc*	at isapnp?
a547 1
st*	at atapibus? drive ? flags 0x0000	# ATAPI tape drives
a605 1
wi*	at pci? dev ? function ?	# Intersil Prism Mini-PCI (802.11b)
d659 2
a660 2
tr0	at isa? port 0xa20 iomem 0xd8000 irq ?	# IBM TROPIC based Token-Ring
tr1	at isa? port 0xa24 iomem 0xd0000 irq ?	# IBM TROPIC based Token-Ring
d696 1
a697 1
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
a706 2
# The EHCI is not ready for prime time.
#ehci*	at pci?	dev ? function ?	# Enhanced Host Controller
a710 1
#ehci*	at cardbus? dev ? function ?	# Enhanced Host Controller
a713 1
#usb*	at ehci?
a720 3
# USB HID device
uhidev*	at uhub? port ? configuration ? interface ?

d722 2
a723 2
ums*	at uhidev? reportid ?
wsmouse* at ums? mux 0
d726 1
a726 1
ukbd*	at uhidev? reportid ?
d730 1
a730 1
uhid*	at uhidev? reportid ?
a742 1
#wd* at umass?
a749 4
# USB IrDA bridges
uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?

d764 1
a764 1
ucom*	at uplcom? portno ?
a789 7
# IrDA and Consumer Ir devices

# Toshiba Oboe
oboe* 	at pci? dev ? function ?
irframe* at oboe?


a793 1
autri*	at pci? dev ? function ?	# Trident 4DWAVE based AC'97 Audio
a798 1
emuxki*	at pci? dev ? function ?	# Creative SBLive! and PCI512
d819 1
a819 1
pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
a823 3
# PCMCIA audio devices
#esl*	at pcmcia? function ?			# ESS 1688 AudioDrive

a827 2
opl*	at cmpci? flags 1
#opl*	at esl?
a839 1
audio*	at autri?
a844 2
audio*	at emuxki?
#audio*	at esl?
d862 1
a862 2
#mpu*	at isa? port 0x330 irq 9	# MPU401 or compatible card
mpu*	at cmpci?
a869 1
midi*	at autri?		# Trident 4DWAVE MIDI port
d878 1
a878 1
midi*	at umidi?		# USB MIDI
a944 1
pseudo-device	pppoe			# PPP over Ethernet (RFC 2516)
a946 1
pseudo-device	irframetty		# IrDA frame line discipline
d967 2
a968 4
# wscons pseudo-devices
pseudo-device	wsmux			# mouse & keyboard multiplexor
pseudo-device	wsfont

@


1.300.2.24
log
@whitespace tweak.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.300.2.23 2001/12/29 21:09:03 sommerfeld Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.300.2.23 $"
a208 1

@


1.300.2.25
log
@Yet Another mergeup with -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.300.2.24 2001/12/29 23:21:18 sommerfeld Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.300.2.24 $"
a80 2
#options	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)

d476 1
a477 1
#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
d779 1
a779 2
# USB IrDA
# USB-IrDA bridge spec
a782 4
# SigmaTel STIr4200 USB/IrDA Bridge
ustir* at uhub? port ?
irframe* at ustir?

a818 4
# D-Link DSB-R100 USB radio
udsbr*	at uhub? port ?
radio*	at udsbr?

a840 1
esa*	at pci? dev ? function ?	# ESS Allegro-1 / Maestro-3 PCI Audio
d861 2
a862 2
#pss0	at isa? port 0x220 irq 7 drq 6		# Personal Sound System
#sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
a893 1
audio*	at esa?
d904 1
a904 1
#audio*	at sp?
a935 23
# FM-Radio devices
# ISA radio devices
#az0	at isa? port 0x350      # Aztech/PackardBell FM Radio Card
#az1	at isa? port 0x358
#rt0	at isa? port 0x20c      # AIMS Lab Radiotrack & compatible
#rt1	at isa? port 0x284
#rt2	at isa? port 0x30c
#rt3	at isa? port 0x384
#rtii0	at isa? port 0x20c      # AIMS Lab Radiotrack II FM Radio Card
#rtii1	at isa? port 0x30c
#sf2r0	at isa? port 0x384      # SoundForte RadioLink SF16-FMR2 FM Radio Card

# PCI radio devices
#mr*	at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card

# Radio support
#radio*	at az?
#radio*	at mr?
#radio*	at rt?
#radio*	at rtii?
#radio*	at sf2r?


a939 1
radio* at bktr?
a977 3
# Middle Digital, Inc. PCI-Weasel serial console board control
# devices (watchdog timer, etc.)
weasel* at pci?
d987 1
a987 2
# RAIDframe is broken with MULTIPROCESSOR / LOCKDEBUG
#pseudo-device	raid		8	# RAIDframe disk driver
a988 8
# Options to enable various other RAIDframe RAID types.
# options	RF_INCLUDE_EVENODD=1
# options	RF_INCLUDE_RAID5_RS=1
# options	RF_INCLUDE_PARITYLOGGING=1
# options	RF_INCLUDE_CHAINDECLUSTER=1
# options	RF_INCLUDE_INTERDECLUSTER=1
# options 	RF_INCLUDE_PARITY_DECLUSTERING=1
# options	RF_INCLUDE_PARITY_DECLUSTERING_DS=1
@


1.300.2.26
log
@Resynch with mainline.
@
text
@d1 1
a1 1
# $NetBSD$
d23 1
a23 1
#ident 		"GENERIC-$Revision$"
d81 1
a81 1
#options 	PIPE_SOCKETPAIR	# smaller, but slower pipe(2)
a299 1
pcic2	at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
d712 1
a712 1
icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS189x
d1030 8
a1037 9
#Options to enable various other RAIDframe RAID types.
#options 	RF_INCLUDE_EVENODD=1
#options 	RF_INCLUDE_RAID5_RS=1
#options 	RF_INCLUDE_PARITYLOGGING=1
#options 	RF_INCLUDE_CHAINDECLUSTER=1
#options 	RF_INCLUDE_INTERDECLUSTER=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING=1
#options 	RF_INCLUDE_PARITY_DECLUSTERING_DS=1

@


1.300.2.27
log
@Initialize gdt on boot cpu earlier in boot instead of in gdt_init().
Put apm back in GENERIC and APM_NO_IDLE in GENERIC.MP.
Subsystems which install gdt entries during autoconf no longer explode.
(Do *not* expect full apm functionality on multiprocessors).
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.300.2.26 2002/02/24 00:17:42 sommerfeld Exp $
d23 1
a23 1
#ident 		"GENERIC-$Revision: 1.300.2.26 $"
d215 1
a215 1
apm0	at mainbus0			# Advanced power management
@


1.300.2.28
log
@Merge with current as of today
@
text
@d1 1
a1 1
# $NetBSD$
d23 1
a23 3
options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary

#ident 		"GENERIC-$Revision$"
a80 1
#options 	USERCONF	# userconf(4) support
d279 1
a279 1
agp* 	at pchb?
d343 1
d345 2
a346 1
#options 	PMS_DISABLE_POWERHOOK
d354 1
a442 1
#options 	SIOP_SYMLED		# drive the act. LED in software
a517 1
aac*	at pci? dev ? function ?	# Adaptec AAC family
a519 1
icp*	at pci? dev ? function ?	# ICP-Vortex GDT & Intel RAID
d524 1
a524 3
ld*	at aac? unit ?			# logical disk devices
ld*	at cac? unit ?
ld*	at icp? unit ?
a527 3
icpsp*	at icp? unit ?			# SCSI pass-through
scsibus* at icpsp?

d601 1
d623 5
a627 1
tlp*	at pci? dev ? function ?	# DECchip 21x4x and clones
a629 1
wm*	at pci? dev ? function ?	# Intel 82543/82544 gigabit
a725 1
urlphy* at mii? phy ?			# Realtek RTL8150L internal PHYs
a794 1
url*	at uhub? port ?		# Realtek RTL8150L based adapters
d796 1
a796 1
# Prolific PL2301/PL2302 host-to-host adapter
d800 2
a801 1
uftdi*	at uhub? port ?		# FTDI FT8U100AX serial adapter
a803 3
umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

d807 2
a808 2
uvscom*	at uhub? port ?		# SUNTAC Slipper U VS-10U serial adapter
ucom*	at uvscom? portno ?
d994 1
a1005 1
joy*	at eso?				# ESS Solo-1 on-board joystick
d1054 1
@


1.300.2.29
log
@Add cpu* at mainbus? or equivalent to all configs.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.300.2.28 2002/04/27 20:24:44 sommerfeld Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.300.2.28 $"
d215 2
a216 2
cpu* at mainbus?
#ioapic* at mainbus?
@


1.300.2.30
log
@Resynch with -current.
@
text
@d1 1
a1 1
# $NetBSD: GENERIC,v 1.300.2.29 2002/05/03 19:12:54 sommerfeld Exp $
d25 1
a25 1
#ident 		"GENERIC-$Revision: 1.300.2.29 $"
a42 2
# doesn't work with MP just yet..
#options 	PERFCTRS	# performance-monitoring counters support
a70 1
options 	SYSTRACE	# system call vetting via systrace(1)
a283 5
#

p64h2apic* at pci? dev? function?	# P64H2 IOxAPIC


d347 1
a347 1
#options 	PMS_DISABLE_POWERHOOK	# Disable PS/2 reset on resume
d487 20
a506 1
scsibus* at scsi?
d534 1
d571 2
a572 1
atapibus* at atapi?
a608 1
bge* 	at pci? dev ? function ?	# Broadcom 570x gigabit Ethernet
d777 2
d830 1
d906 26
a931 1
audio*	at audiobus?
d943 7
a949 1
midi*	at midibus?
d951 2
a1074 1
pseudo-device	clockctl		# user control of clock subsystem
@


1.300.2.31
log
@merged with -current as of today.
rearranged gdt init to deal with KVM86 changes; however, KVM86 has no
chance of working yet; good thing it's not part of GENERIC
@
text
@d1 1
a1 1
# $NetBSD$
d25 1
a25 1
#ident 		"GENERIC-$Revision$"
d67 1
a67 1
options 	INSECURE	# disable kernel security levels - X needs this
d82 1
a82 1
#options 	SHMMAXPGS=2048	# 2048 pages is the default
a205 6
# work around a hardware bug that loaded fonts don't work; found on ATI cards
#options 	VGA_CONSOLE_ATI_BROKEN_FONTSEL
# the following enables some functions to get mouse console support.
# if you want a really secure system, it may be better not to enable them,
# see wsmoused(8), section SECURITY CONSIDERATIONS for more info.
#options 	WSDISPLAY_CHARFUNCS		# mouse console support
a275 3
# System Controllers
elansc*	at pci? dev ? function ?	# AMD Elan SC520 System Controller

d361 1
a361 1
wskbd*		at pckbd? console ?
d645 1
a645 1
wi*	at pcmcia? function ?		# Lucent/Intersil WaveLan IEEE (802.11)
a732 3
# ISA USB controllers
#slhci0	at isa? port 0x300 irq 5	# ScanLogic SL811HS

a736 1
#usb*	at slhci?
d1035 1
@


1.299
log
@Remove ADW_*_DISABLE options. Now they are described in the adw.4 man page
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.298 2000/02/02 20:39:35 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.298 $"
d629 1
@


1.298
log
@Due to popular demand (hi Bernd), comment out the CardBus entries.
Appearently it doesn't work for some chipsets.  I think the right way
to fix this would be to only let cbb attach to the working chipsets...
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.297 2000/02/02 20:17:13 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.297 $"
a343 3
#options 	ADW_WDTR_DISABLE	# 	disable Wide Data Tranfer
#options 	ADW_SDTR_DISABLE	# 	disable Syncronous Data Transfer
#options 	ADW_TAGQ_DISABLE	# 	disable Tag Queuing
@


1.297
log
@Add CardBus support.  If it breaks anything, I'm sure we'll know soon. :)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.296 2000/02/02 19:48:18 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.296 $"
d251 2
a252 2
cbb*		at pci? dev ? function ?
cardslot*	at cbb?	
d254 2
a255 2
cardbus*	at cardslot?
pcmcia*		at cardslot?
d386 1
a386 1
ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480
d558 3
a560 3
ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
fxp*	at cardbus? dev ? function ?	# Intel i8255x
tlp*	at cardbus? dev ? function ?	# DECchip 21143
d583 1
a583 1
ohci*	at cardbus? dev ? function ?	# Open Host Controller
@


1.296
log
@Change the size of the PCMCIA controller memory window to 64K.  Several
of the radio LAN cards need it.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.295 2000/01/25 08:32:01 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.295 $"
d250 7
d385 3
d557 5
d581 3
@


1.295
log
@Update for the ucom(4) addition.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.294 2000/01/24 01:09:57 augustss Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.294 $"
d237 3
a239 3
pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
tcic0	at isa? port 0x240 iomem 0xd0000 iosiz 0x4000
@


1.294
log
@Add Raytheon Raylink driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.293 2000/01/23 23:46:12 hubertf Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.293 $"
d591 1
@


1.293
log
@Add commented out "ident"-command
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.292 2000/01/20 19:12:31 wrstuden Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
d509 1
@


1.292
log
@Add overlay to kernel configs.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.291 2000/01/17 17:47:06 augustss Exp $
d7 2
@


1.291
log
@Add USB-Ethernet adapters.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.290 2000/01/17 02:04:01 augustss Exp $
d102 1
@


1.290
log
@Enable kue driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.289 2000/01/16 13:59:38 augustss Exp $
d597 1
a597 1
#cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
@


1.289
log
@Add some USB Ethernet adapters.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.288 2000/01/09 17:31:56 joda Exp $
d598 1
a598 1
#kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters
@


1.288
log
@add (commented out) xe@@pcmcia entry
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.287 2000/01/04 06:58:54 chopps Exp $
d595 5
d630 1
d672 1
@


1.287
log
@add ntwoc* at pci, and a commented out ntwoc0 at isa.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.286 1999/12/31 00:14:56 simonb Exp $
d508 1
@


1.286
log
@Remove duplicate
	#com*  at boca? slave ?
line.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.285 1999/12/30 04:18:51 hubertf Exp $
d478 1
d529 1
@


1.285
log
@add disabled entry for options APM_DISABLE_INTERRUPTS=0
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.284 1999/12/26 17:07:23 itojun Exp $
a307 1
#com*	at boca? slave ?
@


1.284
log
@add lines for boca 16-port serial card (BB2016), commented out.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.283 1999/12/13 20:22:53 augustss Exp $
d202 1
@


1.283
log
@Add Cirrus Logic CS4280 driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.282 1999/12/12 11:53:41 soren Exp $
d307 3
@


1.282
log
@s/16x450/16x50/
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.281 1999/12/07 19:38:54 thorpej Exp $
d615 1
d651 1
@


1.281
log
@Add nsphyter.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.280 1999/11/29 12:56:25 itojun Exp $
d286 1
a286 1
com*	at puc? port ?			# 16x450s on "universal" comm boards
@


1.280
log
@add cnw* into pcmcia section.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.279 1999/11/21 14:00:40 itojun Exp $
d544 1
@


1.279
log
@bring in content of GENERIC.v6 into GENERIC.
remove GENERIC.v6 file (as it is part of GENERIC now).

"faith" interface is commented out by default as it is not really for
general use.
IPsec items are commented out as well, though we can enable "options IPSEC"
without export-related issue ("options IPSEC" will enable authentication
portion only).  We may need to think about it again.

if you have problem compiling with INET6 on archs I do not have access to,
please contact me.

XXX what to do with arch/arm32/SHARK{,.v6}?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.278 1999/11/15 20:10:49 augustss Exp $
d498 1
@


1.278
log
@Add dev and function locators for the USB host controllers at pci.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.277 1999/11/15 20:03:50 dante Exp $
d736 1
a736 1
pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
@


1.277
log
@Add WDTR, SDTR and TAGQ disable options
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.276 1999/11/15 19:10:47 fvdl Exp $
d552 2
a553 2
uhci*	at pci?				# Universal Host Controller (Intel)
ohci*	at pci?				# Open Host Controller
@


1.276
log
@Add commented out option SOFTDEP to all GENERIC kernels.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.275 1999/11/14 13:31:04 drochner Exp $
d331 3
@


1.275
log
@add commented out pnpbios entries
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.274 1999/11/13 17:57:28 perry Exp $
d111 1
@


1.274
log
@make the comment on how to use the cinclude stuff for crypto clearer.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.273 1999/11/13 17:54:17 perry Exp $
d158 1
d585 20
@


1.273
log
@Integrate the IPv6 bits from GENERIC.v6
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.272 1999/11/10 22:39:45 hubertf Exp $
d115 4
a118 3
# Pull in config fragments for kernel crypto -- this is required for
# options IPSEC etc. to work.  Use only one of these, based on whether
# you use crypto-us or crypto-intl, and adjust the prefixes as necessary.
@


1.272
log
@add (commented out) APM options
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.271 1999/11/06 16:23:49 mycroft Exp $
d115 12
d130 4
d709 2
@


1.271
log
@Enable DHCP by default, rather than BOOTP, as BOOTP is much more likely to
fail (due to option length issues), and DHCP is now prevalent.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.270 1999/11/05 21:36:21 thorpej Exp $
d177 6
@


1.271.2.1
log
@file GENERIC was added on branch comdex-fall-1999 on 1999-11-06 16:23:50 +0000
@
text
@d1 700
@


1.271.2.2
log
@Enable DHCP by default, rather than BOOTP, as BOOTP is much more likely to
fail (due to option length issues), and DHCP is now prevalent.
@
text
@a0 700
#	$NetBSD: GENERIC,v 1.271 1999/11/06 16:23:49 mycroft Exp $
#
#	GENERIC -- everything that's currently supported
#

include "arch/i386/conf/std.i386"

maxusers	32		# estimated number of users

# CPU support.  At least one is REQUIRED.
options 	I386_CPU
options 	I486_CPU
options 	I586_CPU
options 	I686_CPU

# CPU-related options.
options 	MATH_EMULATE	# floating point emulation
#options 	VM86		# virtual 8086 emulation
options 	USER_LDT	# user-settable LDT; used by WINE
# eliminate delay no-ops in I/O; recommended on all but very old machines
#options 	DUMMY_NOPS

# delay between "rebooting ..." message and hardware reset, in milliseconds
#options 	CPURESET_DELAY=2000

# Misc. i386-specific options
options 	XSERVER		# X server support in console drivers
#options 	XSERVER_DDB	# PF12 gets you into DDB when X is running

# This option allows you to force a serial console at the specified
# I/O address.   see console(4) for details.
#options 	"CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
#	you don't want the option below ON iff you are using the
#	serial console option of the new boot strap code.
#options	CONS_OVERRIDE	# Always use above! independent of boot info

# The following options override the memory sizes passed in from the boot
# block.  Use them *only* if the boot block is unable to determine the correct
# values.  Note that the BIOS may *correctly* report less than 640k of base
# memory if the extended BIOS data area is located at the top of base memory
# (as is the case on most recent systems).
#options 	REALBASEMEM=639		# size of base memory (in KB)
#options 	REALEXTMEM=15360	# size of extended memory (in KB)

# Standard system options

options 	UCONSOLE	# users can use TIOCCONS (for xconsole)
options 	INSECURE	# disable kernel security levels

options 	RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
options 	NTP		# NTP phase/frequency locked loop

options 	KTRACE		# system call tracing via ktrace(1)

options 	SYSVMSG		# System V-like message queues
options 	SYSVSEM		# System V-like semaphores
options 	SYSVSHM		# System V-like memory sharing
#options 	SHMMAXPGS=1024	# 1024 pages is the default

options 	LKM		# loadable kernel modules

# Diagnostic/debugging support options
options 	DIAGNOSTIC	# cheap kernel consistency checks
#options 	DEBUG		# expensive debugging checks/support
#options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
options 	DDB		# in-kernel debugger
#options 	DDB_HISTORY_SIZE=100	# enable history editing in DDB
#options 	KGDB		# remote debugger
#options 	"KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
#makeoptions	DEBUG="-g"	# compile full symbol table

# Compatibility options
options 	COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
options 	COMPAT_09	# NetBSD 0.9,
options 	COMPAT_10	# NetBSD 1.0,
options 	COMPAT_11	# NetBSD 1.1,
options 	COMPAT_12	# NetBSD 1.2,
options 	COMPAT_13	# NetBSD 1.3,
options 	COMPAT_14	# NetBSD 1.4,
options 	COMPAT_43	# and 4.3BSD
options 	COMPAT_386BSD_MBRPART # recognize old partition ID

options 	COMPAT_SVR4	# binary compatibility with SVR4
options 	COMPAT_IBCS2	# binary compatibility with SCO and ISC
options 	COMPAT_LINUX	# binary compatibility with Linux
options 	COMPAT_FREEBSD	# binary compatibility with FreeBSD

options 	COMPAT_AOUT	# binary compat for NetBSD a.out binaries

# File systems
file-system 	FFS		# UFS
file-system 	EXT2FS		# second extended file system (linux)
file-system 	LFS		# log-structured file system
file-system 	MFS		# memory file system
file-system 	NFS		# Network File System client
file-system 	NTFS		# Windows/NT file system (experimental)
file-system 	CD9660		# ISO 9660 + Rock Ridge file system
file-system 	MSDOSFS		# MS-DOS file system
file-system 	FDESC		# /dev/fd
file-system 	KERNFS		# /kern
file-system 	NULLFS		# loopback file system
file-system 	PORTAL		# portal filesystem (still experimental)
file-system 	PROCFS		# /proc
file-system 	UMAPFS		# NULLFS + uid and gid remapping
file-system 	UNION		# union file system
file-system	CODA		# Coda File System; also needs vcoda (below)

# File system options
options 	QUOTA		# UFS quotas
#options 	FFS_EI		# FFS Endian Independent support
options 	NFSSERVER	# Network File System server
#options 	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
				# immutable) behave as system flags.

# Networking options
#options 	GATEWAY		# packet forwarding
options 	INET		# IP + ICMP + TCP + UDP
#options 	MROUTING	# IP multicast routing
options 	NS		# XNS
#options 	NSIP		# XNS tunneling over IP
options 	ISO,TPIP	# OSI
options 	EON		# OSI tunneling over IP
options 	CCITT,LLC,HDLC	# X.25
options 	NETATALK	# AppleTalk networking protocols
options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP
options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
options 	PFIL_HOOKS	# pfil(9) packet filter hooks
options 	IPFILTER_LOG	# ipmon(8) log support

# Compatibility with 4.2BSD implementation of TCP/IP.  Not recommended.
#options 	TCP_COMPAT_42

# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
options 	EISAVERBOSE	# verbose EISA device autoconfig messages
options 	PCIVERBOSE	# verbose PCI device autoconfig messages
#options 	PCMCIAVERBOSE	# verbose PCMCIA configuration messages
options 	SCSIVERBOSE	# human readable SCSI error messages
options 	USBVERBOSE	# verbose USB device autoconfig messages

options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM

#
# wscons options
#
# builtin terminal emulations
#options 	WSEMUL_SUN		# sun terminal emulation
options 	WSEMUL_VT100		# VT100 / VT220 emulation
# different kernel output - see dev/wscons/wsdisplayvar.h
options 	WS_KERNEL_FG=WSCOL_GREEN
#options 	WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
options 	WSDISPLAY_COMPAT_PCVT		# emulate some ioctls
options 	WSDISPLAY_COMPAT_SYSCONS	# emulate some ioctls
options 	WSDISPLAY_COMPAT_USL		# VT handling
options 	WSDISPLAY_COMPAT_RAWKBD		# can get raw scancodes
# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
#options 	PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
#options 	WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
options 	PCDISPLAY_SOFTCURSOR

# Kernel root file system and dump configuration.
config		netbsd	root on ? type ?
#config		netbsd	root on sd0a type ffs
#config		netbsd	root on ? type nfs

#
# Device configuration
#

mainbus0 at root

#apm0	at mainbus0			# Advanced power management


# Basic Bus Support

# PCI bus support
pci*	at mainbus? bus ?
pci*	at pchb? bus ?
pci*	at ppb? bus ?

# PCI bridges
pchb*	at pci? dev ? function ?	# PCI-Host bridges
pceb*	at pci? dev ? function ?	# PCI-EISA bridges
pcib*	at pci? dev ? function ?	# PCI-ISA bridges
ppb*	at pci? dev ? function ?	# PCI-PCI bridges
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc*	at pci? dev ? function ?	# PCI "universal" comm. cards

# EISA bus support
eisa*	at mainbus?
eisa*	at pceb?

# ISA bus support
isa*	at mainbus?
isa*	at pceb?
isa*	at pcib?

# PCMCIA bus support
pcmcia*	at pcic? controller ? socket ?
pcmcia*	at tcic? controller ? socket ?

# ISA PCMCIA controllers
pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
tcic0	at isa? port 0x240 iomem 0xd0000 iosiz 0x4000

# PCI PCMCIA controllers
pcic0	at pci? dev? function ?

# ISA Plug-and-Play bus support
isapnp0	at isa?

# ISA Plug-and-Play PCMCIA controllers
pcic*	at isapnp?

# Coprocessor Support

# Math Coprocessor support
npx0	at isa? port 0xf0 irq 13	# x86 math coprocessor


# Console Devices

# ISA console.  You can only configure one of these!
#pc0	at isa? port 0x60 irq 1		# pccons generic PC console driver
#vt0	at isa? port 0x60 irq 1		# PCVT console driver

# Keyboard layout configuration for pccons
#options 	FRENCH_KBD
#options 	FINNISH_KBD
#options 	GERMAN_KBD
#options 	NORWEGIAN_KBD

# wscons
pckbc0		at isa?			# pc keyboard controller
pckbd*		at pckbc?		# PC keyboard
# "opms" should not be enabled together with "pms" or "pmsi"
pms*		at pckbc?		# PS/2 mouse for wsmouse
pmsi*		at pckbc?		# PS/2 "Intelli"mouse for wsmouse
#opms*		at pckbc?		# backwards compatible PS/2 mouse
vga0		at isa?
vga*		at pci?
pcdisplay0	at isa?			# CGA, MDA, EGA, HGA
wsdisplay*	at vga? console ?
wsdisplay*	at pcdisplay? console ?
wskbd* 		at pckbd? console ?
wsmouse*	at pms? mux 0
wsmouse*	at pmsi? mux 0

pcppi0	at isa?
sysbeep0	at pcppi?

# Serial Devices

# PCI serial interfaces
com*	at puc? port ?			# 16x450s on "universal" comm boards
cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards

# ISA Plug-and-Play serial interfaces
com*	at isapnp?			# Modems and serial boards

# PCMCIA serial interfaces
com*	at pcmcia? function ?		# Modems and serial cards

pcmcom*	at pcmcia? function ?		# PCMCIA multi-port serial cards
com*	at pcmcom? slave ?		# ...and the slave devices

# ISA serial interfaces
#options 	COM_HAYESP		# adds Hayes ESP serial board support
com0	at isa? port 0x3f8 irq 4	# Standard PC serial ports
com1	at isa? port 0x2f8 irq 3
com2	at isa? port 0x3e8 irq 5
#com3	at isa? port 0x2e8 irq 9
#ast0	at isa? port 0x1a0 irq 5	# AST 4-port serial cards
#com*	at ast? slave ?
#boca0	at isa? port 0x100 irq 5	# BOCA 8-port serial cards
#com*	at boca? slave ?
#tcom0	at isa? port 0x100 irq 7	# TC-800 8-port serial cards
#com*	at tcom? slave ?
#rtfps0	at isa? port 0x1230 irq 10	# RT 4-port serial cards
#com*	at rtfps? slave ?
#cy0	at isa? iomem 0xd4000 irq 12	# Cyclades serial cards


# Parallel Printer Interfaces

# PCI parallel printer interfaces
lpt*	at puc? port ?			# || ports on "universal" comm boards

# ISA parallel printer interfaces
lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
lpt1	at isa? port 0x278
lpt2	at isa? port 0x3bc


# SCSI Controllers and Devices

# PCI SCSI controllers
adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
adw*	at pci? dev ? function ?	# AdvanSys 9xxUW SCSI
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI
pcscp*	at pci? dev ? function ?	# AMD 53c974 PCscsi-PCI SCSI

# EISA SCSI controllers
ahb*	at eisa? slot ?			# Adaptec 174[02] SCSI
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
bha*	at eisa? slot ?			# BusLogic 7xx SCSI
dpt*	at eisa? slot ?			# DPT EATA SCSI
uha*	at eisa? slot ?			# UltraStor 24f SCSI

# PCMCIA SCSI controllers
aic*	at pcmcia? function ?		# Adaptec APA-1460 SCSI

# ISA Plug-and-Play SCSI controllers
aha*	at isapnp? 			# Adaptec AHA-154[02
aic*	at isapnp?			# Adaptec AHA-1520B

# ISA SCSI controllers
adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02]
aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI
aha1	at isa? port 0x334 irq ? drq ?
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
bha1	at isa? port 0x334 irq ? drq ?
# The "nca" probe might give false hits or hang your machine.
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 contoller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
sea0	at isa? iomem 0xc8000 irq 5	# Seagate/Future Domain SCSI
uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI
uha1	at isa? port 0x340 irq ? drq ?
wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
wds1	at isa? port 0x358 irq 11 drq 5

# SCSI bus support
scsibus* at adv?
scsibus* at adw?
scsibus* at aha?
scsibus* at ahb?
scsibus* at ahc?
scsibus* at aic?
scsibus* at bha?
scsibus* at dpt?
scsibus* at isp?
#scsibus* at nca?
scsibus* at ncr?
scsibus* at pcscp?
scsibus* at sea?
scsibus* at uha?
scsibus* at wds?

# SCSI devices
sd*	at scsibus? target ? lun ?	# SCSI disk drives
st*	at scsibus? target ? lun ?	# SCSI tape drives
cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
ch*	at scsibus? target ? lun ?	# SCSI autochangers
ss*	at scsibus? target ? lun ?	# SCSI scanners
uk*	at scsibus? target ? lun ?	# SCSI unknown


# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
# how to set up DMA modes for this chip. This may work, or may cause
# a machine hang with some controllers.
pciide* at pci ? dev ? function ? flags 0x0000

# ISA Plug-and-Play IDE controllers
wdc*	at isapnp? 

# PCMCIA IDE controllers
wdc*	at pcmcia? function ?

# ISA ST506, ESDI, and IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
# fall back to 16bits I/O if 32bits I/O are not functional).
# Some controllers pass the initial 32bit test, but will fail later.
wdc0	at isa? port 0x1f0 irq 14 flags 0x00
wdc1	at isa? port 0x170 irq 15 flags 0x00

# IDE drives
# Flags are used only with controllers that support DMA operations
# and mode settings (e.g. some pciide controllers)
# The lowest order four bits (rightmost digit) of the flags define the PIO
# mode to use, the next set of four bits the DMA mode and the third set the
# UltraDMA mode. For each set of four bits, the 3 lower bits define the mode
# to use, and the last bit must be 1 for this setting to be used.
# For DMA and UDMA, 0xf (1111) means 'disable'.
# 0x0fac means 'use PIO mode 4, DMA mode 2, disable UltraDMA'.
# (0xc=1100, 0xa=1010, 0xf=1111)
# 0x0000 means "use whatever the drive claims to support".
wd*	at wdc? channel ? drive ? flags 0x0000
wd*	at pciide? channel ? drive ? flags 0x0000

# ATAPI bus support
atapibus* at wdc? channel ?
atapibus* at pciide? channel ?

# ATAPI devices
# flags have the same meaning as for IDE drives.
cd*	at atapibus? drive ? flags 0x0000	# ATAPI CD-ROM drives
sd*	at atapibus? drive ? flags 0x0000	# ATAPI disk drives
uk*	at atapibus? drive ? flags 0x0000	# ATAPI unknown


# Miscellaneous mass storage devices

# ISA floppy
fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
#fdc1	at isa? port 0x370 irq ? drq ?
fd*	at fdc? drive ?			# the drives themselves
# some machines need you to do this instead of fd*
#fd0	at fdc0 drive 0

# ISA CD-ROM devices
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives

# ISA tape devices
# note: the wt driver conflicts unpleasantly with SMC boards at the
# same I/O address. The probe reprograms their EEPROMs. Don't
# uncomment it unless you are actually using it.
#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives


# Network Interfaces

# PCI network interfaces
de*	at pci? dev ? function ?	# DEC 21x4x-based Ethernet
en*	at pci? dev ? function ?	# ENI/Adaptec ATM
ep*	at pci? dev ? function ?	# 3Com 3c59x
ex*	at pci? dev ? function ?	# 3Com 90x[B]
epic*	at pci? dev ? function ?	# SMC EPIC/100 Ethernet
esh*	at pci? dev ? function ?	# Essential HIPPI card
fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
sip*	at pci? dev ? function ?	# SiS 900 Ethernet
tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
tlp*	at pci? dev ? function ?	# DECchip 21x4x (and clones) Ethernet
#options 	TLP_MATCH_21040
#options 	TLP_MATCH_21041
#options 	TLP_MATCH_21140
#options 	TLP_MATCH_21142
vr*	at pci? dev ? function ?	# VIA Rhine Fast Ethernet
lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
rl*	at pci? dev ? function ?	# Realtek 8129/8139

# EISA network interfaces
ep*	at eisa? slot ?			# 3Com 3c579 Ethernet
fea*	at eisa? slot ?			# DEC DEFEA FDDI
tlp*	at eisa? slot ?			# DEC DE-425 Ethernet

# ISA Plug-and-Play network interfaces
ep*	at isapnp?			# 3Com 3c509 Ethernet
ne*	at isapnp?			# NE2000-compatible Ethernet
tr*	at isapnp?			# IBM/3COM TROPIC Token-Ring

# PCMCIA network interfaces
awi*	at pcmcia? function ?		# BayStack 650 (802.11FH)
ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
mbe*	at pcmcia? function ?		# MB8696x based Ethernet
ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
sm*	at pcmcia? function ?		# Megahertz Ethernet
wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)

mhzc*	at pcmcia? function ?		# Megahertz Ethernet/Modem combo cards
com*	at mhzc?
sm*	at mhzc?

# ISA network interfaces
ate0	at isa? port 0x2a0 irq ?		# AT1700
cs0	at isa? port 0x300 iomem ? irq ? drq ?	# CS8900 Ethernet
ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3Com 3c503 Ethernet
eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
ep0	at isa? port ? irq ?			# 3C509 ethernet cards
ef0	at isa? port 0x360 iomem 0xd0000 irq 7	# 3C507
ai0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN
fmv0	at isa? port 0x2a0 irq ?		# FMV-180 series
ix0	at isa? port 0x300 irq 10		# EtherExpress/16
iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
#depca0	at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5	# DEPCA
#le*	at depca?
nele0	at isa? port 0x320 irq 9 drq 7		# NE2100
le*	at nele?
bicc0	at isa? port 0x320 irq 10 drq 7		# BICC IsoLan
le*	at bicc?
ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
ne1	at isa? port 0x300 irq 10
sm0	at isa? port 0x300 irq 10		# SMC91C9x Ethernet
tr0	at isa? port 0xa20 iomem 0xd8000 irq ?  # IBM TROPIC based Token-Ring
tr1	at isa? port 0xa24 iomem 0xd0000 irq ?  # IBM TROPIC based Token-Ring
tr*	at isa? port ? irq ?			# 3COM TROPIC based Token-Ring
we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC Ethernet
we1	at isa? port 0x300 iomem 0xcc000 irq 10

# MII/PHY support
exphy*	at mii? phy ?			# 3Com internal PHYs
icsphy*	at mii? phy ?			# Integrated Circuit Systems ICS1890
inphy*	at mii? phy ?			# Intel 82555 PHYs
iophy*	at mii? phy ?			# Intel 82553 PHYs
lxtphy*	at mii? phy ?			# Level One LXT-970 PHYs
nsphy*	at mii? phy ?			# NS83840 PHYs
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
sqphy*	at mii? phy ?			# Seeq 80220/80221/80223 PHYs
tlphy*	at mii? phy ?			# ThunderLAN PHYs
tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
ukphy*	at mii? phy ?			# generic unknown PHYs

# USB Controller and Devices

# PCI USB controllers
uhci*	at pci?				# Universal Host Controller (Intel)
ohci*	at pci?				# Open Host Controller

# USB bus support
usb*	at uhci?
usb*	at ohci?

# USB Hubs
uhub*	at usb?
uhub*	at uhub? port ? configuration ? interface ?

# USB Mice
ums*	at uhub? port ? configuration ? interface ?
wsmouse*	at ums? mux 0

# USB Keyboards
ukbd*	at uhub? port ? configuration ? interface ?
wskbd*	at ukbd? console ? mux 1

# USB Generic HID devices
uhid*	at uhub? port ? configuration ? interface ?

# USB Printer
ulpt*	at uhub? port ? configuration ? interface ?

# USB Modem
umodem*	at uhub? port ? configuration ?

# USB Mass Storage
umass*	at uhub? port ? configuration ? interface ?
scsibus* at umass? channel ?

# USB audio
uaudio*	at uhub? port ? configuration ?

# USB Generic driver
ugen*	at uhub? port ?

# Audio Devices

# PCI audio devices
eap*	at pci? dev ? function ?	# Ensoniq AudioPCI
eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
fms*	at pci? dev ? function ?	# Forte Media FM801
sv*	at pci? dev ? function ?	# S3 SonicVibes

# ISA Plug-and-Play audio devices
ess*	at isapnp?			# ESS Tech ES1887, ES1888, ES888 audio
guspnp*	at isapnp?			# Gravis Ultra Sound PnP audio
sb*	at isapnp?			# SoundBlaster-compatible audio
wss*	at isapnp?			# Windows Sound System
ym*	at isapnp?			# Yamaha OPL3-SA3 audio

# ISA audio devices
# the "aria" probe might give false hits
#aria0	at isa? port 0x290 irq 10 		# Aria
#ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
pss0	at isa? port 0x220 irq 7 drq 6  	# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
sb0	at isa? port 0x220 irq 5 drq 1 drq2 5	# SoundBlaster
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System

# OPL[23] FM synthesizers
#opl0	at isa? port 0x388	# use only if not attached to sound card
opl*	at eso?
opl*	at ess?
opl*	at fms?
opl*	at sb?
opl*	at sv?
opl*	at wss?
opl*	at ym?

# Audio support
#audio*	at aria?
audio*	at eap?
audio*	at eso?
audio*	at ess?
audio*	at fms?
audio*	at gus?
audio*	at guspnp?
audio*	at pas?
audio*	at sb?
audio*	at sp?
audio*	at sv?
audio*	at uaudio?
audio*	at wss?
audio*	at ym?

# MPU 401 UARTs
#mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible card
mpu*	at eso?
mpu*	at fms?
mpu*	at sb?
mpu*	at ym?

# MIDI support
midi*	at eap?			# 137[01] MIDI port
midi*	at mpu?			# MPU 401
midi*	at opl?			# OPL FM synth
midi*	at pcppi?		# MIDI interface to the PC speaker
midi*	at sb?			# SB1 MIDI port

# The spkr driver provides a simple tone interface to the built in speaker.
#spkr0	at pcppi?		# PC speaker


# Mice

# ISA busmice
lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
lms1	at isa? port 0x238 irq 5
mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
mms1	at isa? port 0x238 irq 5
wsmouse*	at lms? mux 0
wsmouse*	at mms? mux 0
# backwards compatible versions
#olms0	at isa? port 0x23c irq 5	# Logitech bus mouse
#olms1	at isa? port 0x238 irq 5
#omms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
#omms1	at isa? port 0x238 irq 5
#opms0	at pc? irq 12		# PS/2 auxiliary port mouse
#opms0	at vt? irq 12		# PS/2 auxiliary port mouse


# Joysticks

# ISA Plug-and-Play joysticks
joy*	at isapnp?			# Game ports (usually on audio cards)

# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0	at isa? port 0x201


# Miscellaneous Devices

# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1


# Pull in optional local configuration
include	"arch/i386/conf/GENERIC.local"


# Pseudo-Devices

# disk/mass storage pseudo-devices
pseudo-device	ccd		4	# concatenated/striped disk devices
#pseudo-device	raid		4	# RAIDframe disk driver
pseudo-device	md		1	# memory disk device (ramdisk)
pseudo-device	vnd		4	# disk-like interface to files

# network pseudo-devices
pseudo-device	bpfilter	8	# Berkeley packet filter
pseudo-device	ipfilter		# IP filter (firewall) and NAT
pseudo-device	loop			# network loopback
pseudo-device	ppp		2	# Point-to-Point Protocol
pseudo-device	sl		2	# Serial Line IP
pseudo-device	strip		2	# Starmode Radio IP (Metricom)
pseudo-device	tun		2	# network tunneling over tty
pseudo-device	gre		2	# generic L3 over IP tunnel
pseudo-device	ipip		2	# IP Encapsulation within IP (RFC 2003)

# miscellaneous pseudo-devices
pseudo-device	pty		64	# pseudo-terminals
pseudo-device	tb		1	# tablet line discipline
pseudo-device	sequencer	1	# MIDI sequencer
# rnd works; RND_COM does not on port i386 yet.
pseudo-device	rnd			# /dev/random and in-kernel generator
#options 	RND_COM			# use "com" randomness as well (BROKEN)

# a pseudo device needed for Coda	# also needs CODA (above)
pseudo-device	vcoda		4	# coda minicache <-> venus comm.

# mouse & keyboard multiplexor pseudo-devices
pseudo-device	wsmux		2
@


1.270
log
@Add tlp, document TLP_MATCH_* options, and add some missing PHYs.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.269 1999/11/04 19:43:13 sommerfeld Exp $
d142 1
a142 1
options 	NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
@


1.269
log
@Add awi
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.268 1999/11/01 23:27:56 augustss Exp $
d450 4
d461 1
d512 1
d518 1
@


1.268
log
@Enable fms device again.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.267 1999/11/01 21:44:35 augustss Exp $
d464 1
@


1.267
log
@Disable fms driver for the moment.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.266 1999/11/01 20:43:13 augustss Exp $
d559 1
a559 1
#fms*	at pci? dev ? function ?	# Forte Media FM801
d584 1
a584 1
#opl*	at fms?
d595 1
a595 1
#audio*	at fms?
d609 1
a609 1
#mpu*	at fms?
@


1.266
log
@Add FM801 audio device driver.  From Witold J. Wnuk ww181302@@zodiac.mimuw.edu.pl
Closes PR kern/8729.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.265 1999/10/25 16:47:03 itojun Exp $
d559 1
a559 1
fms*	at pci? dev ? function ?	# Forte Media FM801
d584 1
a584 1
opl*	at fms?
d595 1
a595 1
audio*	at fms?
d609 1
a609 1
mpu*	at fms?
@


1.265
log
@use "options \t" instead of "options\t\t" to avoid change in column
when you comment an option out.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.264 1999/10/08 13:53:00 drochner Exp $
d559 1
d584 1
d595 1
d609 1
d614 1
@


1.264
log
@forgot to comment out the orphaned "scsibus"
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.263 1999/10/06 23:01:45 ad Exp $
d163 1
a163 1
options		PCDISPLAY_SOFTCURSOR
@


1.264.4.1
log
@Sync with -current
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.275 1999/11/14 13:31:04 drochner Exp $
a114 13
# Pull in config fragments for kernel crypto.  This is required for
# options IPSEC etc. to work. If you want to run with IPSEC, uncomment
# one of these, based on whether you use crypto-us or crypto-intl, and
# adjust the prefixes as necessary.

#prefix ../crypto-us/sys
#cinclude "conf/files.crypto-us"
#prefix

#prefix ../crypto-intl/sys
#cinclude "conf/files.crypto-intl"
#prefix

a117 4
options 	INET6		# IPV6
#options 	IPSEC		# IP security
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
#options 	IPSEC_DEBUG	# debug for IP security
a140 1
#options 	PNPBIOSVERBOSE	# verbose PnP BIOS messages
d142 1
a142 1
options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
d163 1
a163 1
options 	PCDISPLAY_SOFTCURSOR
a177 6
# Tuning for power management, see apm(4) for more details.
#options 	APM_NO_IDLE		# Don't call BIOS CPU idle function
#options 	APM_V10_ONLY		# Use only the APM 1.0 calls
#options 	APM_NO_POWEROFF		# Don't power off on halt(8)
#options 	APM_NO_POWER_PRINT	# Don't print stats on the console

a449 4
#options 	TLP_MATCH_21040
#options 	TLP_MATCH_21041
#options 	TLP_MATCH_21140
#options 	TLP_MATCH_21142
a456 1
tlp*	at eisa? slot ?			# DEC DE-425 Ethernet
a463 1
awi*	at pcmcia? function ?		# BayStack 650 (802.11FH)
a505 1
iophy*	at mii? phy ?			# Intel 82553 PHYs
a510 1
tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
a553 20

# Plug-and-Play BIOS and attached devices

#pnpbios0 at mainbus0

# mainboard audio chips
#sb*	at pnpbios0 index ?	# NeoMagic 256AV in sb mode
#wss*	at pnpbios0 index ?	# NeoMagic 256AV in wss mode
#ym*	at pnpbios0 index ?	# OPL3-SA3

# com port
#com*	at pnpbios0 index ?

# parallel port
#lpt*	at pnpbios0 index ?

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide* at pnpbios0 index ?


a558 1
fms*	at pci? dev ? function ?	# Forte Media FM801
a582 1
opl*	at fms?
a592 1
audio*	at fms?
a605 1
mpu*	at fms?
a609 1
midi*	at eap?			# 137[01] MIDI port
a673 2
pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
@


1.264.2.1
log
@Add the SCSI ethernet device.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.264 1999/10/08 13:53:00 drochner Exp $
a365 1
se*	at scsibus? target ? lun ?	# SCSI Ethernet
@


1.264.2.2
log
@Update thorpej_scsipi to -current as of a month ago
A i386 GENERIC kernel compiles without the siop, ahc and bha drivers
(will be updated later). i386 IDE/ATAPI and ncr work, as well as
sparc/esp_sbus. alpha should work as well (untested yet).
siop, ahc and bha will be updated once I've updated the branch to current
-current, as well as machine-dependant code.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.374 2000/10/19 14:32:20 ad Exp $
a7 2
#ident 		"GENERIC-$Revision: 1.374 $"

d18 1
a18 1
options 	VM86		# virtual 8086 emulation
d26 4
d35 1
a35 1
#options 	CONS_OVERRIDE	# Always use above! independent of boot info
d67 1
a67 1
options 	DDB_HISTORY_SIZE=512	# enable history editing in DDB
d87 2
a88 1
#options 	COMPAT_PECOFF	# kernel support to run Win32 apps
a101 1
file-system 	OVERLAY		# overlay file system
a110 1
options 	SOFTDEP         # FFS soft updates support.
a117 4
options 	INET6		# IPV6
#options 	IPSEC		# IP security
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
#options 	IPSEC_DEBUG	# debug for IP security
d122 1
a122 1
#options 	EON		# OSI tunneling over IP
a136 1
options 	MIIVERBOSE	# verbose PHY autoconfig messages
a137 1
#options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
a140 2
#options 	PNPBIOSVERBOSE	# verbose PnP BIOS messages
#options	PNPBIOSDEBUG	# more fulsome Pnp BIOS debugging messages
d142 1
a142 1
options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
d163 1
a163 3
options 	PCDISPLAY_SOFTCURSOR
# modify the screen type of the console; defaults to "80x25"
#options 	VGA_CONSOLE_SCREENTYPE="\"80x24\""
a177 7
# Tuning for power management, see apm(4) for more details.
#options 	APM_NO_IDLE		# Don't call BIOS CPU idle function
#options 	APM_V10_ONLY		# Use only the APM 1.0 calls
#options 	APM_NO_POWEROFF		# Don't power off on halt(8)
#options 	APM_POWER_PRINT		# Print stats on the console
#options 	APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts

a180 28
# Plug-and-Play BIOS and attached devices

#pnpbios*	at mainbus?

# mainboard audio chips
#ess*		at pnpbios? index ?	# ESS AudioDrive
#sb*		at pnpbios? index ?	# NeoMagic 256AV in sb mode
#wss*		at pnpbios? index ?	# NeoMagic 256AV in wss mode
#ym*		at pnpbios? index ?	# OPL3-SA3

# com port
# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
# will be no com0.  A side effect is pcmcia (and other) com? previously
# starting at com3 may attach as com1 or com2.
#com*		at pnpbios? index ?	# serial ports

# parallel port
# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
# "printer interfaces".
#lpt*		at pnpbios? index ?	# parallel ports

#pckbc*		at pnpbios? index ?	# PC keyboard/mouse controller
#fdc*		at pnpbios? index ?	# floppy controller

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide*	at pnpbios? index ?

a185 10
# Configure PCI using BIOS information
#options 	PCIBIOS			# PCI BIOS support
#options 	PCIBIOSVERBOSE		# PCI BIOS verbose info
#options 	PCIBIOS_ADDR_FIXUP	# fixup PCI I/O addresses
#options 	PCIBIOS_BUS_FIXUP	# fixup PCI bus numbering
#options 	PCIBIOS_INTR_FIXUP	# fixup PCI interrupt routing
#options 	PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
#options 	PCIBIOS_INTR_GUESS	# see pcibios(4)
#options 	PCIINTR_DEBUG		# super-verbose PCI interrupt fixup

d208 3
a210 3
pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
pcic1	at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
tcic0	at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
a220 8
# CardBus bridge support
#cbb*		at pci? dev ? function ?
#cardslot*	at cbb?	

# CardBus bus support
#cardbus*	at cardslot?
#pcmcia* 	at cardslot?

d229 1
a229 1
# ISA console
d231 2
a237 4
# pccons-specific options:
#options 	XSERVER_DDB	# PF12 gets you into DDB when X is running
#options 	XSERVER		# X server support

d247 1
a247 1
vga*		at pci? dev ? function ?
d255 1
a255 1
pcppi0		at isa?
d261 1
a261 1
com*	at puc? port ?			# 16x50s on "universal" comm boards
a262 1
cz*	at pci? dev ? function ?	# Cyclades-Z multi-port serial boards
a272 3
# CardBus serial interfaces
#com*	at cardbus? dev ? function ?	# Modems and serial cards

a281 2
#boca0	at isa? port 0x100 irq 5	# BOCA 16-port serial cards (BB2016)
#boca1	at isa? port 0x140 irq 5	# this line is also needed for BB2016
a287 2
#addcom0 at isa? port 0x108 irq 5	# Addonics FlexPort 8S
#com*	at addcom? slave ?
a299 9
# Hardware monitors 

# LM7[89] and compatible hardware monitors
lm0	at isa?	port 0x290		# other common ports: 0x280, 0x310

# VIA VT82C686A hardware monitor
#viapm*	at pci? dev ? function ?
#viaenv* at viapm?

d305 3
a307 3
adw*	at pci? dev ? function ?	# AdvanSys 9x0UW[D], 3940U[2,3]W SCSI
#ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
#bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
d309 2
a310 3
#isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI (old driver)
#siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
d315 2
a316 2
#ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
#bha*	at eisa? slot ?			# BusLogic 7xx SCSI
a321 1
esp*	at pcmcia? function ?		# Qlogic ESP406/FAS408 SCSI
d328 1
a328 1
adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02] SCSI
d331 1
a331 1
#ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
d333 5
a337 6
#bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
#bha1	at isa? port 0x334 irq ? drq ?
# The "nca" and "dpt" probes might give false hits or hang your machine.
#dpt0	at isa? port 0x170 irq ? drq ?	# DPT SmartCache/SmartRAID
nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
a343 3
# CardBus SCSI cards
#ahc*	at cardbus? dev ? function ?	# Adaptec ADP-1480

d349 1
a349 1
#scsibus* at ahc?
d351 1
a351 1
#scsibus* at bha?
d353 2
a354 3
scsibus* at esp?
#scsibus* at isp?
scsibus* at nca?
a357 1
#scsibus* at siop?
d366 1
a366 1
ses*	at scsibus? target ? lun ?	# SCSI Enclosure Services devices
a370 8
# RAID controllers and devices
cac*	at eisa?			# Compaq EISA array controllers
cac*	at pci? dev ? function ?	# Compaq PCI array controllers
twe*	at pci? dev ? function ?	# 3ware Escalade RAID controllers
lsu*	at cac? unit ?			# Compaq array disk devices
lsu*	at twe? unit ?			# 3ware array disk devices


d376 1
a376 1
pciide* at pci? dev ? function ? flags 0x0000
a446 1
lmc*	at pci? dev ? function ?	# Lan Media Corp SSI/HSSI/DS3
a447 2
ntwoc*	at pci? dev ? function ?	# Riscom/N2 PCI Sync Serial
rtk*	at pci? dev ? function ?	# Realtek 8129/8139
a448 1
ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
a450 4
#options 	TLP_MATCH_21040
#options 	TLP_MATCH_21041
#options 	TLP_MATCH_21140
#options 	TLP_MATCH_21142
d453 1
a453 2
rtk*	at pci? dev ? function ?	# Realtek 8129/8139
ti*	at pci? dev ? function ?	# netgear gigabit
a457 1
tlp*	at eisa? slot ?			# DEC DE-425 Ethernet
a464 2
awi*	at pcmcia? function ?		# BayStack 650/660 (802.11FH/DS)
cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer
a467 1
ray*	at pcmcia? function ?		# Raytheon Raylink (802.11)
a469 1
xi*	at pcmcia? function ?		# Xircom CreditCard Ethernet
d481 1
a481 1
ep*	at isa? port ? irq ?			# 3C509 ethernet cards
a491 1
#ntwoc0	at isa? port 0x300 irq 5 iomem 0xc8000 flags 1	# Riscom/N2 sync serial
a502 6
# CardBus network cards
#ex*	at cardbus? dev ? function ?	# 3Com 3C575TX
#fxp*	at cardbus? dev ? function ?	# Intel i8255x
#rtk*	at cardbus? dev ? function ?	# Realtek 8129/8139
#tlp*	at cardbus? dev ? function ?	# DECchip 21143

a503 1
dmphy*	at mii? phy ?			# Davicom DM9101 PHYs
a506 1
iophy*	at mii? phy ?			# Intel 82553 PHYs
a508 1
nsphyter* at mii? phy ?			# NS83843 PHYs
a511 1
tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
a513 1

d517 2
a518 5
ohci*	at pci?	dev ? function ?	# Open Host Controller
uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)

# CardBus USB controllers
#ohci*	at cardbus? dev ? function ?	# Open Host Controller
d521 1
a522 1
usb*	at uhci?
a543 1
ucom*	at umodem?
a546 1
atapibus* at umass? channel ?
a551 20
# USB Ethernet adapters
aue*	at uhub? port ?		# ADMtek AN986 Pegasus based adapters
cue*	at uhub? port ?		# CATC USB-EL1201A based adapters
kue*	at uhub? port ?		# Kawasaki LSI KL5KUSB101B based adapters

# Prolofic PL2301/PL2302 host-to-host adapter
upl*	at uhub? port ?

# Serial adapters
# FTDI FT8U100AX serial adapter
#uftdi*	at uhub? port ?
#ucom*	at uftdi? portno ?

# Diamond Multimedia Rio 500
urio*	at uhub? port ?

# USB Handspring Visor
uvisor*	at uhub? port ?
ucom*	at uvisor?

a554 1

a557 3
auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
clcs*	at pci? dev ? function ?	# Cirrus Logic CS4280
cmpci*	at pci? dev ? function ?	# C-Media CMI8338/8738
a559 1
fms*	at pci? dev ? function ?	# Forte Media FM801
a579 2
#cms0	at isa? port 0x220			# Creative Music System

a583 1
opl*	at fms?
a590 3
audio*	at auvia?
audio*	at clcs?
audio*	at cmpci?
a593 1
audio*	at fms?
a606 1
mpu*	at fms?
a610 3
midi*	at clcs?		# Cirrus Logic CS4280 MIDI port
#midi*	at cms?			# Creative Music System
midi*	at eap?			# 137[01] MIDI port
a619 6
# TV cards

# Brooktree 848/849/878/879 based TV cards
bktr* at pci? dev ? function ?


d635 1
a642 3
# PCI joysticks
joy*	at pci?				# Game ports (usually on audio cards)

a661 1
#options 	RAID_AUTOCONFIG		# auto-configuration of RAID components
a674 3
pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
#pseudo-device	stf		1	# 6to4 IPv6 over IPv4 encapsulation
d677 1
a677 1
pseudo-device	pty			# pseudo-terminals
@


1.264.2.3
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
a147 1
options 	I2OVERBOSE	# verbose I2O driver messages
a359 2
#moxa0	at isa?	port 0x100 irq 5	# MOXA C168H serial card (experimental)
#com*	at moxa? slave ?
a381 6
# I2O devices
iop*	at pci? dev ? function ?	# I/O processor
iopsp*	at iop? tid ?			# SCSI/FC-AL ports
lsu*	at iop? tid ?			# block devices


a441 1
#scsibus* at iopsp?
a698 3

# USB scanners
uscanner* at uhub? port ?
@


1.264.2.4
log
@Sync with HEAD.
@
text
@d388 1
a388 1
ld*	at iop? tid ?			# block devices
d474 2
a475 2
ld*	at cac? unit ?			# Compaq array disk devices
ld*	at twe? unit ?			# 3ware array disk devices
a720 1
auich*	at pci? dev ? function ?	# Intel ICH integrated AC'97 Audio
a725 1
neo*	at pci? dev ? function ?	# NeoMagic 256 AC'97 Audio
a760 1
audio*	at auich?
a768 1
audio*	at neo?
@


1.264.2.5
log
@Sync with HEAD (for UBC fixes).
@
text
@a581 1
an*	at pcmcia? function ?		# Aironet PC4500/PC4800 (802.11)
@


1.264.2.6
log
@Sync with HEAD
@
text
@a544 1
an*	at pci? dev ? function ?	# Aironet PC4500/PC4800 (802.11)
a576 1
an*	at isapnp?			# Aironet 802.11
a868 1
pseudo-device	vlan			# IEEE 802.1q encapsulation
@


1.264.2.7
log
@Sync with head (for UBC+NFS fixes, mostly).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.264.2.6 2001/01/05 17:34:28 bouyer Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.264.2.6 $"
d396 1
a396 1
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
d400 2
a401 2
#ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI (old driver)
siop*	at pci? dev ? function ?	# Symbios 53c8xx SCSI
d406 1
a406 1
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
d423 1
a423 1
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
d445 1
a445 1
scsibus* at ahc?
d453 1
a453 1
#scsibus* at ncr?
d456 1
a456 1
scsibus* at siop?
a715 7
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
scsibus* at usscanner? channel ?

# Y@@P firmware loader
uyap* at uhub? port ?

d723 1
a724 1
auvia*	at pci? dev ? function ?	# VIA VT82C686A integrated AC'97 Audio
a727 1
esm*	at pci? dev ? function ?	# ESS Maestro-1/2/2e PCI Audio Accelerator
d765 1
a766 1
audio*	at auvia?
a769 1
audio*	at esm?
@


1.264.2.8
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.264.2.7 2001/01/18 09:22:33 bouyer Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.264.2.7 $"
a77 1
options 	COMPAT_15	# NetBSD 1.5,
a472 1
mlx*	at pci? dev ? function ?	# Mylex DAC960 & DEC SWXCR family
d474 2
a476 3
ld*	at cac? unit ?			# logical disk devices
ld*	at twe? unit ?
ld*	at mlx? unit ?
a692 3
# USB MIDI
umidi* at uhub? port ? configuration ?

d703 2
a704 5
uftdi*	at uhub? port ?
ucom*	at uftdi? portno ?

uplcom*	at uhub? port ?		# I/O DATA USB-RSAQ2 serial adapter
ucom*	at uplcom? portno ? 
a732 1
clct*	at pci? dev ? function ?	# Cirrus Logic CS4281
a775 1
audio*	at clct?
a801 1
#midi*	at clct?		# Cirrus Logic CS4281 MIDI port
a807 1
midi*   at umidi?               # USB MIDI
a836 2

#joy*		at pnpbios? index ?	# Game port
@


1.264.2.9
log
@Comment out drivers that don't compile yet.
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
d397 1
a397 1
#ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
d407 1
a407 1
#ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
d424 1
a424 1
#ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
d446 1
a446 1
#scsibus* at ahc?
@


1.264.2.10
log
@isp & bha compiles now. Only ahc left.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.264.2.9 2001/03/23 11:32:51 bouyer Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.264.2.9 $"
d398 1
a398 1
bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
d400 1
a400 1
isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
d408 1
a408 1
bha*	at eisa? slot ?			# BusLogic 7xx SCSI
d426 2
a427 2
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
bha1	at isa? port 0x334 irq ? drq ?
d448 1
a448 1
scsibus* at bha?
d451 2
a452 2
scsibus* at isp?
scsibus* at iopsp?
@


1.264.2.11
log
@ahc compiles now, and it works on sparc64 so I can't see why it wouldn't
work on something else :)
@
text
@d1 1
a1 1
#	$NetBSD$
d8 1
a8 1
#ident 		"GENERIC-$Revision$"
d397 1
a397 1
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
d407 1
a407 1
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
d424 1
a424 1
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
d446 1
a446 1
scsibus* at ahc?
@


1.264.2.12
log
@Sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.264.2.11 2001/04/02 16:28:22 bouyer Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.264.2.11 $"
a714 3
umct*	at uhub? port ?		# MCT USB-RS232 serial adapter
ucom*	at umct? portno ?

a749 1
yds*	at pci? dev ? function ?	# Yamaha DS-1 PCI Audio
a778 1
opl*	at yds?
a801 1
audio*	at yds?
a808 1
mpu*	at yds?
@


1.264.2.13
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.264.2.12 2001/04/21 17:53:49 bouyer Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.264.2.12 $"
d61 1
a61 1
#options 	DIAGNOSTIC	# expensive kernel consistency checks
@


1.264.2.14
log
@Kill unwanted differences with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.403 2001/04/21 20:49:14 fvdl Exp $
d8 1
a8 1
#ident 		"GENERIC-$Revision: 1.403 $"
d379 1
a379 1
#lm0	at isa?	port 0x290		# other common ports: 0x280, 0x310
d430 2
a431 2
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
d451 1
d453 1
a453 2
scsibus* at isp?
#scsibus* at nca?
d571 3
@


1.263
log
@Enable large cursor by default (at least on i386 for the moment), in
response to result of poll on tech-kern.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.262 1999/10/06 12:21:43 drochner Exp $
d354 1
a354 1
scsibus* at nca?
@


1.262
log
@comment out "ncr* at isa?" (NCR 53C80 - cheap SCSI) in the standard
config files. The probe funktion gives false hits and steps onto
other hardware. (PR port-i386/8361 by cgd and my own experience)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.261 1999/10/06 08:13:17 itohy Exp $
d163 1
a163 1
#options	PCDISPLAY_SOFTCURSOR
d317 1
@


1.261
log
@Add "opl at ym" and "mpu at ym".
Fix typos.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.260 1999/09/28 18:07:29 thorpej Exp $
d334 3
a336 2
nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 controller
nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
@


1.260
log
@Add Megahertz Ethernet/Modem combo card goo.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.259 1999/09/27 23:59:50 ad Exp $
d110 1
a110 1
#options 	FFS_EI		# FFS Endian Independant support
d334 1
a334 1
nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 contoller
d383 1
a383 1
# fall back to 16bits I/O if 32bits I/O are not functionnal).
d577 1
a577 1
# OPL[23] FM syntheziers
d584 1
d605 1
@


1.260.2.1
log
@Initial commit of recent changes to make DEV_BSIZE go away.

Runs on i386, needs work on other arch's. Main kernel routines should be
fine, but a number of the stand programs need help.

cd, fd, ccd, wd, and sd have been updated. sd has been tested with non-512
byte block devices. vnd, raidframe, and lfs need work.

Non 2**n block support is automatic for LKM's and conditional for kernels
on "options NON_PO2_BLOCKS".
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.260 1999/09/28 18:07:29 thorpej Exp $
a60 2

#options	NON_PO2_BLOCKS	# non-2**n block size support
@


1.260.2.2
log
@Pull up to last week's -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.283 1999/12/13 20:22:53 augustss Exp $
d112 1
a112 2
#options 	FFS_EI		# FFS Endian Independent support
#options 	SOFTDEP         # FFS soft updates support.
a116 13
# Pull in config fragments for kernel crypto.  This is required for
# options IPSEC etc. to work. If you want to run with IPSEC, uncomment
# one of these, based on whether you use crypto-us or crypto-intl, and
# adjust the prefixes as necessary.

#prefix ../crypto-us/sys
#cinclude "conf/files.crypto-us"
#prefix

#prefix ../crypto-intl/sys
#cinclude "conf/files.crypto-intl"
#prefix

a119 4
options 	INET6		# IPV6
#options 	IPSEC		# IP security
#options 	IPSEC_ESP	# IP security (encryption part; define w/IPSEC)
#options 	IPSEC_DEBUG	# debug for IP security
a142 1
#options 	PNPBIOSVERBOSE	# verbose PnP BIOS messages
d144 1
a144 1
options 	NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
d165 1
a165 1
options 	PCDISPLAY_SOFTCURSOR
a179 6
# Tuning for power management, see apm(4) for more details.
#options 	APM_NO_IDLE		# Don't call BIOS CPU idle function
#options 	APM_V10_ONLY		# Use only the APM 1.0 calls
#options 	APM_NO_POWEROFF		# Don't power off on halt(8)
#options 	APM_NO_POWER_PRINT	# Don't print stats on the console

d263 1
a263 1
com*	at puc? port ?			# 16x50s on "universal" comm boards
a307 3
#options 	ADW_WDTR_DISABLE	# 	disable Wide Data Tranfer
#options 	ADW_SDTR_DISABLE	# 	disable Syncronous Data Transfer
#options 	ADW_TAGQ_DISABLE	# 	disable Tag Queuing
a318 1
dpt*	at eisa? slot ?			# DPT EATA SCSI
d336 2
a337 3
# The "nca" probe might give false hits or hang your machine.
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 contoller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
d354 1
a354 1
#scsibus* at nca?
d385 1
a385 1
# fall back to 16bits I/O if 32bits I/O are not functional).
a449 4
#options 	TLP_MATCH_21040
#options 	TLP_MATCH_21041
#options 	TLP_MATCH_21140
#options 	TLP_MATCH_21142
a456 1
tlp*	at eisa? slot ?			# DEC DE-425 Ethernet
a463 2
awi*	at pcmcia? function ?		# BayStack 650 (802.11FH)
cnw*	at pcmcia? function ?		# Xircom/Netwave AirSurfer
a505 1
iophy*	at mii? phy ?			# Intel 82553 PHYs
a507 1
nsphyter* at mii? phy ?			# NS83843 PHYs
a510 1
tqphy*	at mii? phy ?			# TDK Semiconductor PHYs
d516 2
a517 2
uhci*	at pci?	dev ? function ?	# Universal Host Controller (Intel)
ohci*	at pci?	dev ? function ?	# Open Host Controller
a553 20

# Plug-and-Play BIOS and attached devices

#pnpbios0 at mainbus0

# mainboard audio chips
#sb*	at pnpbios0 index ?	# NeoMagic 256AV in sb mode
#wss*	at pnpbios0 index ?	# NeoMagic 256AV in wss mode
#ym*	at pnpbios0 index ?	# OPL3-SA3

# com port
#com*	at pnpbios0 index ?

# parallel port
#lpt*	at pnpbios0 index ?

# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
#pciide* at pnpbios0 index ?


a556 1
clcs*	at pci? dev ? function ?	# Cirrus Logic CS4280
a558 1
fms*	at pci? dev ? function ?	# Forte Media FM801
d579 1
a579 1
# OPL[23] FM synthesizers
a582 1
opl*	at fms?
a585 1
opl*	at ym?
a588 1
audio*	at clcs?
a591 1
audio*	at fms?
a604 1
mpu*	at fms?
a605 1
mpu*	at ym?
a607 1
midi*	at eap?			# 137[01] MIDI port
a671 2
pseudo-device	gif		4	# IPv[46] over IPv[46] tunnel (RFC1933)
#pseudo-device	faith		1	# IPv[46] tcp relay translation i/f
@


1.259
log
@Note DPT controllers as needed. If it looks like a stripped down GENERIC,
it gets it.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.258 1999/09/19 21:50:06 ad Exp $
d447 1
d467 4
@


1.258
log
@Document PCDISPLAY_SOFTCURSOR.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.257 1999/09/09 12:33:45 augustss Exp $
d308 1
d350 1
@


1.257
log
@Add uaudio driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.256 1999/08/29 16:59:19 thorpej Exp $
d162 2
@


1.256
log
@Add `umass'.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.255 1999/08/17 17:48:38 drochner Exp $
d537 3
d587 1
@


1.255
log
@add rl* at pci? (Realtek Ethernet)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.254 1999/08/16 22:27:14 augustss Exp $
d532 4
@


1.254
log
@Add umodem device.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.252 1999/08/09 18:13:26 bouyer Exp $
d445 1
@


1.253
log
@Add opl* at wss?
@
text
@d529 3
@


1.252
log
@Add wi at pcmcia.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.251 1999/08/05 15:52:11 jdolecek Exp $
d242 1
a242 1
pmsi*		at pckbc?	# PS/2 "Intelli"mouse for wsmouse
d563 1
@


1.251
log
@mark file system NTFS as experimental
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.250 1999/08/03 03:23:29 thorpej Exp $
d460 1
@


1.250
log
@Add the "sip" driver (SiS 900 Ethernet).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.249 1999/08/02 17:44:59 augustss Exp $
d96 1
a96 1
file-system 	NTFS		# Windows/NT file system
@


1.249
log
@Alphabetize.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.248 1999/08/02 17:37:41 augustss Exp $
d441 1
@


1.248
log
@Move the mpu device declaration to conf/files.
Let the mpu device attach at the sb device, and then midi at the mpu.
Update the mpu at eso attachment.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.247 1999/08/01 18:16:35 augustss Exp $
d576 3
a578 2
# MPU 401 cards
#mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible
a579 1
mpu*	at eso?
@


1.247
log
@Add the MPU 401 ISA attachment.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.246 1999/07/29 19:36:59 augustss Exp $
d577 3
a579 1
#mpu*    at isa? port 0x330 irq 9        # MPU401 or compatible
d582 2
d585 1
a585 3
midi*	at sb?			# SB MPU401 port
#midi*	at mpu?			# MPU 401
midi*	at opl?			# OPL FM synth
@


1.246
log
@Make two wsmux pseudo devices and add mux locators.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.245 1999/07/29 10:37:17 augustss Exp $
d576 3
d582 1
@


1.245
log
@It's time to be COMPAT_14.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.244 1999/07/22 09:35:06 augustss Exp $
d250 2
a251 2
wsmouse*	at pms?
wsmouse*	at pmsi?
d515 1
a515 1
wsmouse*	at ums?
d519 1
a519 1
wskbd*	at ukbd? console ?
d592 2
a593 2
wsmouse*	at lms?
wsmouse*	at mms?
d651 3
@


1.244
log
@The configuration and interface locators are pointless for the generic
USB device.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.243 1999/07/21 20:28:45 tron Exp $
d79 1
@


1.243
log
@Use wsmouse protocol for PS/2, Logitech bus and Microsoft InPort mice
by default. The X11 distribution included in our last release already
supports it and the wsmouse protocol can be used for any of the above
and for USB mice.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.242 1999/07/20 07:40:35 christos Exp $
d527 1
a527 1
ugen*	at uhub? port ? configuration ? interface ?
@


1.242
log
@enable PPP_BSDCOMP, PPP_DEFLATE, PPP_FILTER, PFIL_HOOKS, IPFILTER_LOG
on the GENERIC kernels that had them commented out.
XXX: Please note, that not all the kernels have all the options defined!
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.241 1999/07/12 15:16:23 kleink Exp $
d240 3
a242 3
#pms*		at pckbc?		# PS/2 mouse for wsmouse
#pmsi*		at pckbc?	# PS/2 "Intelli"mouse for wsmouse
opms*		at pckbc?		# backwards compatible PS/2 mouse
d249 2
a250 2
#wsmouse*	at pms?
#wsmouse*	at pmsi?
d587 6
a592 6
#lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
#lms1	at isa? port 0x238 irq 5
#mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
#mms1	at isa? port 0x238 irq 5
#wsmouse*	at lms?
#wsmouse*	at mms?
d594 4
a597 4
olms0	at isa? port 0x23c irq 5	# Logitech bus mouse
olms1	at isa? port 0x238 irq 5
omms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
omms1	at isa? port 0x238 irq 5
@


1.241
log
@Add eso(4) and the devices attached to it.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.240 1999/07/05 22:40:34 fvdl Exp $
d124 5
a128 5
#options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
#options 	PPP_DEFLATE	# Deflate compression support for PPP
#options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
#options 	PFIL_HOOKS	# pfil(9) packet filter hooks
#options 	IPFILTER_LOG	# ipmon(8) log support
@


1.240
log
@Add COMPAT_AOUT to GENERIC
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.239 1999/07/05 09:14:09 fvdl Exp $
d533 1
d556 1
d564 1
@


1.239
log
@EXEC_ELF32 is standard now.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.238 1999/07/03 12:09:52 tron Exp $
d86 2
@


1.238
log
@Optical cleanup in WSCONS configuration section.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.237 1999/06/18 20:27:59 augustss Exp $
a85 3

# Executable format options
options 	EXEC_ELF32	# 32-bit ELF executables (SVR4, Linux)
@


1.237
log
@Add ess to isa attachment.  The entry is commented out for the moment since
I'm not sure how accurate the probe is.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.236 1999/06/06 17:37:03 dante Exp $
d238 2
a239 2
pckbc0	at isa?			# pc keyboard controller
pckbd*	at pckbc?		# PC keyboard
d249 1
a249 1
wskbd*	at pckbd? console ?
@


1.236
log
@Add adv0 entry under ISA SCSI controllers
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.235 1999/05/19 14:41:54 bouyer Exp $
d546 1
@


1.235
log
@Document the 'wdc at isa' flags.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.234 1999/05/06 16:29:26 christos Exp $
d324 1
@


1.234
log
@Add NTFS
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.233 1999/04/17 16:52:06 drochner Exp $
d377 5
a381 2
wdc0	at isa? port 0x1f0 irq 14
wdc1	at isa? port 0x170 irq 15
@


1.233
log
@oops - forgot half of it
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.232 1999/04/17 16:50:26 drochner Exp $
d96 1
@


1.232
log
@disable the "aria" sound board per default until the problems with its
"probe" functions are solved (gives false positives)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231 1999/03/29 21:51:25 perry Exp $
d555 1
a555 1
audio*	at aria?
@


1.231
log
@remove BROKEN_LPT_DELAY option
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.230 1999/03/29 19:57:34 drochner Exp $
d539 2
a540 1
aria0	at isa? port 0x290 irq 10 		# Aria
@


1.231.2.1
log
@pullup 1.231->1.233 (drochner): comment out aria, which has false probes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.233 1999/04/17 16:52:06 drochner Exp $
d539 1
a539 2
# the "aria" probe might give false hits
#aria0	at isa? port 0x290 irq 10 		# Aria
d554 1
a554 1
#audio*	at aria?
@


1.231.2.1.4.1
log
@bring in latest KAME (as of 19991130, KAME/NetBSD141) into kame branch
just for reference purposes.
This commit includes 1.4 -> 1.4.1 sync for kame branch.

The branch does not compile at all (due to the lack of ALTQ and some other
source code).  Please do not try to modify the branch, this is just for
referenre purposes.

synchronization to latest KAME will take place on HEAD branch soon.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.2 1999/06/21 14:23:49 perry Exp $
d376 2
a377 5
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
# fall back to 16bits I/O if 32bits I/O are not functionnal).
# Some controllers pass the initial 32bit test, but will fail later.
wdc0	at isa? port 0x1f0 irq 14 flags 0x00
wdc1	at isa? port 0x170 irq 15 flags 0x00
a449 2
awi*	at pcmcia? function ?		# BayStack 650 (802.11FH)
cnw*	at pcmcia? function ?		# Xircom/NetWave AirSurfer
a453 1
wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
@


1.231.2.2
log
@pullup 1.234->1.235 (bouyer)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.1 1999/04/28 14:25:15 perry Exp $
d376 2
a377 5
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
# fall back to 16bits I/O if 32bits I/O are not functionnal).
# Some controllers pass the initial 32bit test, but will fail later.
wdc0	at isa? port 0x1f0 irq 14 flags 0x00
wdc1	at isa? port 0x170 irq 15 flags 0x00
@


1.231.2.3
log
@pull up revs 1.262 and 1.264 from trunk via patch (requested by drochner):
  Remove "nca* at isa?" from i386 GENERIC kernel.  Its probe function
  gives false positives and steps on other hardware.  Fixes PR#8361.
@
text
@d1 1
a1 1
#	$NetBSD$
d329 2
a330 3
# The "nca" probe might give false hits or hang your machine.
#nca0	at isa? port 0x360 irq 15	# Port-mapped NCR 53C80 contoller
#nca1	at isa? iomem 0xd8000 irq 5	# Memory-mapped controller (T128, etc.)
d346 1
a346 1
#scsibus* at nca?
@


1.231.2.4
log
@Pull up revision 1.255 (requested by bouyer):
  Back-port of the Realtek ethernet driver.
  (Add to GENERIC.)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.3 1999/10/09 21:49:26 cgd Exp $
a442 1
rl*	at pci? dev ? function ?	# Realtek 8129/8139
@


1.231.2.5
log
@Apply patch (requested by bouyer):
  Add "rl" PCI Ethernet device driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.4 1999/10/20 23:35:15 he Exp $
a439 1
rl*	at pci? dev ? function ?	# Realtek 8129/8139
@


1.231.2.6
log
@Correct double pullup of rl* device definition.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.5 1999/10/26 20:38:00 he Exp $
d440 1
@


1.231.2.7
log
@Pull up revision 1.259 + patch (requested by ad):
  Add driver for DPT SmartCache and SmartRAID III or IV SCSI
  adapters.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.6 2000/01/05 23:48:57 he Exp $
a304 1
dpt*	at pci? dev ? function ?	# DPT SmartCache/SmartRAID
a312 1
dpt*	at eisa? slot ?			# DPT SmartCache/SmartRAID
a345 1
scsibus* at dpt?
@


1.231.2.8
log
@Apply patch (requested by mcr):
  Add commented-out entry for the ioat device driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.7 2000/01/17 19:17:45 he Exp $
a279 2
#ioat0	at isa? port 0x220 irq 5	# BOCA IOAT 6-port serial cards 
#com*	at ioat? slave ?
@


1.231.2.9
log
@Pull up revision 1.252 (requested by jhawk):
  Add a driver for ``wi'', Lucent "Orinoco"/Wavelan.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.8 2000/01/31 18:53:19 he Exp $
a463 1
wi*	at pcmcia? function ?		# Lucent WaveLan IEEE (802.11)
@


1.231.2.10
log
@Apply patch (requested by he):
  Disable the UNION file system, to avoid a repeat of the 1.4.1
  and 1.4.2 LAST_MINUTE changes.  It is reportedly buggy, and can
  be used by ordinary users to crash the system.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.9 2000/05/11 09:26:57 he Exp $
d104 1
a104 1
#file-system 	UNION		# union file system
@


1.231.2.11
log
@Pull up revision 1.358 (requested by sommerfeld):
  Comment out EON ISO-over-ip tunneling pseudo-driver, and document
  as broken/fragile.  Unlikely to be of much use, and confuses new
  users when their system crashes when they, or their dhclient
  stumble over it.  See PR#10500 and PR#8994 for the gory details.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.10 2000/06/03 14:45:28 he Exp $
d121 1
a121 1
#options 	EON		# OSI tunneling over IP
@


1.231.2.12
log
@Apply patch (requested by he):
  Add entry for Alteon ACEnic gigabit Ethernet interface (ti).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.11 2000/07/05 19:16:08 he Exp $
a444 1
ti*	at pci? dev ? function ?	# Alteon ACEnic gigabit Ethernet
@


1.231.2.1.2.1
log
@Sync w/ -current.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.237 1999/06/18 20:27:59 augustss Exp $
a95 1
file-system 	NTFS		# Windows/NT file system
a322 1
adv0	at isa? port ? irq ? drq ?	# AdvanSys APB-514[02]
d376 2
a377 5
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
# fall back to 16bits I/O if 32bits I/O are not functionnal).
# Some controllers pass the initial 32bit test, but will fail later.
wdc0	at isa? port 0x1f0 irq 14 flags 0x00
wdc1	at isa? port 0x170 irq 15 flags 0x00
a540 1
#ess0	at isa? port 0x220 irq 5 drq 1 drq2 5	# ESS 18XX
@


1.231.2.1.2.2
log
@Update from trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.231.2.1.2.1 1999/06/21 00:49:55 thorpej Exp $
a78 1
options 	COMPAT_14	# NetBSD 1.4,
d87 2
a88 1
options 	COMPAT_AOUT	# binary compat for NetBSD a.out binaries
d125 5
a129 5
options 	PPP_BSDCOMP	# BSD-Compress compression support for PPP
options 	PPP_DEFLATE	# Deflate compression support for PPP
options 	PPP_FILTER	# Active filter support for PPP (requires bpf)
options 	PFIL_HOOKS	# pfil(9) packet filter hooks
options 	IPFILTER_LOG	# ipmon(8) log support
d238 2
a239 2
pckbc0		at isa?			# pc keyboard controller
pckbd*		at pckbc?		# PC keyboard
d241 3
a243 3
pms*		at pckbc?		# PS/2 mouse for wsmouse
pmsi*		at pckbc?	# PS/2 "Intelli"mouse for wsmouse
#opms*		at pckbc?		# backwards compatible PS/2 mouse
d249 3
a251 3
wskbd* 		at pckbd? console ?
wsmouse*	at pms? mux 0
wsmouse*	at pmsi? mux 0
d515 1
a515 1
wsmouse*	at ums? mux 0
d519 1
a519 1
wskbd*	at ukbd? console ? mux 1
d528 1
a528 1
ugen*	at uhub? port ?
a533 1
eso*	at pci? dev ? function ?	# ESS Solo-1 PCI AudioDrive
a555 1
opl*	at eso?
a562 1
audio*	at eso?
a572 5
# MPU 401 UARTs
#mpu*	at isa? port 0x330 irq 9        # MPU401 or compatible card
mpu*	at eso?
mpu*	at sb?

d574 2
a575 1
midi*	at mpu?			# MPU 401
a576 2
midi*	at pcppi?		# MIDI interface to the PC speaker
midi*	at sb?			# SB1 MIDI port
d585 6
a590 6
lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
lms1	at isa? port 0x238 irq 5
mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
mms1	at isa? port 0x238 irq 5
wsmouse*	at lms? mux 0
wsmouse*	at mms? mux 0
d592 4
a595 4
#olms0	at isa? port 0x23c irq 5	# Logitech bus mouse
#olms1	at isa? port 0x238 irq 5
#omms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
#omms1	at isa? port 0x238 irq 5
a647 3

# mouse & keyboard multiplexor pseudo-devices
pseudo-device	wsmux		2
@


1.230
log
@add a commented out WS_KERNEL_BG option, closes PR port-i386/7271
by Charlie Root <root@@theprovider.com>
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.229 1999/03/27 23:27:58 nathanw Exp $
a292 2
# BROKEN_LPT_DELAY can fix hangs and reboots in interrupt driven lpt
#options 	BROKEN_LPT_DELAY=5
@


1.229
log
@Remove commented-out uaudio declaration;
we don't actually have support for it.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.228 1999/03/27 11:42:12 kleink Exp $
d151 1
@


1.228
log
@Typo.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.227 1999/03/27 07:04:36 explorer Exp $
a553 3
# USB Audio devices
#uaudio*	at uhub? port ? configuration ? interface ?

a563 1
#audio*	at uaudio?
@


1.227
log
@remove EXPERIMENTAL comment, enable /dev/random in GENERIC kernels
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.226 1999/03/25 17:06:38 perry Exp $
d364 1
a364 1
# PCI IDE controllers - see pciide(4) for suppored hardware.
@


1.226
log
@fix typo
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.225 1999/03/25 03:35:26 explorer Exp $
d640 2
a641 3

# rnd is EXPERIMENTAL at this point.
#pseudo-device	rnd			# /dev/random and in-kernel generator
@


1.225
log
@add entry for lmc* at pci?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.224 1999/03/25 02:22:21 perry Exp $
d293 1
a293 1
#option	BROKEN_LPT_DELAY=5
@


1.224
log
@add a (commented out) BROKEN_LPT_DELAY
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.223 1999/03/23 20:08:55 bad Exp $
d439 1
@


1.223
log
@Add tcic PCMCIA controller.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.222 1999/03/22 23:43:30 bad Exp $
d292 2
@


1.222
log
@Add IBM and 3COM ISA Token-Ring drivers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.221 1999/03/16 16:31:54 drochner Exp $
d201 1
d206 1
@


1.221
log
@add prototype WSDISPLAY_DEFAULTSCREENS option, improve wscons related
comments
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.220 1999/02/16 17:46:17 abs Exp $
d443 1
d473 3
@


1.220
log
@Update IDE comments, from yoavcs@@inter.net.il
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.219 1999/02/02 16:18:17 bouyer Exp $
d143 1
d145 2
d151 1
d158 2
@


1.219
log
@Mention pciide(4).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.218 1999/02/01 01:36:21 cjs Exp $
d353 1
a353 1
# IDE and Related Devices
d370 2
a371 2
# IDE drives.
# Flags are used only with controlers that support DMA operations
d373 8
a380 6
# The first 4 bytes of the flags define the PIO mode to use, the
# second DMA mode and the third UltraDMA mode. For each group of 4 bytes,
# the 3 lower define the mode to use, and the last one must be 1 for the
# setting to be used. For DMA and UDMA, 0xf means 'disable'.
# 0x0fac means 'use PIO mode 4 DMA mode 2, disable UltraDMA'.
# 0x0000 means "use whatever the drive claims to support.
@


1.218
log
@Add a missing tab for cosmetic purposes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.217 1999/01/30 13:44:25 drochner Exp $
d354 1
a354 1
# PCI IDE controllers (CMD tech's PCI0640, Intel's PIIx, ...).
@


1.217
log
@make wscons the default
@
text
@d1 1
a1 1
#	$NetBSD: NWSCONS,v 1.24 1999/01/29 00:01:22 cjs Exp $
d151 1
a151 1
options 	WSDISPLAY_COMPAT_RAWKBD	# can get raw scancodes
@


1.216
log
@Have NTP PLL on by default.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.215 1999/01/23 15:35:21 drochner Exp $
d143 12
d218 1
a218 1
pc0	at isa? port 0x60 irq 1		# pccons generic PC console driver
d227 16
d566 7
d577 1
a577 1
opms0	at pc? irq 12		# PS/2 auxiliary port mouse
@


1.215
log
@update for mouse renaming
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.214 1999/01/22 22:47:16 tron Exp $
d51 1
a51 1
#options 	NTP		# NTP phase/frequency locked loop
@


1.214
log
@Add "ipip" network interfaces.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.213 1999/01/22 05:40:16 sakamoto Exp $
d538 6
a543 6
lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
lms1	at isa? port 0x238 irq 5
mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
mms1	at isa? port 0x238 irq 5
pms0	at pc? irq 12		# PS/2 auxiliary port mouse
#pms0	at vt? irq 12		# PS/2 auxiliary port mouse
@


1.213
log
@Add vr driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.212 1999/01/06 23:30:53 thorpej Exp $
d582 1
@


1.212
log
@Add the `pcscp' driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.211 1998/12/20 17:56:18 nathanw Exp $
d398 1
@


1.211
log
@Add "pcic0 at pci?".
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.210 1998/12/16 11:42:07 christos Exp $
d270 1
d311 1
@


1.210
log
@Add a commented out entry for tcom.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.209 1998/12/10 19:01:41 augustss Exp $
d187 3
@


1.209
log
@Add sv driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.208 1998/12/10 15:46:20 augustss Exp $
d240 2
@


1.208
log
@Comment out sv audio device, the driver is not in the tree yet.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.207 1998/12/08 15:52:32 augustss Exp $
d477 1
a477 1
#sv*	at pci? dev ? function ?	# S3 SonicVibes
d499 1
d513 1
a513 1
#audio*	at sv?
@


1.207
log
@Add ugen, a generic USB driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.206 1998/12/02 10:54:26 bouyer Exp $
d477 1
a477 1
sv*	at pci? dev ? function ?	# S3 SonicVibes
d512 1
a512 1
audio*	at sv?
@


1.206
log
@Document the use of flags to set/disable PIO/DMA/UDMA modes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.205 1998/11/23 20:47:03 christos Exp $
d454 1
a454 1
uhub*	at uhub? port ?
d457 1
a457 1
ums*	at uhub? port ?
d461 1
a461 1
ukbd*	at uhub? port ?
d465 1
a465 1
uhid*	at uhub? port ?
d468 1
a468 1
ulpt*	at uhub? port ?
d471 1
a471 1
#ugen*	at uhub? port ?
d477 1
d501 1
a501 1
#uaudio*	at uhub? port ?
d512 1
@


1.205
log
@add aha at isapnp?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.204 1998/11/16 16:44:56 oster Exp $
d319 1
a319 1
# PCI IDE controllers (CMD tech's PCI0640, Intel's PIIx).
d335 11
a345 3
# IDE drives
wd*	at wdc? channel ? drive ?
wd*	at pciide? channel ? drive ?
d352 4
a355 3
cd*	at atapibus? drive ?		# ATAPI CD-ROM drives
sd*	at atapibus? drive ?		# ATAPI disk drives
uk*	at atapibus? drive ?		# ATAPI unknown
@


1.204
log
@Added a (commented out) configuration line for the RAIDframe device driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.203 1998/11/12 21:12:34 rvb Exp $
d276 1
@


1.203
log
@Perry said I should ... enable pms0 for GENERIC
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.202 1998/11/10 14:09:15 bouyer Exp $
d548 1
@


1.202
log
@Add and enable the pciide driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.201 1998/11/05 00:38:10 thorpej Exp $
d521 1
a521 1
#pms0	at pc? irq 12		# PS/2 auxiliary port mouse
@


1.201
log
@Add "ukphy".
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.200 1998/11/04 00:31:59 fvdl Exp $
d322 1
a322 1
#pciide* at pci ? dev ? function ? flags 0x0000
d336 1
a336 1
#wd*	at pciide? channel ? drive ?
d340 1
a340 1
#atapibus* at pciide? channel ?
@


1.200
log
@Add the 'ex' driver, a DMA driver for 3Com 90x and 90xB cards.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.199 1998/11/03 23:52:50 thorpej Exp $
d430 1
@


1.199
log
@Add sqphy.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.198 1998/11/03 00:12:45 thorpej Exp $
d372 2
a373 1
ep*	at pci? dev ? function ?	# 3Com 3c59x/3c90x Ethernet
@


1.198
log
@Add icsphy*.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.197 1998/10/30 13:47:02 lukem Exp $
d427 1
@


1.197
log
@s/milieconds/milliseconds/
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.196 1998/10/25 18:40:17 christos Exp $
d422 1
@


1.196
log
@Add nca driver goo.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.195 1998/10/24 00:46:17 thorpej Exp $
d23 1
a23 1
# delay between "rebooting ..." message and hardware reset, in milieconds
@


1.195
log
@Add "exphy" and "lxtphy" drivers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.194 1998/10/22 15:11:39 bouyer Exp $
d285 2
d302 1
@


1.194
log
@Add config flags for pciide: 0x001 forces the use of DMA when the driver
don't know how to set the controller's modes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.193 1998/10/19 12:29:55 bouyer Exp $
d418 1
d420 1
@


1.193
log
@Add 'uk at atapibus'.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.192 1998/10/19 12:06:55 bouyer Exp $
d316 4
a319 1
#pciide* at pci ? dev ? function ?
@


1.192
log
@Remove useless 'flags' for wdc ata isapnp.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.191 1998/10/13 11:43:50 bouyer Exp $
d339 1
@


1.191
log
@Add a CPURESET_DELAY options which specifies the delay (in milliseconds)
between the "rebooting" message and the hardware reset. If set to 0, the call
to delay() is disabled. Default is 2s.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.190 1998/10/13 03:57:27 enami Exp $
d319 1
a319 1
wdc*	at isapnp? flags 0x0000
@


1.190
log
@Remove space at the end of line.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.189 1998/10/12 16:09:13 bouyer Exp $
d22 3
@


1.189
log
@Merge bouyer-ide
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.152.2.14 1998/10/12 14:33:40 bouyer Exp $
d313 1
a313 1
#pciide* at pci ? dev ? function ? 
d319 1
a319 1
wdc*	at pcmcia? function ? 
d322 1
a322 1
wdc0	at isa? port 0x1f0 irq 14 
@


1.188
log
@Add pcmcom driver and com slaves.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.187 1998/10/06 01:44:11 rvb Exp $
d312 2
d316 1
a316 1
wdc*	at isapnp?
d319 1
a319 1
wdc*	at pcmcia? function ?
d321 2
a322 2
# ISA IDE controllers
wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
d326 2
a327 1
wd*	at wdc? drive ?			# the drives themselves
d330 2
a331 1
atapibus* at wdc?
@


1.187
log
@Add Coda
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.186 1998/09/26 16:38:43 dante Exp $
d223 3
@


1.186
log
@Add support for AdvanSys Ultra Wide boards
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.185 1998/09/22 01:16:48 mycroft Exp $
d102 1
a102 1
#file-system	CODA		# Coda File System; also needs vcoda (below)
d548 1
a548 1
#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
@


1.185
log
@Slight edit to previous.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.184 1998/09/18 12:22:54 drochner Exp $
d253 2
a254 1
adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], ULTRA SCSI
d287 1
@


1.184
log
@Note which units memory sizes are counted in.
Fixes half of PR port-i386/6159 ("Heiko W.Rupp" <hwr@@pilhuhn.de>).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.183 1998/09/13 21:02:02 hwr Exp $
d39 2
a40 2
#options 	REALBASEMEM=639	# size of base memory (kB)
#options 	REALEXTMEM=15360	# size of extended memory (kB)
@


1.183
log
@Enable gre(4) device
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.182 1998/09/12 15:05:47 rvb Exp $
d31 1
a31 1
#	serial debugger option of the new boot strap code.
d39 2
a40 2
#options 	REALBASEMEM=...	# size of base memory
#options 	REALEXTMEM=...	# size of extended memory
@


1.182
log
@Change cfs/CFS in symbols, strings and constants to coda/CODA
to avoid fs conflicts.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.181 1998/09/08 20:56:08 rvb Exp $
d534 1
@


1.181
log
@Get ready to add Coda
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.180 1998/08/31 17:58:46 thorpej Exp $
d102 1
a102 1
#file-system	CFS		# Coda File System; also needs vcfs (below)
d544 2
a545 2
# a pseudo device needed for Coda	# also needs CFS (above)
#pseudo-device	vcfs		4	# coda minicache <-> venus comm.
@


1.180
log
@UVM+PMAP_NEW is standard now; don't need it in individual config files.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.179 1998/08/26 14:27:44 dante Exp $
d102 1
d543 3
@


1.179
log
@Add AdvanSys SCSI controller
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.178 1998/08/26 13:37:49 augustss Exp $
a50 3

#options 	UVM		# Use UVM instead of Mach VM.
#options 	PMAP_NEW	# new pmap interface; requires UVM
@


1.178
log
@Add more opl attachments.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.177 1998/08/18 17:03:42 mycroft Exp $
d255 1
d287 1
@


1.177
log
@Tab vs. space, and turn *off* XSERVER_DDB by default.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.176 1998/08/17 21:16:10 augustss Exp $
d460 2
@


1.176
log
@* Redo the way the way the MIDI driver attaches to audio devices.
* Improve the midisyn layer a little.
* Add a driver for the Yamaha OPL[23] FM synths.
  The opl driver is not finished yet; it sounds pretty awful.

For some strange reason I cannot get any FM sound from my SB64 cards,
but a regular SB16 works fine.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.175 1998/08/13 17:47:56 rvb Exp $
d25 1
a25 1
options		XSERVER_DDB	# PF12 gets you into DDB when X is running
@


1.175
log
@Make serial line debugging easier to enable and use
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.174 1998/08/12 18:32:18 mycroft Exp $
d459 3
d468 1
a476 1
audio*	at ess?
d481 1
@


1.174
log
@Add audio at ess.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.173 1998/08/12 18:17:55 augustss Exp $
d25 1
d29 4
a32 1
#options 	"CONSDEVNAME=\"com\""
@


1.173
log
@Add the PC speaker MIDI attachment.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.172 1998/08/11 00:32:04 thorpej Exp $
d469 1
@


1.172
log
@Adapt to MII changes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.171 1998/08/10 01:54:59 mycroft Exp $
d440 1
a444 1
ess*	at isapnp?			# ESS Tech ES1887, ES1888, ES888 audio
d471 2
a472 1
midi*	at sb?
@


1.171
log
@Add ess at isapnp.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.170 1998/08/07 00:00:56 augustss Exp $
d397 5
a401 7
# MII bus support
mii*	at tl?

# MII PHY network interfaces
tlphy*	at mii? dev ?			# ThunderLAN PHYs
nsphy*	at mii? dev ?			# NS and compatible PHYs

@


1.170
log
@Add MIDI support.  The MIDI devices can be accessed as ``raw'' through
the /dev/rmidiN devices, or with a sequencer interface via /dev/music.
So far the only supported MIDI device is the MPU401 port on SoundBlaster
(and only on SB on isapnp, since we do not have locators with multiple
values yet).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.169 1998/07/29 12:36:47 augustss Exp $
d446 1
@


1.169
log
@Add wss on isapnp.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.168 1998/07/27 23:55:23 perry Exp $
d471 3
d527 1
@


1.168
log
@NORVEGIAN -> NORWEGIAN
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.167 1998/07/27 18:42:27 bouyer Exp $
d444 1
@


1.167
log
@Correct indent.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.166 1998/07/27 18:38:08 bouyer Exp $
d205 1
a205 1
#options 	NORVEGIAN_KBD
@


1.166
log
@Ops, forgot FINNISH_KBD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.165 1998/07/27 13:39:51 bouyer Exp $
d202 1
a202 1
#options        FRENCH_KBD
d204 2
a205 2
#options        GERMAN_KBD
#options        NORVEGIAN_KBD
@


1.165
log
@Document FRENCH_KBD,GERMAN_KBD,NORVEGIAN_KBD options.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.164 1998/07/27 01:51:29 thorpej Exp $
d203 1
@


1.164
log
@Add cs0 at isa? port 0x300, wildcard IRQ and memory address, to pull
them from the EEPROM.  Wildcard DRQ to force memory-mode operation; this
value is not available in the EEPROM and must be configured manually.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.163 1998/07/26 17:45:53 augustss Exp $
d200 5
@


1.163
log
@Use wscons attachments for USB keyboard and mouse.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.162 1998/07/12 19:51:56 augustss Exp $
d368 1
@


1.162
log
@Add USB support.  Supported so far:
* UHCI and OHCI host controllers on PCI
* Hubs
* HID devices withe special drivers for mouse and keyboard
* Printers
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.161 1998/07/09 20:59:38 perry Exp $
d414 1
d418 1
@


1.161
log
@Set soundblaster irq to 5 by default.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.160 1998/06/26 18:58:38 cgd Exp $
d134 1
d398 29
d446 3
d457 1
@


1.160
log
@add device declarations for 'puc'-related devices.  Add lpt attaching
to puc to the files file, because it can't go in files.pci (see comments
here or there).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.159 1998/06/26 01:53:58 lukem Exp $
d413 1
a413 1
sb0	at isa? port 0x220 irq 7 drq 1 drq2 5	# SoundBlaster
@


1.159
log
@remove options FIFO; it's now the default
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.158 1998/06/24 20:58:44 sommerfe Exp $
d163 2
d206 1
d231 3
@


1.158
log
@Always include fifos; "not an option any more".
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.157 1998/06/24 05:38:09 bouyer Exp $
a105 1
#options 	FIFO		# FIFOs; RECOMMENDED
@


1.157
log
@Update comment regarding conflict between wt driver and SMC ethernet boards.
Closes PR 4481 by Erik Bertelsen.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.156 1998/06/07 18:34:38 sommerfe Exp $
d106 1
a106 1
options 	FIFO		# FIFOs; RECOMMENDED
@


1.156
log
@Add ISA Plug and Play attachment for PCIC PCMCIA controller (pcic* at isapnp?).
Slightly modify ISA attachment to let the two share code.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.155 1998/06/07 02:36:53 enami Exp $
d326 1
a326 1
# note: the wt driver conflicts unpleasantly with ed devices at the
@


1.155
log
@Use TAB instead of two space to indent.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.154 1998/06/07 02:34:41 enami Exp $
d184 2
@


1.154
log
@Remove TAB after `options I686_CPU'.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.153 1998/06/06 10:14:21 augustss Exp $
d411 1
a411 1
audio*  at eap?
@


1.153
log
@Add Aria driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.152 1998/06/03 21:17:52 mjacob Exp $
d14 1
a14 1
options 	I686_CPU	
@


1.152
log
@turn on Essential HIPPI for this configuration
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.151 1998/06/03 10:03:25 frueauf Exp $
d401 1
d410 1
@


1.152.2.1
log
@Commit changes to the IDE system in a branch. This allows a better separation
between higth-level and low-level (i.e. registers read/write) and generalize
the queue for all commands. This also add supports for IDE DMA.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.152 1998/06/03 21:17:52 mjacob Exp $
a288 8
# The following flags may be set for the IDE controllers drivers:
# byte 0 is for first channel, byte 1 for secondary.
# For each channel, the first bit will enable 32-bits transferts for drive 0,
# and the second bit for drive 1 (e.g 0x0101 will enable 32-bits transferts
# for master drives of each channel).

# PCI IDE controllers (CMD tech's PCI0640, Intel's PIIx).
pciide* at pci ? dev ? function ? 
d291 1
a291 1
wdc*	at isapnp? flags 0x0000
d294 1
a294 1
wdc*	at pcmcia? function ? 
d296 2
a297 2
# ISA ST506, ESDI, and IDE controllers
wdc0	at isa? port 0x1f0 irq 14 
d301 1
a301 2
wd*	at wdc? channel ? drive ?
wd*	at pciide? channel ? drive ?
d304 1
a304 2
atapibus* at wdc? channel ?
atapibus* at pciide? channel ?
@


1.152.2.2
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.153 1998/06/06 10:14:21 augustss Exp $
a410 1
aria0	at isa? port 0x290 irq 10 		# Aria
a418 1
audio*	at aria?
@


1.152.2.3
log
@Sync with trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.156 1998/06/07 18:34:38 sommerfe Exp $
d14 1
a14 1
options 	I686_CPU
a183 2
# ISA Plug-and-Play PCMCIA controllers
pcic*	at isapnp?
d421 1
a421 1
audio*	at eap?
@


1.152.2.4
log
@Sync with HEAD.
@
text
@@


1.152.2.5
log
@Remove comments about flags for IDE controllers, it's not true any more.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.152.2.4 1998/06/13 14:26:17 bouyer Exp $
d291 6
@


1.152.2.6
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.158 1998/06/24 20:58:44 sommerfe Exp $
d106 1
a106 1
#options 	FIFO		# FIFOs; RECOMMENDED
d330 1
a330 1
# note: the wt driver conflicts unpleasantly with SMC boards at the
@


1.152.2.7
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.152.2.6 1998/06/25 10:50:23 bouyer Exp $
d106 1
a163 2
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc*	at pci? dev ? function ?	# PCI "universal" comm. cards
a204 1
com*	at puc? port ?			# 16x450s on "universal" comm boards
a228 3

# PCI parallel printer interfaces
lpt*	at puc? port ?			# || ports on "universal" comm boards
@


1.152.2.8
log
@Sync with -current
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.152.2.7 1998/07/02 08:19:35 bouyer Exp $
a133 1
options 	USBVERBOSE	# verbose USB device autoconfig messages
a199 6
# Keyboard layout configuration for pccons
#options 	FRENCH_KBD
#options 	FINNISH_KBD
#options 	GERMAN_KBD
#options 	NORVEGIAN_KBD

a370 1
cs0	at isa? port 0x300 iomem ? irq ? drq ?	# CS8900 Ethernet
a400 31
# USB Controller and Devices

# PCI USB controllers
uhci*	at pci?				# Universal Host Controller (Intel)
ohci*	at pci?				# Open Host Controller

# USB bus support
usb*	at uhci?
usb*	at ohci?

# USB Hubs
uhub*	at usb?
uhub*	at uhub? port ?

# USB Mice
ums*	at uhub? port ?
wsmouse*	at ums?

# USB Keyboards
ukbd*	at uhub? port ?
wskbd*	at ukbd? console ?

# USB Generic HID devices
uhid*	at uhub? port ?

# USB Printer
ulpt*	at uhub? port ?

# USB Generic driver
#ugen*	at uhub? port ?

d417 1
a417 1
sb0	at isa? port 0x220 irq 5 drq 1 drq2 5	# SoundBlaster
a419 3
# USB Audio devices
#uaudio*	at uhub? port ?

a427 1
#audio*	at uaudio?
@


1.152.2.9
log
@ - sync with -current
 - b* -> mem*
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.174 1998/08/12 18:32:18 mycroft Exp $
d205 1
a205 1
#options 	NORWEGIAN_KBD
d401 7
a407 5
# MII/PHY support
inphy*	at mii? phy ?			# Intel 82555 PHYs
nsphy*	at mii? phy ?			# NS83840 PHYs
qsphy*	at mii? phy ?			# Quality Semiconductor QS6612 PHYs
tlphy*	at mii? phy ?			# ThunderLAN PHYs
a445 1
ess*	at isapnp?			# ESS Tech ES1887, ES1888, ES888 audio
a447 1
wss*	at isapnp?			# Windows Sound System
a472 5
audio*	at ess?

# MIDI support
midi*	at pcppi?		# MIDI interface to the PC speaker
midi*	at sb?			# SB MPU401 port
a526 1
pseudo-device	sequencer	1	# MIDI sequencer
@


1.152.2.10
log
@Sync with -current
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.175 1998/08/13 17:47:56 rvb Exp $
a24 1
options		XSERVER_DDB	# PF12 gets you into DDB when X is running
d28 1
a28 4
#options 	"CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
#	you don't want the option below ON iff you are using the
#	serial debugger option of the new boot strap code.
#options	CONS_OVERRIDE	# Always use above! independent of boot info
@


1.152.2.11
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.152.2.10 1998/08/21 16:34:48 bouyer Exp $
d25 1
a25 1
#options 	XSERVER_DDB	# PF12 gets you into DDB when X is running
d52 3
a104 1
#file-system	CFS		# Coda File System; also needs vcfs (below)
a254 1
adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], ULTRA SCSI
a285 1
scsibus* at adv?
a462 5
# OPL[23] FM syntheziers
#opl0	at isa? port 0x388	# use only if not attached to sound card
opl*	at ess?
opl*	at sb?

a468 1
audio*	at ess?
d477 1
a481 1
midi*	at opl?			# OPL FM synth
a540 3

# a pseudo device needed for Coda	# also needs CFS (above)
#pseudo-device	vcfs		4	# coda minicache <-> venus comm.
@


1.152.2.12
log
@sync with HEAD
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.184 1998/09/18 12:22:54 drochner Exp $
d31 1
a31 1
#	serial console option of the new boot strap code.
d39 2
a40 2
#options 	REALBASEMEM=639	# size of base memory (kB)
#options 	REALEXTMEM=15360	# size of extended memory (kB)
d102 1
a102 1
#file-system	CODA		# Coda File System; also needs vcoda (below)
a537 1
pseudo-device	gre		2	# generic L3 over IP tunnel
d548 2
a549 2
# a pseudo device needed for Coda	# also needs CODA (above)
#pseudo-device	vcoda		4	# coda minicache <-> venus comm.
@


1.152.2.13
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.152.2.12 1998/09/20 16:37:22 bouyer Exp $
d39 2
a40 2
#options 	REALBASEMEM=639		# size of base memory (in KB)
#options 	REALEXTMEM=15360	# size of extended memory (in KB)
d253 1
a253 2
adv*	at pci? dev ? function ?	# AdvanSys 1200[A,B], 9xx[U,UA] SCSI
adw*	at pci? dev ? function ?	# AdvanSys 9xxUW SCSI
a285 1
scsibus* at adw?
@


1.152.2.14
log
@Sync with HEAD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.188 1998/10/10 21:58:22 thorpej Exp $
d102 1
a102 1
file-system	CODA		# Coda File System; also needs vcoda (below)
a223 3
pcmcom*	at pcmcia? function ?		# PCMCIA multi-port serial cards
com*	at pcmcom? slave ?		# ...and the slave devices

d552 1
a552 1
pseudo-device	vcoda		4	# coda minicache <-> venus comm.
@


1.151
log
@Remove double "options GATEWAY" entry.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.150 1998/06/02 01:44:57 thorpej Exp $
d337 1
@


1.150
log
@Add epic* at pci?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.149 1998/05/20 16:25:06 augustss Exp $
a8 2

options GATEWAY
@


1.149
log
@Add ym (Yamaha OPL3-SA3) driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.148 1998/05/01 22:00:37 augustss Exp $
d10 2
d338 1
@


1.148
log
@Add Ensoniq AudioPCI driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.147 1998/04/20 10:58:01 drochner Exp $
d396 1
d414 1
@


1.147
log
@There are NE2100 compatible cards which cannot IRQ 10.
Use IRQ 9 in the default configuration.
(Thanks to Rick Byers <rickb@@iaw.on.ca>.)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.146 1998/04/16 22:01:42 drochner Exp $
d390 3
d406 1
@


1.146
log
@-"spkr" now attaches to "pcppi"
-"le at isa" is split into "depca", "nele" and "bicc"
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.145 1998/04/03 04:35:05 enami Exp $
d370 1
a370 1
nele0	at isa? port 0x320 irq 10 drq 7		# NE2100
@


1.145
log
@Add entry for aic* at isapnp.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.144 1998/04/03 04:29:13 enami Exp $
d197 2
d368 6
a373 1
#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
d411 1
a411 2
#spkr0	at pc? port 0x61		# PC speaker
#spkr0	at vt? port 0x61		# PC speaker
@


1.144
log
@Add entry for mbe* at pcmcia.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.143 1998/04/03 04:23:50 enami Exp $
d248 3
@


1.143
log
@Add entries for ate0 and fmv0 (former is tested but latter is not).
Remove fe0.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.142 1998/03/22 18:18:45 drochner Exp $
d347 1
@


1.142
log
@The "pckbd" attribute of pc/vt is now "pckbcport".
Use the real console driver name here to make more obvious where
pms and spkr attach to.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.141 1998/03/18 16:34:43 bouyer Exp $
d351 1
a355 1
fe0	at isa? port 0x2a0 irq ?		# AT1700
d358 1
@


1.141
log
@Add commented out "options FFS_EI"
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.140 1998/02/27 23:57:31 pk Exp $
d399 2
a400 1
#spkr0	at pckbd? port 0x61		# PC speaker
d410 2
a411 1
#pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse
@


1.140
log
@Replace monolithic `ie0' and `ie1' driver by `ef', `ix', `ai' front-ends.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.139 1998/02/19 23:21:33 mycroft Exp $
d104 1
@


1.139
log
@Fix formatting glitch.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.138 1998/02/19 14:21:57 drochner Exp $
d355 3
a357 2
ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
ie1	at isa? port 0x300 irq 10		# EtherExpress
@


1.138
log
@add COMPAT_386BSD_MBRPART option
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.137 1998/02/13 04:12:33 mrg Exp $
d76 1
a76 1
options		COMPAT_386BSD_MBRPART # recognize old partition ID
@


1.137
log
@add a commented out PMAP_NEW.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.136 1998/02/06 11:20:31 mrg Exp $
d76 1
@


1.136
log
@remove paging options from kernel files.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.135 1998/02/06 07:53:27 thorpej Exp $
d49 1
@


1.135
log
@Add pceb at pci and {eisa,isa} at pceb attachments.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.134 1998/02/06 07:21:44 mrg Exp $
a48 5

# These are required for Mach VM
options 	VNODEPAGER	# paging to vnodes
options 	SWAPPAGER	# pageout
options 	DEVPAGER	# paging to devices
@


1.134
log
@add the i386 MD portions for UVM.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.133 1998/01/29 01:53:03 tron Exp $
d163 1
d169 1
d173 1
@


1.133
log
@Add option "#options IPFILTER_LOG", fixes port-i386/4858.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.132 1998/01/23 20:42:34 mycroft Exp $
d47 7
@


1.132
log
@Add wdc* at isapnp?.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.131 1998/01/23 01:16:03 mycroft Exp $
d119 1
@


1.131
log
@Add wdc* at pcmcia.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.130 1998/01/15 02:26:35 cgd Exp $
d275 3
@


1.130
log
@add 'sd* at atapibus? drive ?' to all kernel configs already containing
an analogous line for 'cd'.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.129 1998/01/14 15:27:44 drochner Exp $
d275 3
@


1.129
log
@from Dave Burgess per PR4620:
-base address 0x308 is supported by more Wangtek QIC tapes than 0x300
-Ultrastor ISA SCSI adapters can't be set to base address 0x334
  (changed to 0x340)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.128 1998/01/09 15:18:50 drochner Exp $
d288 1
@


1.128
log
@enable diskless boot with BOOTP and BOOTPARAM configuration
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.127 1997/12/09 13:32:35 tv Exp $
d249 1
a249 1
uha1	at isa? port 0x334 irq ? drq ?
d306 1
a306 1
#wt0	at isa? port 0x300 irq 5 drq 1	# Archive and Wangtek QIC tape drives
@


1.127
log
@KMEMSTATS is documented in options(4) as being a possible severe
performance hit, and on an 80386 processor, it most certainly is.  Pull it
from the GENERIC (and DISKLESS "generic") kernels--configure it in
yourself if you actually need it.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.126 1997/11/27 09:58:33 fvdl Exp $
d129 2
@


1.126
log
@Revert I486_PCI_MEM_ENABLED change, it caused too many problems.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.125 1997/11/25 20:29:32 kleink Exp $
d58 1
a58 1
options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
@


1.125
log
@Add COMPAT_13.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.123 1997/11/17 03:39:42 thorpej Exp $
a36 5

# Some i486 PCI chipsets have bugs in them that cause problems when using
# memory-mapped device access.  Therefore, PCI mem space is disabled by
# default on 486-class CPUs.  This option allows re-enables it.
#options 	I486_PCI_MEM_ENABLED
@


1.124
log
@Add commented-out "I486_PCI_MEM_ENABLED" option, and describe it.
@
text
@d76 1
@


1.123
log
@Put lc0 at i/o 0x320.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.122 1997/11/17 01:57:50 lukem Exp $
d37 5
@


1.122
log
@* add commented out DDB_HISTORY_SIZE=100 if DDB exists in config file
* fix up use of 'options<SPACE><TAB>'
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.121 1997/11/11 20:31:38 drochner Exp $
d340 1
a340 1
lc0	at isa? port ? iomem ? irq ?		# DEC EtherWORKS III (LEMAC)
@


1.121
log
@-point to console(4) manpage for serial console parameters
 (suggested by Chuck Cranor)
-insert a reasonable IO base address for "iy at isa"
 (from Ignatios Souvatzis)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.120 1997/11/11 05:53:06 thorpej Exp $
d60 1
@


1.120
log
@Add locators for "eg0" device, and enable it.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.119 1997/11/05 18:13:13 thorpej Exp $
d27 2
a28 2
# I/O address.
#options 	"CONSDEVNAME=\"com\"",CONADDR=0x3f8,CONSPEED=9600
d338 1
a338 1
iy0	at isa? port ? irq ?			# EtherExpress PRO 10 ISA
@


1.119
log
@Add sm0 at isa? port 0x300 irq 10
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.118 1997/11/03 21:33:33 thorpej Exp $
d332 1
a332 1
#eg0	at isa? ...				# 3C505 ethernet cards
@


1.118
log
@Delete "ed" driver, add "we".
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.117 1997/11/02 01:02:23 thorpej Exp $
d343 1
@


1.117
log
@Add "ec" driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.116 1997/10/23 05:49:42 mikel Exp $
a331 2
ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC ethernet cards
ed1	at isa? port 0x300 iomem 0xcc000 irq 10
d343 2
@


1.116
log
@fix some typos and other misfeatures in comments; no functional change
note that bha driver supports BT44x cards as well
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.115 1997/10/21 06:01:16 bouyer Exp $
d331 3
a333 3
ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC and 3C503
ed1	at isa? port 0x250 iomem 0xd8000 irq 9	#   ethernet cards
ed2	at isa? port 0x300 iomem 0xcc000 irq 10
@


1.115
log
@Correct spelling of 'ThunderLAN'
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.114 1997/10/20 18:45:09 explorer Exp $
d64 1
a64 1
# Compatbility options
d102 1
d118 1
a118 1
# Compatibility with 4.2BSD implementation of TCP/IP.  Not suggested.
d241 1
a241 1
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI
d277 1
a277 1
wd*	at wdc? drive ?			# the drives themsevles
d300 1
a300 1
# same I/O address. The probe reprograms their eeproms. Don't
d429 1
a429 1
# rnd is EXTERIMENTAL at this point.
@


1.114
log
@Mark options RND_COM as broken on i386 port
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.113 1997/10/20 15:19:51 explorer Exp $
d314 1
a314 1
tl*	at pci? dev ? function ?	# Thunderland-based Ethernet
d349 1
a349 1
tlphy*	at mii? dev ?			# Thunderland PHYs
@


1.114.2.1
log
@pull up from trunk:  Correct ThunderLAN spelling
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.115 1997/10/21 06:01:16 bouyer Exp $
d314 1
a314 1
tl*	at pci? dev ? function ?	# ThunderLAN-based Ethernet
d349 1
a349 1
tlphy*	at mii? dev ?			# ThunderLAN PHYs
@


1.114.2.2
log
@Pull up rev 1.115 from trunk
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.114.2.1 1997/10/21 08:20:52 mrg Exp $
d64 1
a64 1
# Compatibility options
a101 1

d117 1
a117 1
# Compatibility with 4.2BSD implementation of TCP/IP.  Not recommended.
d240 1
a240 1
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [457]4X SCSI
d276 1
a276 1
wd*	at wdc? drive ?			# the drives themselves
d299 1
a299 1
# same I/O address. The probe reprograms their EEPROMs. Don't
d428 1
a428 1
# rnd is EXPERIMENTAL at this point.
@


1.114.2.3
log
@Add sm0 at isa? port 0x300 irq 10
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.114.2.2 1997/10/23 06:40:35 mellon Exp $
a344 1
sm0	at isa? port 0x300 irq 10		# SMC91C9x Ethernet
@


1.114.2.4
log
@Update from trunk: add "we" and "ec" drivers, remove "ed" drivers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.119 1997/11/05 18:13:13 thorpej Exp $
d331 3
a333 1
ec0	at isa? port 0x250 iomem 0xd8000 irq 9	# 3Com 3c503 Ethernet
a345 2
we0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC Ethernet
we1	at isa? port 0x300 iomem 0xcc000 irq 10
@


1.114.2.5
log
@Sync w/ trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.120 1997/11/11 05:53:06 thorpej Exp $
d332 1
a332 1
eg0	at isa? port 0x280 irq 9		# 3C505 ethernet cards
@


1.114.2.6
log
@Partial sync w/ trunk: addresses for iy0 and lc0.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.123 1997/11/17 03:39:42 thorpej Exp $
d27 2
a28 2
# I/O address.   see console(4) for details.
#options 	"CONSDEVNAME=\"com\""
d338 2
a339 2
iy0	at isa? port 0x360 irq ?		# EtherExpress PRO 10 ISA
lc0	at isa? port 0x320 iomem ? irq ?	# DEC EtherWORKS III (LEMAC)
@


1.114.2.7
log
@Pull up from trunk: add commented-out I486_PCI_MEM_ENABLED option.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.114.2.6 1997/11/17 03:44:34 thorpej Exp $
a36 5

# Some i486 PCI chipsets have bugs in them that cause problems when using
# memory-mapped device access.  Therefore, PCI mem space is disabled by
# default on 486-class CPUs.  This option allows re-enables it.
#options 	I486_PCI_MEM_ENABLED
@


1.114.2.8
log
@Pull rev 1.126 up from trunk (fvdl)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.114.2.7 1997/11/24 01:40:31 thorpej Exp $
d37 5
@


1.114.2.9
log
@Pull up 1.33 (tron)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.114.2.8 1997/11/28 08:17:59 mellon Exp $
a116 1
#options 	IPFILTER_LOG	# ipmon(8) log support
@


1.114.2.10
log
@Pull up 1.129, per request of mycroft.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.114.2.9 1998/02/07 00:45:46 mellon Exp $
d246 1
a246 1
uha1	at isa? port 0x340 irq ? drq ?
d303 1
a303 1
#wt0	at isa? port 0x308 irq 5 drq 1	# Archive and Wangtek QIC tape drives
@


1.114.2.11
log
@Add French, German and Norvegian keyboard options (bouyer)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.114.2.10 1998/05/05 08:10:38 mycroft Exp $
a128 5
# Keyboard layout configuration for pccons
#options 	FRENCH_KBD
#options 	GERMAN_KBD
#options 	NORVEGIAN_KBD
  
@


1.113
log
@Comment out pseudo-device rnd, mention options RND_COM, and mark experiemntal
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.112 1997/10/19 20:14:21 perry Exp $
d430 1
a430 1
#options 	RND_COM			# use "com" randomness as well
@


1.112
log
@Yet Another Massive Reorganization. I took the last reorg even
further. Devices are grouped by types and within the types segregated
by bus. Lots of comments fixed up, lots of nits cleaned. Extensive
comments from Jason and Charles incorporated.

We also really need an automatic way to generate INSTALL from GENERIC,
but that's a project for another day...
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.111 1997/10/19 00:00:18 perry Exp $
d426 3
d430 1
a430 1
pseudo-device	tb		1	# tablet line discipline
@


1.111
log
@typo: that -> than
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.110 1997/10/18 01:42:22 thorpej Exp $
d20 2
a21 1
#options 	DUMMY_NOPS	# speed hack; recommended
d120 4
a123 6
# These options enable verbose messages for autoconfiguration of
# the corresponding bus.  Warning, these may compile large string
# tables into the kernel!
options 	EISAVERBOSE	# verbose EISA device messages
options 	PCIVERBOSE	# verbose PCI device messages
options 	SCSIVERBOSE	# verbose SCSI error messages
d125 1
d140 3
d148 1
a148 13
# PCI devices
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI
bha*	at pci? dev ? function ?	# BusLogic 9xx SCSI
cy*	at pci? dev ? function ?	# Cyclades Cyclom-Y serial boards
de*	at pci? dev ? function ?	# DEC 21x4x-based Ethernet
en*	at pci? dev ? function ?	# ENI/Adaptec ATM
ep*	at pci? dev ? function ?	# 3Com 3c59x/3c90x Ethernet
fpa*	at pci? dev ? function ?	# DEC DEFPA FDDI
fxp*	at pci? dev ? function ?	# Intel EtherExpress PRO 10+/100B
isp*	at pci? dev ? function ?	# Qlogic ISP [12]0x0 SCSI/FibreChannel
le*	at pci? dev ? function ?	# PCnet-PCI Ethernet
ncr*	at pci? dev ? function ?	# NCR 53c8xx SCSI
ne*	at pci? dev ? function ?	# NE2000-compatible Ethernet
a151 1
tl*	at pci? dev ? function ?	# Thunderland-based Ethernet
a155 8
# EISA devices
ahb*	at eisa? slot ?			# Adaptec 174[02] SCSI
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI
bha*	at eisa? slot ?			# BusLogic 7xx SCSI
ep*	at eisa? slot ?			# 3Com 3c579 Ethernet
fea*	at eisa? slot ?			# DEC DEFEA FDDI
uha*	at eisa? slot ?			# UltraStor 24f SCSI

d160 22
a181 1
# ISA devices
a182 4
# ISA floppy, IDE, CD-ROM, and tape devices
fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
#fdc1	at isa? port 0x370 irq ? drq ?
fd*	at fdc? drive ?			# the drives themselves
d184 1
a184 3
wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
wdc1	at isa? port 0x170 irq 15
wd*	at wdc? drive ?			# the drives themsevles
d186 2
a187 1
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
d189 2
a190 4
# note: the wt driver conflicts unpleasantly with ed devices at the
# same I/O address. The probe reprograms their eeproms. Don't
# uncomment it unless you are actually using it.
#wt0	at isa? port 0x300 irq 5 drq 1	# Archive and Wangtek QIC tape drives
d192 2
a193 12
# ISA SCSI controllers
aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI
aha1	at isa? port 0x334 irq ? drq ?
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI
aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI
bha1	at isa? port 0x334 irq ? drq ?
sea0	at isa? iomem 0xc8000 irq 5	# Seagate/Future Domain SCSI
uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI
uha1	at isa? port 0x334 irq ? drq ?
wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
wds1	at isa? port 0x358 irq 11 drq 5
d197 1
a197 1
com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
a208 3
# ISA console.  You can only configure one of these!
pc0	at isa? port 0x60 irq 1		# pccons generic PC console driver
#vt0	at isa? port 0x60 irq 1		# PCVT console driver
d210 1
a210 34
# ISA mice
lms0	at isa? port 0x23c irq 5	# Logitech bus mouse
lms1	at isa? port 0x238 irq 5
mms0	at isa? port 0x23c irq 5	# Microsoft InPort mouse
mms1	at isa? port 0x238 irq 5
#pms0	at pckbd? irq 12		# PS/2 auxiliary port mouse

# ISA audio devices
gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
pss0	at isa? port 0x220 irq 7 drq 6  	# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
sb0	at isa? port 0x220 irq 7 drq 1 drq2 5	# SoundBlaster
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System

# ISA network interfaces
ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC and 3C503
ed1	at isa? port 0x250 iomem 0xd8000 irq 9	#   ethernet cards
ed2	at isa? port 0x300 iomem 0xcc000 irq 10
#eg0	at isa? ...				# 3C505 ethernet cards
el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
ep0	at isa? port ? irq ?			# 3C509 ethernet cards
fe0	at isa? port 0x2a0 irq ?		# AT1700
ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN and 3C507
ie1	at isa? port 0x300 irq 10		# EtherExpress
iy0	at isa? port ? irq ?			# EtherExpress PRO 10 ISA
lc0	at isa? port ? iomem ? irq ?		# DEC EtherWORKS III (LEMAC)
#le0	at isa? port 0x320 irq 10 drq 7		# IsoLan, NE2100, and DEPCA
ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
ne1	at isa? port 0x300 irq 10

# ISA PCMCIA controllers
pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
d212 1
a212 1
# ISA misc. devices
a216 2
# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1
d218 1
a218 2
# Joystick driver. Probe is a little strange; add only if you have one.
#joy0	at isa? port 0x201
d220 5
a224 1
#spkr0	at pckbd? port 0x61		# PC speaker
d226 5
a230 4
npx0	at isa? port 0xf0 irq 13	# x86 math coprocessor

# ISA Plug-and-Play support
isapnp0	at isa?
d232 1
a232 12
# ISA Plug-and-Play devices
com*	at isapnp?			# Modems and serial boards
ep*	at isapnp?			# 3Com 3c509 Ethernet
guspnp*	at isapnp?			# Gravis Ultra Sound PnP audio
joy*	at isapnp?			# Game ports (usually on audio cards)
ne*	at isapnp?			# NE2000-compatible Ethernet
sb*	at isapnp?			# SoundBlaster-compatible audio

# PCMCIA bus support
pcmcia*	at pcic? controller ? socket ?

# PCMCIA devices
a233 4
com*	at pcmcia? function ?		# Modems and serial cards
ep*	at pcmcia? function ?		# 3Com 3c589 and 3c562 Ethernet
ne*	at pcmcia? function ?		# NE2000-compatible Ethernet
sm*	at pcmcia? function ?		# Megahertz Ethernet
d235 12
a246 7
# Audio support
audio*	at gus?
audio*	at guspnp?
audio*	at pas?
audio*	at sb?
audio*	at sp?
audio*	at wss?
d268 10
d284 61
d348 1
a348 1
# MII PHY devices
d352 52
d407 9
a415 1
# Pseudo devices
a416 1
pseudo-device	ccd		4	# concatenated/striped disk devices
a418 1
pseudo-device	md		1	# memory disk device (ramdisk)
d420 5
a426 2
pseudo-device	sl		2	# Serial Line IP
pseudo-device	strip		2	# Starmode Radio IP (Metricom)
a427 2
pseudo-device	tun		2	# network tunneling over tty
pseudo-device	vnd		4	# disk-like interface to files
@


1.110
log
@Major cleanup of the GENERIC config file.  The devices are laid out in
a more readable manner now, and sorted by bus type.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.109 1997/10/17 19:25:36 bouyer Exp $
d31 1
a31 1
# values.  Note that the BIOS may *correctly* report less that 640k of base
@


1.109
log
@Add tl and mii devices.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.108 1997/10/17 07:27:02 thorpej Exp $
d8 4
a11 1
options 	I386_CPU	# CPU classes; at least one is REQUIRED
d14 3
a16 1
options 	I686_CPU
d20 8
d37 4
a40 3
#options 	DUMMY_NOPS	# speed hack; recommended
options 	XSERVER,UCONSOLE
options 	INSECURE	# insecure; allow /dev/mem writing for X
a41 1
maxusers	32		# estimated number of users
a44 5
options 	DDB		# in-kernel debugger
#options 	KGDB		# remote debugger
#options 	"KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
#makeoptions	DEBUG="-g"	# compile full symbol table
options 	DIAGNOSTIC	# internal consistency checks
a45 1
options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
d52 12
a69 1
options 	TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
d76 1
d79 1
a79 2
options 	LKM		# loadable kernel modules

d95 1
d101 1
a101 1

d110 4
d116 2
a117 2
config		netbsd	root on ? type ?
#options 	"CONSDEVNAME=\"com\"",CONADDR=0x3f8,CONSPEED=9600
d119 3
d125 10
d138 1
a138 2
pci0	at mainbus0 bus ?
eisa0	at mainbus0
d140 3
a142 1
ppb*	at pci? dev ? function ?	# PCI-PCI bridges
d144 14
a158 1
pci*	at pchb?
d160 17
d178 10
a187 3
isa*	at pcib?			# ISA on PCI-ISA bridge
isa*	at mainbus0			# all other ISA
isapnp0	at isa?				# ISA Plug-and-Play
d189 1
a189 1
#apm0	at mainbus0			# Advanced power management
d191 4
a194 1
npx0	at isa? port 0xf0 irq 13	# math coprocessor
d196 12
a207 2
pc0	at isa? port 0x60 irq 1		# generic PC console device
#vt0	at isa? port 0x60 irq 1
d209 1
a220 1
com*	at isapnp?
a221 1
#cy*	at pci? dev ? function ?	# Cyclades serial cards
d223 3
a225 3
lpt0	at isa? port 0x378 irq 7	# standard PC parallel ports
lpt1	at isa? port 0x278
lpt2	at isa? port 0x3bc
d227 1
d234 7
a240 53
aha0	at isa? port 0x330 irq ? drq ?	# Adaptec 154[02] SCSI controllers
aha1	at isa? port 0x334 irq ? drq ?	# Adaptec 154[02] SCSI controllers
scsibus* at aha?
ahb*	at eisa? slot ?			# Adaptec 174[024] SCSI controllers
scsibus* at ahb?
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI controllers
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI controllers
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI controllers
scsibus* at ahc?
aic0	at isa? port 0x340 irq 11	# Adaptec 152[02] SCSI controllers
scsibus* at aic?
bha0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
bha1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
bha*	at eisa? slot ?
bha*	at pci? dev ? function ?
scsibus* at bha?
ncr*	at pci? dev ? function ?	# NCR 538XX SCSI controllers
scsibus* at ncr?
sea0	at isa? iomem 0xc8000 irq 5
scsibus* at sea?
uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
uha1	at isa? port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
uha*	at eisa? slot ?			# UltraStor 24f SCSI controllers
scsibus* at uha?
wds0	at isa? port 0x350 irq 15 drq 6	# WD7000 and TMC-7000 controllers
wds1	at isa? port 0x358 irq 11 drq 5
scsibus* at wds?
isp*	at pci? dev ? function ?	# Qlogic ISP 10x0 SCSI controllers
scsibus* at isp?

sd*	at scsibus? target ? lun ?	# SCSI disk drives
st*	at scsibus? target ? lun ?	# SCSI tape drives
cd*	at scsibus? target ? lun ?	# SCSI CD-ROM drives
ch*	at scsibus? target ? lun ?	# SCSI autochangers
ss*	at scsibus? target ? lun ?	# SCSI scanners
uk*	at scsibus? target ? lun ?	# SCSI unknown

fdc0	at isa? port 0x3f0 irq 6 drq 2	# standard PC floppy controllers
#fdc1	at isa? port 0x370 irq ? drq ?
fd*	at fdc? drive ?

#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives

wdc0	at isa? port 0x1f0 irq 14	# ST506, ESDI, and IDE controllers
wdc1	at isa? port 0x170 irq 15
wd*	at wdc? drive ?
atapibus* at wdc?
cd*	at atapibus? drive ?

# note: the wt driver conflicts unpleasantly with ed devices at the
# same I/O address. The probe reprograms their eeproms. Don't
# uncomment it unless you are actually using it.
#wt0	at isa? port 0x300 irq 5 drq 1	# Archive and Wangtek QIC tape drives
d242 1
a248 1
ep*	at isapnp?
d252 2
a254 1
lc0	at isa? port ? iomem ? irq ?		# DEC EtherWORKS III (LEMAC)
a256 15
ne*	at isapnp?
ep*	at eisa? slot ?				# 3C579 ethernet cards
fea*	at eisa? slot ?				# DEC DEFEA FDDI cards
le*	at pci? dev ? function ?		# PCnet-PCI based ethernet cards
de*	at pci? dev ? function ?		# DC21X4X-based ethernet cards
ep*	at pci? dev ? function ?		# 3C59x/3C90x ethernet cards
fpa*	at pci? dev ? function ?		# DEC DEFPA FDDI cards
fxp*	at pci? dev ? function ?		# Intel EEPRO 10/100B
ne*	at pci? dev ? function ?		# NE2000-compatible eth cards
tl* at pci? dev ? function ?        # Thunderland-based ethernet card
mii* at tl?

# MII devices
tlphy* at mii? dev ?
nsphy* at mii? dev ?    
d258 8
a265 3
pss0	at isa? port 0x220 irq 7 drq 6  	# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
audio*	at sp0
d267 2
a268 12
sb0	at isa? port 0x220 irq 7 drq 1 drq2 5	# SoundBlaster
sb*	at isapnp?
audio*	at sb?
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
audio*	at wss0
pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
audio*	at pas0
gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
audio*	at gus0
guspnp*	at isapnp?				# Gravis Ultra Sound PnP
audio*	at guspnp?
#spkr0	at pckbd? port 0x61
a271 1
joy*	at isapnp?
d273 3
a275 2
# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1
d277 2
a278 1
# PCMCIA controllers, sockets, and devices.
d280 7
a286 2
pcic0	at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
pcic1	at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
d288 1
d291 47
a337 5
ep*	at pcmcia? function ?
ne*	at pcmcia? function ?
sm*	at pcmcia? function ?
com*	at pcmcia? function ?
aic*	at pcmcia? function ?
d339 1
d342 8
a349 11
pseudo-device	loop	1		# network loopback
pseudo-device	bpfilter 8		# packet filter
pseudo-device	sl	2		# CSLIP
pseudo-device	ppp	2		# PPP
pseudo-device	tun	2		# network tunneling over tty
#pseudo-device	ipfilter		# IP filter

pseudo-device	pty	64		# pseudo-terminals
pseudo-device	tb	1		# tablet line discipline
pseudo-device	vnd	4		# paging to files
pseudo-device	ccd	4		# concatenated disk devices
d351 5
@


1.108
log
@Add "ne" and "com" isapnp attachments.  Move the fe0 declaration to a
more logical location.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.107 1997/10/17 07:08:55 enami Exp $
d224 6
@


1.107
log
@Use lowercase for hexdigit.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.106 1997/10/17 07:07:26 enami Exp $
d133 1
d208 1
d215 1
a222 1
fe0	at isa? port 0x2a0 irq ?		# AT1700
@


1.106
log
@Use TAB to separate `cd*' and `at'.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.105 1997/10/16 23:32:35 thorpej Exp $
d249 2
a250 2
pcic0	at isa? port 0x3E0 iomem 0xd0000 iosiz 0x4000
pcic1	at isa? port 0x3E2 iomem 0xd4000 iosiz 0x4000
@


1.105
log
@Pull marc-pcmcia branch down from trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86.2.8 1997/10/16 10:54:01 enami Exp $
d193 1
a193 1
cd* at atapibus? drive ?
@


1.104
log
@Add ISA and PCI "ne" instances as appropriate.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.103 1997/10/13 00:46:27 explorer Exp $
d246 13
@


1.103
log
@o Make usage of /dev/random dependant on
  pseudo-device   rnd                     # /dev/random and in-kernel generator
  in config files.

o Add declaration to all architectures.

o Clean up copyright message in rnd.c, rnd.h, and rndpool.c to include
  that this code is derived in part from Ted Tyso's linux code.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.102 1997/10/08 10:09:38 mycroft Exp $
d200 1
a200 1
ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC, 3C503, and NE[12]000
d211 2
d221 1
@


1.102
log
@Clump USER_LDT with other CPU-related options.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.101 1997/10/08 09:32:37 mycroft Exp $
d257 1
@


1.101
log
@Update comments regarding BIOSEXTMEM (now REALEXTMEM), and add REALBASEMEM.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.100 1997/10/07 10:39:56 augustss Exp $
d13 2
a14 1
#options 	VM86		# Virtual 8086 emulation
a59 1
options 	USER_LDT	# user-settable LDT; used by WINE
@


1.100
log
@Add GUS PnP card to GENERIC.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.99 1997/09/12 05:22:55 mycroft Exp $
d15 7
a21 4
# Some BIOSes don't get the size of extended memory right.  If you
# have a broken BIOS, uncomment the following and set the value
# properly for your system.
#options 	BIOSEXTMEM=...	# size of extended memory
@


1.99
log
@Add fe0.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.98 1997/08/28 08:00:12 mikel Exp $
d230 2
@


1.98
log
@add KMEMSTATS and sync GENERIC, INSTALL, and DISKLESS
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.97 1997/08/27 11:23:43 bouyer Exp $
d215 1
@


1.97
log
@Merge scsipi branch in the mainline. This add support for ATAPI devices
(currently only CD-ROM drives on i386). The sys/dev/scsipi system provides 2
busses to which devices can attach (scsibus and atapibus). This needed to
change some include files and structure names in the low level scsi drivers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.82.2.6 1997/08/27 08:10:37 bouyer Exp $
d33 2
a34 1
options 	KTRACE		# system call tracing, a la ktrace(1)
d95 1
a95 1
options 	SCSIVERBOSE	# Verbose SCSI errors
@


1.96
log
@XXX Add a drq2 locator for the ISA bus.  Many sound cards need
two DMA channels to do e.g. full-duplex.  This allows
a way of specifying the second channel in a sane way.
THIS IS TEMPORARY.  The drq2 locator will go away when
the locator system has been changed to allow multiple
values per locator.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.95 1997/08/26 18:39:02 fvdl Exp $
d188 2
@


1.95
log
@Activate SCSIVERBOSE by default.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.94 1997/08/23 14:25:55 drochner Exp $
d213 2
a214 2
pss0	at isa? port 0x220 irq 7 drq 6  # Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0	# 	sound port driver
d217 1
a217 1
sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
d220 1
a220 1
wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
d222 1
a222 1
pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
d224 1
a224 1
gus0	at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex)
@


1.94
log
@Update prototype options for serial console / KGDB for new reality.
"option\t" -> "option \t", as wished by Bernd Ernesti.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.93 1997/08/20 18:40:35 mjacob Exp $
d94 1
a94 1
#options 	SCSIVERBOSE	# Verbose SCSI errors
@


1.93
log
@add commented out reference SCSIVERBOSE option
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.92 1997/08/19 23:49:47 augustss Exp $
d30 1
a30 1
#options	"KGDB_DEVNAME=\"com0\"",KGDBRATE=9600
d90 1
a90 1
#options	"CONSDEVNAME=\"com0\"",CONSPEED=9600
d94 1
a94 1
#options	SCSIVERBOSE	# Verbose SCSI errors
@


1.92
log
@Change the MI audio driver so it attaches to the MD driver in the
normal way.  This requires adding a line to the config files to
get audio to work again.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.91 1997/08/15 21:44:31 perry Exp $
d94 1
@


1.91
log
@comment out APM -- it hurts some systems during install.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.90 1997/08/14 16:23:41 drochner Exp $
d214 1
d218 1
d220 1
d222 1
d224 1
@


1.90
log
@Add prototype definitions for serial console and KGDB.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.89 1997/08/03 21:59:11 perry Exp $
d110 1
a110 1
apm0	at mainbus0			# Advanced power management
@


1.89
log
@Add (commented out) COM_HAYESP option, per pr-2189 from John Vinopal
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.88 1997/08/03 05:26:35 mikel Exp $
d29 2
d90 1
a90 1
#options 	COMCONSOLE=0,CONADDR=0x3f8,CONUNIT=0,CONSPEED=9600
@


1.88
log
@order of devices in this file is irrelevant, so move isapnp0 up with
  other buses and pair isapnp devices with isa equivalents.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.87 1997/07/31 22:03:33 matt Exp $
d115 1
@


1.87
log
@Add lc0 entry for DEC EtherWORKS III.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86 1997/07/28 22:58:21 perry Exp $
d106 1
d127 1
a127 1
  
d196 1
d213 1
d221 1
a225 6
# PnP bus and devices should be declared last 
isapnp0	at isa? 
ep*	at isapnp?
sb*	at isapnp?
joy*	at isapnp?

d233 1
a233 1
#pseudo-device	ipfilter		# ip filter
@


1.86
log
@comment out mcd for now -- it causes people too much trouble during installs
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.85 1997/07/16 13:40:24 hpeyerl Exp $
d198 1
@


1.86.2.1
log
@added pcmcia infrastructure and a few devices
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86 1997/07/28 22:58:21 perry Exp $
a219 11

# PCMCIA controllers, sockets, and devices.

pcic0	at isa? port 0x3E0 iomem 0xd0000 iosiz 0x4000
pcic1	at isa? port 0x3E2 iomem 0xd4000 iosiz 0x4000

pcmcia*	at pcic? controller ? socket ?

ep*	at pcmcia? function ?
ed*	at pcmcia? function ?
com*	at pcmcia? function ?
@


1.86.2.2
log
@Update marc-pcmcia branch from trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86.2.1 1997/07/30 07:36:07 marc Exp $
a28 2
#options 	KGDB		# remote debugger
#options	"KGDB_DEVNAME=\"com0\"",KGDBRATE=9600
d88 1
a88 1
#options	"CONSDEVNAME=\"com0\"",CONSPEED=9600
a91 1
#options	SCSIVERBOSE	# Verbose SCSI errors
a105 1
isapnp0	at isa?				# ISA Plug-and-Play
d107 1
a107 1
#apm0	at mainbus0			# Advanced power management
a113 1
#options 	COM_HAYESP		# adds Hayes ESP serial board support
d126 1
a126 1

a194 1
ep*	at isapnp?
a197 1
lc0	at isa? port ? iomem ? irq ?		# DEC EtherWORKS III (LEMAC)
a207 1
audio*	at sp0
a209 2
sb*	at isapnp?
audio*	at sb?
a210 1
audio*	at wss0
a211 1
audio*	at pas0
a212 1
audio*	at gus0
a216 1
joy*	at isapnp?
d232 6
d245 1
a245 1
#pseudo-device	ipfilter		# IP filter
@


1.86.2.3
log
@Update marc-pcmcia branch from trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86.2.2 1997/08/23 07:08:49 thorpej Exp $
d30 1
a30 1
#options 	"KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
d90 1
a90 1
#options 	"CONSDEVNAME=\"com\"",CONADDR=0x3f8,CONSPEED=9600
d94 1
a94 1
options 	SCSIVERBOSE	# Verbose SCSI errors
a187 2
atapibus* at wdc?
cd* at atapibus? drive ?
d213 2
a214 2
pss0	at isa? port 0x220 irq 7 drq 6  	# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
d217 1
a217 1
sb0	at isa? port 0x220 irq 7 drq 1 drq2 5	# SoundBlaster
d220 1
a220 1
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
d222 1
a222 1
pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
d224 1
a224 1
gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
@


1.86.2.4
log
@Update marc-pcmcia branch from trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86.2.3 1997/08/27 22:24:13 thorpej Exp $
d33 1
a33 2
options 	KTRACE		# system call tracing via ktrace(1)
options 	KMEMSTATS	# kernel memory statistics (vmstat -m)
d94 1
a94 1
options 	SCSIVERBOSE	# verbose SCSI error messages
@


1.86.2.5
log
@Update marc-pcmcia branch from trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86.2.4 1997/09/01 20:10:00 thorpej Exp $
a214 1
fe0	at isa? port 0x2a0 irq ?		# AT1700
@


1.86.2.6
log
@Update marc-pcmcia branch from trunk, and add "ne" devices on ISA and PCI.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86.2.5 1997/09/16 03:48:30 thorpej Exp $
d13 1
a13 2
#options 	VM86		# virtual 8086 emulation
options 	USER_LDT	# user-settable LDT; used by WINE
d15 4
a18 7
# The following options override the memory sizes passed in from the boot
# block.  Use them *only* if the boot block is unable to determine the correct
# values.  Note that the BIOS may *correctly* report less that 640k of base
# memory if the extended BIOS data area is located at the top of base memory
# (as is the case on most recent systems).
#options 	REALBASEMEM=...	# size of base memory
#options 	REALEXTMEM=...	# size of extended memory
d56 1
d197 1
a197 1
ed0	at isa? port 0x280 iomem 0xd0000 irq 9	# WD/SMC and 3C503
a203 1
fe0	at isa? port 0x2a0 irq ?		# AT1700
a207 3
ne0	at isa? port 0x280 irq 9		# NE[12]000 Ethernet cards
ne1	at isa? port 0x250 irq 9
ne2	at isa? port 0x300 irq 10
d215 1
a215 1
ne*	at pci? dev ? function ?		# NE2000-compatible PCI cards
a229 2
guspnp*	at isapnp?				# Gravis Ultra Sound PnP
audio*	at guspnp?
d247 1
a247 2
ne*	at pcmcia? function ?
sm*	at pcmcia? function ?
a262 1
#pseudo-device	rnd			# /dev/random and in-kernel generator
@


1.86.2.7
log
@Sync w/ trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86.2.6 1997/10/14 09:05:42 thorpej Exp $
d207 1
d212 3
a214 2
ne0	at isa? port 0x280 irq 9		# NE[12]000 ethernet cards
ne1	at isa? port 0x300 irq 10
d222 1
a222 2
fe0	at isa? port 0x2a0 irq ?		# AT1700
ne*	at pci? dev ? function ?		# NE2000-compatible eth cards
@


1.86.2.8
log
@Add PCMCIA aic instances.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86.2.7 1997/10/14 23:35:08 thorpej Exp $
a257 1
aic*	at pcmcia? function ?
@


1.85
log
@Fix an oops on my part. I commented out some devices in my local copy
of this file.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.84 1997/07/13 19:33:29 hpeyerl Exp $
d178 1
a178 1
mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
@


1.84
log
@Satellite receiver driver for ISA cards from PlanetConnect by Jason and
Herb for Canada Connect Corp.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.83 1997/07/02 02:44:10 cjs Exp $
d178 1
a178 1
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
d206 2
a207 2
#pss0	at isa? port 0x220 irq 7 drq 6  # Personal Sound System
#sp0	at pss0 port 0x530 irq 10 drq 0	# 	sound port driver
d209 4
a212 4
#sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
#wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
#pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
#gus0	at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex)
d224 1
a224 1
#sb*	at isapnp?
@


1.83
log
@Update comments to show that ed driver on PCI works with 3c90x cards.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.82 1997/06/25 04:41:16 mellon Exp $
d178 1
a178 1
mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
d206 2
a207 2
pss0	at isa? port 0x220 irq 7 drq 6  # Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0	# 	sound port driver
d209 4
a212 4
sb0	at isa? port 0x220 irq 7 drq 1	# SoundBlaster
wss0	at isa? port 0x530 irq 10 drq 0	# Windows Sound System
pas0	at isa? port 0x220 irq 7 drq 1	# ProAudio Spectrum
gus0	at isa? port 0x220 irq 7 drq 1 flags 6 # Gravis Ultra Sound (flags is record drq for full-duplex)
d218 3
d224 1
a224 1
sb*	at isapnp?
@


1.82
log
@Adjust options statements so that if they are commented out or uncommented, it doesn't screw up indentation.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.81 1997/06/12 07:05:49 veego Exp $
d202 1
a202 1
ep*	at pci? dev ? function ?		# 3C590 ethernet cards
@


1.82.2.1
log
@Updates for new scsipi subsystem. Actally known to work on i386 and sparc.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.82 1997/06/25 04:41:16 mellon Exp $
a182 2
atapibus* at wdc?
cd* at atapibus? drive ?
@


1.82.2.2
log
@Update from trunck.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.82.2.1 1997/07/01 17:33:55 bouyer Exp $
a172 1
se0    at scsibus? target ? lun ?
d204 1
a204 1
ep*	at pci? dev ? function ?		# 3C59x/3C90x ethernet cards
a218 3

# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1
@


1.82.2.3
log
@Sync with trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.86 1997/07/28 22:58:21 perry Exp $
d179 1
a179 1
#mcd0	at isa? port 0x300 irq 10	# Mitsumi CD-ROM drives
@


1.82.2.4
log
@Sync with trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.89 1997/08/03 21:59:11 perry Exp $
a105 1
isapnp0	at isa?				# ISA Plug-and-Play
a113 1
#options 	COM_HAYESP		# adds Hayes ESP serial board support
d126 1
a126 1

a197 1
ep*	at isapnp?
a200 1
lc0	at isa? port ? iomem ? irq ?		# DEC EtherWORKS III (LEMAC)
a212 1
sb*	at isapnp?
a219 1
joy*	at isapnp?
d224 6
d237 1
a237 1
#pseudo-device	ipfilter		# IP filter
@


1.82.2.5
log
@Update from trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.94 1997/08/23 14:25:55 drochner Exp $
a28 2
#options 	KGDB		# remote debugger
#options 	"KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
d88 1
a88 1
#options 	"CONSDEVNAME=\"com\"",CONADDR=0x3f8,CONSPEED=9600
a91 1
#options 	SCSIVERBOSE	# Verbose SCSI errors
d108 1
a108 1
#apm0	at mainbus0			# Advanced power management
a214 1
audio*	at sp0
a217 1
audio*	at sb?
a218 1
audio*	at wss0
a219 1
audio*	at pas0
a220 1
audio*	at gus0
@


1.82.2.6
log
@Sync with trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.96 1997/08/26 19:26:38 augustss Exp $
d94 1
a94 1
options 	SCSIVERBOSE	# Verbose SCSI errors
d216 2
a217 2
pss0	at isa? port 0x220 irq 7 drq 6  	# Personal Sound System
sp0	at pss0 port 0x530 irq 10 drq 0		# 	sound port driver
d220 1
a220 1
sb0	at isa? port 0x220 irq 7 drq 1 drq2 5	# SoundBlaster
d223 1
a223 1
wss0	at isa? port 0x530 irq 10 drq 0	drq2 1	# Windows Sound System
d225 1
a225 1
pas0	at isa? port 0x220 irq 7 drq 1		# ProAudio Spectrum
d227 1
a227 1
gus0	at isa? port 0x220 irq 7 drq 1 drq2 6	# Gravis Ultra Sound
@


1.81
log
@Use '#options<SPACE><TAB>' for EXT2FS_SYSTEM_FLAGS and add the empty line
before '#options GATEWAY'.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.80 1997/06/11 21:05:41 perry Exp $
d8 6
a13 6
options		I386_CPU	# CPU classes; at least one is REQUIRED
options		I486_CPU
options		I586_CPU
options		I686_CPU
options		MATH_EMULATE	# floating point emulation
#options	VM86		# Virtual 8086 emulation
d18 1
a18 1
#options	BIOSEXTMEM=...	# size of extended memory
d20 3
a22 3
#options	DUMMY_NOPS	# speed hack; recommended
options		XSERVER,UCONSOLE
options		INSECURE	# insecure; allow /dev/mem writing for X
d25 2
a26 2
options		RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
#options	NTP		# NTP phase/frequency locked loop
d28 1
a28 1
options		DDB		# in-kernel debugger
d30 2
a31 2
options		DIAGNOSTIC	# internal consistency checks
options		KTRACE		# system call tracing, a la ktrace(1)
d33 9
a41 9
options		SYSVMSG		# System V-like message queues
options		SYSVSEM		# System V-like semaphores
options		SYSVSHM		# System V-like memory sharing
#options	SHMMAXPGS=1024	# 1024 pages is the default

options		COMPAT_NOMID	# compatibility with 386BSD, BSDI, NetBSD 0.8,
options		COMPAT_09	# NetBSD 0.9,
options		COMPAT_10	# NetBSD 1.0,
options		COMPAT_11	# NetBSD 1.1,
d43 2
a44 2
options		COMPAT_43	# and 4.3BSD
options		TCP_COMPAT_42	# TCP bug compatibility with 4.2BSD
d46 4
a49 4
options		COMPAT_SVR4	# binary compatibility with SVR4
options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
options		COMPAT_LINUX	# binary compatibility with Linux
options		COMPAT_FREEBSD	# binary compatibility with FreeBSD
d51 1
a51 1
options		EXEC_ELF32	# 32-bit ELF executables (SVR4, Linux)
d53 2
a54 2
options		USER_LDT	# user-settable LDT; used by WINE
options		LKM		# loadable kernel modules
d71 3
a73 3
options		QUOTA		# UFS quotas
options		NFSSERVER	# Network File System server
options		FIFO		# FIFOs; RECOMMENDED
d77 9
a85 9
#options	GATEWAY		# packet forwarding
options		INET		# IP + ICMP + TCP + UDP
#options	MROUTING	# IP multicast routing
options		NS		# XNS
#options	NSIP		# XNS tunneling over IP
options		ISO,TPIP	# OSI
options		EON		# OSI tunneling over IP
options		CCITT,LLC,HDLC	# X.25
#options	PFIL_HOOKS	# pfil(9) packet filter hooks
d88 1
a88 1
#options	COMCONSOLE=0,CONADDR=0x3f8,CONUNIT=0,CONSPEED=9600
@


1.80
log
@clean up the formatting of the ext2fs lines a bit.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.79 1997/06/11 10:54:53 bouyer Exp $
d74 1
a74 1
#options	EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
d76 1
@


1.79
log
@Add file-system ext2fs and related options.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.78 1997/06/05 02:27:44 thorpej Exp $
d57 1
a57 1
file-system 	EXT2FS	# second extended file system (linux)
d75 1
a75 1
								# immutable) behave as system flags.
@


1.78
log
@Add fxp* at pci? declarations.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.77 1997/06/02 00:26:49 perry Exp $
d57 1
d74 2
a75 1

@


1.77
log
@trivial reformat -- one space to a tab
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.76 1997/05/13 22:48:33 jtk Exp $
d201 1
@


1.76
log
@add pci* at pchb?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.75 1997/04/01 13:12:14 mycroft Exp $
d98 1
a98 1
pci* at pchb?
@


1.75
log
@Enable wdc1 at IRQ 15.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.74 1997/03/26 01:16:23 perry Exp $
d98 1
@


1.74
log
@Comment out the wt driver -- its rather dangerous to ed users, as it
turns out. Also, add a comment explaining this.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.73 1997/03/13 04:15:24 cgd Exp $
d177 1
a177 1
#wdc1	at isa? port 0x170 irq ?
@


1.73
log
@add entries for isp, as isp* at pci? dev ? function ?, for Qlogic ISP 10x0
PCI SCSI controllers.  Also, add the attached SCSI busses.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.72 1997/02/18 21:07:56 mrg Exp $
d180 4
a183 1
wt0	at isa? port 0x300 irq 5 drq 1	# Archive and Wangtek QIC tape drives
@


1.72
log
@comment PFIL_HOOKS as it is redundant (as an option) when used with ipfilter.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.71 1997/01/31 01:50:48 thorpej Exp $
d160 2
@


1.71
log
@Adopt for new file system and root spec grammar.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.70 1997/01/22 23:46:59 mycroft Exp $
d82 1
a82 2
#options	PFIL_HOOKS	# pfil(9) packet filter hooks (Required
				# if you enable the pseudo-device ipfilter)
@


1.71.4.1
log
@Merge in Changes from The Trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.71 1997/01/31 01:50:48 thorpej Exp $
d82 2
a83 1
#options	PFIL_HOOKS	# pfil(9) packet filter hooks
@


1.70
log
@ep* at isapnp?
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.69 1997/01/16 23:30:29 perry Exp $
d56 14
a69 1
options		FFS		# UFS
a70 4
options		LFS		# log-structured file system
options		MFS		# memory file system

options		NFSCLIENT	# Network File System client
a71 4

options		CD9660		# ISO 9660 + Rock Ridge file system
options		MSDOSFS		# MS-DOS file system
options		FDESC		# /dev/fd
a72 6
options		KERNFS		# /kern
options		NULLFS		# loopback file system
options		PORTAL		# portal filesystem (still experimental)
options		PROCFS		# /proc
options		UMAPFS		# NULLFS + uid and gid remapping
options		UNION		# union file system
d85 1
a85 2
config		netbsd	swap generic
options		GENERIC
@


1.69
log
@added options I686_CPU (commented or uncommented) per thorpej
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.68 1997/01/16 23:25:03 christos Exp $
d213 1
@


1.68
log
@Add Plug and Play devices
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.67 1997/01/15 01:28:45 perry Exp $
d11 1
@


1.67
log
@Eliminate obsolete TIMEZONE and DST options.
Eliminate obsolete global kernel variable "struct timezone tz"
Add RTC_OFFSET option
Add global kernel variable rtc_offset, which is initialized by
RTC_OFFSET at kernel compile time.
on i386, x68k, mac68k, pc532 and arm32, RTC_OFFSET indicates how many
minutes west (east) of GMT the hardware RTC runs. Defaults to 0.
Places where tz variable was used to indicate this in the past have
been replaced with rtc_offset.
Add sysctl interface to rtc_offset.
Kill obsolete DST_* macros in sys/time.h
gettimeofday now always returns zeroed timezone if zone is requested.
settimeofday now ignores and logs attempts to set non-existant kernel
timezone.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.66 1997/01/07 11:35:14 mrg Exp $
d209 5
@


1.66
log
@use pseudo-device ipfilter, not ipl.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.65 1997/01/07 08:01:32 veego Exp $
d24 1
a24 2
options		TIMEZONE=0	# time zone to adjust RTC time by
options		DST=0		# daylight savings time used by RTC
@


1.66.2.1
log
@Snapshot of work-in-progress, committed to private branch.

These changes implement machine-independent root device and file system
selection.  Notable features:

	- All ports behave in a consistent manner regarding root
	  device selection.
	- No more "options GENERIC"; all kernels have the ability
	  to boot with RB_ASKNAME to select root device and file system
	  type.
	- Root file system type can be wildcarded; a machine-independent
	  function will try all possible file systems for the selected
	  root device until one succeeds.
	- If the root file system fails to mount, the operator will
	  be given the chance to select a new root device and file
	  system type, rather than having the machine simply panic.
	- nfs_mountroot() no longer panics if any part of the NFS
	  mount process fails; it now returns an error, giving the
	  operator a chance to recover.
	- New, more consistent, config(8) grammar.  The constructs:

		config netbsd swap generic
		config netbsd root on nfs

	  have been replaced with:

		config netbsd root on ? type ?
		config netbsd root on ? type nfs

	  Additionally, the operator may select or wildcard root file
	  system type in the kernel configuration file:

		config netbsd root on cd0a type cd9660

	  config(8) now requires that a "root" specification be
	  made.  "root" may be wired down or wildcarded.  "swap" and
	  "dump" specifications are optional, and follow previous
	  semantics.

	- config(8) has a new "file-system" keyword, used to configure
	  file systems into the kernel.  Eventually, this will be used
	  to generate the default vfssw[].

	- "options NFSCLIENT" is obsolete, and is replaced by
	  "file-system NFS".  "options NFSSERVER" still exists, since
	  NFS server support is independent of the NFS file system
	  client.

	- sys/arch/<foo>/<foo>/swapgeneric.c is no longer used, and
	  will be removed; all information is now generated by config(8).

As of this commit, all ports except arm32 have been updated to use
the new setroot().  Only SPARC, i386, and Alpha ports have been
tested at this time.  Port masters should test these changes on their
ports, and report any problems back to me.

More changes are on their way, including RB_ASKNAME support in
nfs_mountroot() (to prompt for server address and path) and, potentially,
the ability to select rarp/bootparam or bootp in nfs_mountroot().
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.66 1997/01/07 11:35:14 mrg Exp $
d56 4
a59 13
file-system 	FFS		# UFS
file-system 	LFS		# log-structured file system
file-system 	MFS		# memory file system
file-system 	NFS		# Network File System client
file-system 	CD9660		# ISO 9660 + Rock Ridge file system
file-system 	MSDOSFS		# MS-DOS file system
file-system 	FDESC		# /dev/fd
file-system 	KERNFS		# /kern
file-system 	NULLFS		# loopback file system
file-system 	PORTAL		# portal filesystem (still experimental)
file-system 	PROCFS		# /proc
file-system 	UMAPFS		# NULLFS + uid and gid remapping
file-system 	UNION		# union file system
d61 1
a61 1
options		QUOTA		# UFS quotas
d63 4
d68 6
d86 2
a87 1
config		netbsd	root on ? type ?
@


1.66.2.2
log
@Update from trunk.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.69 1997/01/16 23:30:29 perry Exp $
a10 1
options		I686_CPU
d24 2
a25 1
options		RTC_OFFSET=0	# hardware clock is this many mins. west of GMT
a207 5

# PnP bus and devices should be declared last 
isapnp0	at isa? 
sb*	at isapnp?
joy*	at isapnp?
@


1.66.2.3
log
@update from trunk
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.66.2.2 1997/01/18 04:14:42 thorpej Exp $
a210 1
ep*	at isapnp?
@


1.65
log
@Add the pseudo-device for ipl and PFIL_HOOKS which is required for ipl.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.64 1996/12/07 00:26:02 thorpej Exp $
d84 1
a84 1
				# if you enable the pseudo-device ipl).
d218 1
a218 1
#pseudo-device	ipl 			# ip filter
@


1.64
log
@s/EXTMEM_SIZE/BIOSEXTMEM/
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.63 1996/11/28 03:15:19 thorpej Exp $
d83 2
d218 1
@


1.63
log
@Update for pchb and pcib drivers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.62 1996/11/16 01:16:40 fvdl Exp $
d17 1
a17 1
#options	EXTMEM_SIZE=...	# size of extended memory
@


1.62
log
@Move VNODEPAGER and DEVPAGER to std.i386 as well.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.61 1996/11/15 09:19:33 fvdl Exp $
d88 3
d93 1
a93 1
isa0	at mainbus0
a94 3
pci0	at mainbus0 bus ?

apm0	at mainbus0			# Advanced power management
d98 7
@


1.61
log
@Move non-optional options to std.i386, and use that file.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.60 1996/10/02 23:56:43 mycroft Exp $
a26 3

options		VNODEPAGER	# mmap() of files
options		DEVPAGER	# mmap() of devices
@


1.60
log
@Add examples of NTP, MROUTING, and serial console.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.59 1996/10/02 22:20:52 mycroft Exp $
d6 1
a6 1
machine		i386		# architecture, used by config; REQUIRED
a21 1
options		MACHINE_NONCONTIG
a27 1
options		SWAPPAGER	# paging; REQUIRED
a53 2
options		EXEC_SCRIPT	# #! scripts
options		EXEC_AOUT	# a.out executables (native, BSD/OS, Linux, FreeBSD)
@


1.59
log
@Update to current reality.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.58 1996/09/24 19:10:41 christos Exp $
d27 1
d84 1
d93 1
@


1.58
log
@Fix the entries for the cyclades multiport serial cards, but leave commented
out, like the other multiport cards
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.57 1996/09/09 17:18:47 mycroft Exp $
d54 4
@


1.57
log
@Oops; include paths are relative to $S.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.56 1996/09/09 16:37:08 mycroft Exp $
d114 3
a116 3

#cy0	at isa? ...

@


1.56
log
@Add a file for local additions to GENERIC.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.55 1996/09/09 16:30:47 mycroft Exp $
d202 1
a202 1
include	"GENERIC.local"
@


1.55
log
@Add ss, uk.  Minor touchups.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.54 1996/08/31 20:43:56 mycroft Exp $
d201 2
@


1.54
log
@Oops.  Add patterns for PCI BusLogic cards.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.53 1996/08/31 20:39:17 mycroft Exp $
d46 1
a46 1
options 	COMPAT_12
d80 1
d159 2
@


1.53
log
@Update for BusLogic and UltraStor changes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.52 1996/08/26 23:39:57 mrg Exp $
d140 1
@


1.52
log
@add COMPAT_12.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.51 1996/08/25 23:39:27 jtk Exp $
d137 4
a140 4
bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
bt2	at isa? port ? irq ?
scsibus* at bt?
d147 1
a147 1
uha2	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
@


1.51
log
@add Advanced Power Management driver
Includes bootstrap support from FreeBSD (Tatsumi HOSOKAWA and <ukai>)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.50 1996/08/05 21:15:58 soda Exp $
d46 1
@


1.50
log
@adding AHA-284x VL front-end to ahc driver by Jason Thorpe.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.49 1996/07/14 00:10:11 explorer Exp $
d91 2
@


1.49
log
@Suggestion from Noriyuki Soda <soda@@sra.co.jp> to update the comments for
these files, since the driver was updated to deal with more devices.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
d128 1
@


1.48
log
@document PORTAL
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.47 1996/05/20 03:32:16 thorpej Exp $
d128 2
a129 2
ahc*	at eisa? slot ?			# Adaptec 284x SCSI controllers
ahc*	at pci? dev ? function ?	# Adaptec 2940 SCSI controllers
@


1.48.2.1
log
@Fix support for the Adaptec 284x VLbus SCSI cards, massaged for the
NetBSD-1.2 release branch by Noriyuki Soda <soda@@sra.co.jp>.
(`sys/arch/i386/isa/ahc_isa.c' tagged separately.)
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.48 1996/05/20 18:17:23 mrg Exp $
d128 2
a129 3
ahc0	at isa? port ? irq ?		# Adaptec 284x SCSI controllers
ahc*	at eisa? slot ?			# Adaptec 274x, aic7770 SCSI controllers
ahc*	at pci? dev ? function ?	# Adaptec [23]94x, aic78x0 SCSI controllers
@


1.47
log
@Remove references to the "ahe" device, and add ahc at eisa.  Lingering
junk pointed out by Greg Earle <earle@@isolar.Tujunga.CA.US>.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.46 1996/05/20 00:50:33 thorpej Exp $
d71 1
a71 1
options		PORTAL		# ?
@


1.46
log
@Add the DEFEA EISA FDDI controller to the catch-all kernels.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.45 1996/05/07 00:59:53 thorpej Exp $
d128 1
a130 2
ahe0	at isa? port 0x1c00 irq ?	# Adaptec 284x SCSI controllers
scsibus* at ahe?
@


1.45
log
@Add the DEC DEFPA FDDI interface to the catch-all kernel configs.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.44 1996/04/25 20:14:13 scottr Exp $
d177 1
@


1.44
log
@Add ie1, appropriate for EtherExpress support
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.43 1996/04/25 18:59:14 thorpej Exp $
d180 1
@


1.43
log
@Document the VM86 option by adding it to the GENERIC* kernel config
files.  Note, the option is disabled by default (comment out).  This
is meant as an example for others.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.42 1996/04/25 02:23:38 thorpej Exp $
d173 2
a174 1
ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN, 3C507, and Etherexpress
@


1.42
log
@Break up the ep driver into isa, eisa, and pci front-ends and a
bus-independent core driver.  Tested on all three bus types, including
an isa 3c509 masquerading as an eisa device (use ep* at eisa? slot ? in
your kernel config file to catch this one).
XXX Driver still needs to be converted to <machine/bus.h>
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.41 1996/04/21 20:55:28 ghudson Exp $
d12 1
@


1.41
log
@aic0 belongs at IRQ 11 (the card default); the entry was apparently
changed to 12 by mistake when GENERIC was created after NetBSD 1.0.
Change confirmed by Perry and several others.  Fixes PR 1878.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.40 1996/03/30 23:57:09 perry Exp $
d174 1
@


1.40
log
@Added (commented out) line for joystick driver.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.39 1996/03/30 05:42:45 mycroft Exp $
d131 1
a131 1
aic0	at isa? port 0x340 irq 12	# Adaptec 152[02] SCSI controllers
@


1.39
log
@Add wds0 and wds1 to generic kernels.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.38 1996/03/25 05:45:18 perry Exp $
d186 3
@


1.38
log
@Add COMPAT_11 option.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.37 1996/03/18 01:46:37 jtk Exp $
d145 3
@


1.37
log
@updated spkr attachment to use new pckbd attribute
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.36 1996/03/16 06:09:03 thorpej Exp $
d44 1
@


1.36
log
@Change the PS/2 mouse driver to be a child of the "pckbd" attribute,
which represents the "keyboard controller".  Give "pc" and "vt" drivers
the "pckbd" attribute.  In pcattach() (pccons and pcvt), attach children
of the keyboard controller.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.35 1996/03/12 01:32:47 perry Exp $
d181 1
a181 1
#spkr0	at isa? port 0x61
@


1.35
log
@close prs #2076 and #2159: Install kernels have had DIAGNOSTIC and
KTRACE removed to make them fit on the floppies. All kernels have had
the comment typo "internally consistency" changed to "internal consistency".
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.34 1996/03/10 09:03:17 cgd Exp $
d119 1
a119 1
#pms0	at isa? port 0x60 irq 12	# PS/2 auxiliary port mouse
@


1.34
log
@update for new commulti->com attach interface.  com ports at 'ast'
multiport cards no longer need 'flags 1', because the "don't set IEN"
requirement is communicated by the commulti_attach_args.  com.c no longer
recognizes 'flags 1' at all.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.33 1996/03/07 00:48:36 jtk Exp $
d33 1
a33 1
options		DIAGNOSTIC	# internally consistency checks
@


1.33
log
@speaker device uses a port, so declare it as such in all the config
files
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.32 1996/03/05 01:32:14 thorpej Exp $
d103 1
a103 1
#com*	at ast? slave ? flags 1
@


1.32
log
@Add a blurb about the EXTMEM_SIZE option to the example kernels, disabled
by default.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.31 1996/03/04 03:25:52 cgd Exp $
d181 1
a181 1
#spkr0	at isa? ...
@


1.31
log
@Attach isa, eisa, and pci to mainbus now, rather than root.  The i386
now has a single device tree (rather than a forest).  Also, attach
EISA only if it's present, and attach in order: PCI, EISA, ISA (most
specific to least specific).
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.30 1996/02/28 02:02:32 cgd Exp $
d12 5
@


1.30
log
@pci devices are now specified like "foo* at pci? dev ? function ?".  also,
add support for PPB's and secondary PCI busses, where appropriate.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.29 1996/02/27 00:06:53 cgd Exp $
d79 5
a83 3
isa0	at root
eisa0	at root
pci0	at root
@


1.29
log
@update for new EISA autoconfiguration: there can now be an eisa0 at root,
and ahb attaches to eisa, not isa.  Also, ahb* at eisa?... is now supported,
so you can get all ahb's configured easily.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.28 1996/01/13 02:05:24 thorpej Exp $
d83 3
d119 1
a119 1
ahc*	at pci? bus ? dev ?		# Adaptec 2940 SCSI controllers
d129 1
a129 1
ncr*	at pci? bus ? dev ?		# NCR 538XX SCSI controllers
d163 3
a165 3
le*	at pci? bus ? dev ?			# PCnet-PCI based ethernet cards
de*	at pci? bus ? dev ?			# DC21X4X-based ethernet cards
ep*	at pci? bus ? dev ?			# 3C590 ethernet cards
@


1.28
log
@Add the "ahe" driver, autoconfiguration support for the aic7xxx-based
Adaptec 2[78]4x SCSI controllers, from Michael Graff <explorer@@flame.org>.
Fixes PR #1594 from Noriyuki Soda <soda@@sra.co.jp> in a different way.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.27 1995/12/24 00:22:20 neil Exp $
d80 1
d114 1
a114 1
ahb0	at isa? port ? irq ?		# Adaptec 174[024] SCSI controllers
@


1.27
log
@Added ccd pseudo-device.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.26 1995/12/14 01:09:59 tls Exp $
d117 2
@


1.26
log
@add 3C590 support to all generic and install kernels
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.25 1995/11/30 00:58:14 jtc Exp $
d179 1
@


1.25
log
@merge in changes from 1.1 release branch
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.24 1995/11/10 19:34:54 christos Exp $
a154 1
ep*	at pci? bus ? dev ?			# 3C590 ethernet cards
d157 3
a159 2
le*	at pci? bus ? dev ?
de*	at pci? bus ? dev ?
@


1.24
log
@Add a config line for 3c590 ethernet cards
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.23 1995/10/10 01:29:15 mycroft Exp $
d158 1
@


1.23
log
@Add ahc and COMPAT_FREEBSD.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.22 1995/10/03 20:18:58 mycroft Exp $
d155 1
@


1.23.2.1
log
@fix missing devices etc. but INSTALL still won't go on a floppy, even minus sea0... LKM or KTRACE may need to go.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.23 1995/10/10 01:29:15 mycroft Exp $
a156 1
le*	at pci? bus ? dev ?
@


1.22
log
@Undo accidental deletions in last commit.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.21 1995/09/14 12:46:42 hpeyerl Exp $
d45 1
d115 2
@


1.21
log
@update comment to include Etherexpress.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.20 1995/08/22 19:43:14 jtc Exp $
d71 3
d112 16
@


1.20
log
@recommanded -> recommended; PR #1395
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.19 1995/07/24 03:33:12 mycroft Exp $
a70 3
options		ISO,TPIP	# OSI
options		EON		# OSI tunneling over IP
options		CCITT,LLC,HDLC	# X.25
a108 16
ahb0	at isa? port ? irq ?		# Adaptec 174[024] SCSI controllers
scsibus* at ahb?
aic0	at isa? port 0x340 irq 12	# Adaptec 152[02] SCSI controllers
scsibus* at aic?
bt0	at isa? port 0x330 irq ? drq ?	# BusLogic [57]4X SCSI controllers
bt1	at isa? port 0x334 irq ? drq ?	# BusLogic [57]4X SCSI controllers
bt2	at isa? port ? irq ?
scsibus* at bt?
ncr*	at pci? bus ? dev ?		# NCR 538XX SCSI controllers
scsibus* at ncr?
sea0	at isa? iomem 0xc8000 irq 5
scsibus* at sea?
uha0	at isa? port 0x330 irq ? drq ?	# UltraStor [13]4f SCSI controllers
uha1	at isa? port 0x334 irq ? drq ?	# UltraStor [13]4f SCSI controllers
uha2	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
scsibus* at uha?
d133 1
a133 1
ie0	at isa? port 0x360 iomem 0xd0000 irq 7	# StarLAN & 3C507 ethernet cards
@


1.19
log
@Remove extraneous makeoptions declarations.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.18 1995/07/19 19:59:00 brezak Exp $
d13 1
a13 1
#options	DUMMY_NOPS	# speed hack; recommanded
@


1.18
log
@GUS audio driver from John Kohl.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.17 1995/06/24 20:39:40 christos Exp $
a7 2
makeoptions	CC="cc -Werror"

d150 1
a150 1
#el0	at isa? port 0x300 irq 9		# 3C501 ethernet cards
d154 1
a154 1
#de*	at pci? bus ? dev ?
@


1.17
log
@GENERIC: 		Add COMPAT_IBCS2 in too by default.
Makefile.`arch`:	- Add -lcompat
			- Change clean: target to be a double dep one,
			  so libraries can use the clean target too
			- Add genassym to the clean targets
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.16 1995/05/12 03:18:05 cgd Exp $
d164 1
@


1.16
log
@Split FFS,QUOTA line, comment each individually.
Add 'options INSECURE' so that the GENERIC kernel is happy with
X's linear mapping.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.15 1995/04/17 22:44:38 brezak Exp $
d45 1
a45 1
#options	COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.15
log
@Add config for PSS
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.14 1995/04/17 07:23:34 cgd Exp $
d17 1
d51 2
a52 1
options		FFS,QUOTA	# UFS and quotas
d130 1
@


1.14
log
@use CC="cc -Werror" for cc
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.13 1995/03/05 22:32:54 mycroft Exp $
d154 3
@


1.13
log
@Update to reflect the state of the world.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.12 1995/02/21 01:43:02 brezak Exp $
d7 2
@


1.12
log
@New audio subsystem
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.11 1995/01/25 04:58:18 cgd Exp $
d43 1
d151 1
@


1.11
log
@vn -> vnd renaming, for consistency.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.10 1995/01/16 12:23:50 mycroft Exp $
d152 2
@


1.10
log
@More updates to EISA stuff.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.9 1995/01/16 12:00:50 mycroft Exp $
d162 1
a162 1
pseudo-device	vn	4		# paging to files
@


1.9
log
@Update EISA stuff.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.8 1995/01/11 20:59:50 mycroft Exp $
d109 1
a109 1
ahb*	at isa? port ? irq ?		# Adaptec 174[024] SCSI controllers
d115 1
a115 1
bt*	at isa? port ? irq ?
d123 1
a123 1
uha*	at isa? port ? irq ?		# UltraStor 24f SCSI controllers
@


1.8
log
@Add boca, makeoptions.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.7 1994/12/11 16:20:52 mycroft Exp $
a75 1
eisa0	at root
d109 1
a109 1
ahb*	at eisa? slot ? irq ?		# Adaptec 174[024] SCSI controllers
d115 1
a115 1
bt*	at eisa? slot ? irq ?
d123 1
a123 1
uha*	at eisa? slot ? irq ?		# UltraStor 24f SCSI controllers
@


1.7
log
@Add `flags 1' to ast subdevices, as pointed out by John Kohl.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.6 1994/11/04 07:36:45 mycroft Exp $
d26 1
d88 1
a88 1
#ast0	at isa? port 0x1a0 irq 3	# AST 4-port serial cards
d90 2
@


1.6
log
@Comment out one option that doesn't quite work at the moment.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.5 1994/11/03 22:18:40 mycroft Exp $
d88 1
a88 1
#com*	at ast? slave ?
@


1.5
log
@Don't allow configuration of specific PCI function numbers.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.4 1994/11/03 20:12:09 mycroft Exp $
d41 1
a41 1
options		COMPAT_IBCS2	# binary compatibility with SCO and ISC
@


1.4
log
@Stylistic changes.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.3 1994/11/03 19:09:22 mycroft Exp $
d115 1
a115 1
ncr*	at pci? bus ? dev ? function ?	# NCR 538XX SCSI controllers
@


1.3
log
@pms0 would be at irq 12 if it existed.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.2 1994/11/03 18:27:13 mycroft Exp $
d117 2
d140 3
a142 3
ed0	at isa? port 0x280 irq 9 iomem 0xd0000	# WD/SMC, 3C503, and NE[12]000
ed1	at isa? port 0x250 irq 9 iomem 0xd8000	#   ethernet cards
ed2	at isa? port 0x300 irq 10 iomem 0xcc000
d146 1
a146 1
ie0	at isa? port 0x360 irq 7 iomem 0xd0000	# StarLAN & 3C507 ethernet cards
@


1.2
log
@Rearrange slightly.
@
text
@d1 1
a1 1
#	$NetBSD: GENERIC,v 1.1 1994/11/03 18:14:50 mycroft Exp $
d102 1
a102 1
#pms0	at isa? port 0x60 irq 5		# PS/2 auxiliary port mouse
@


1.1
log
@Make a real GENERIC config.
@
text
@d1 1
a1 1
#	$NetBSD: ALL,v 1.56 1994/10/27 04:14:46 cgd Exp $
d83 4
a91 4
com0	at isa? port 0x3f8 irq 4	# standard PC serial ports
com1	at isa? port 0x2f8 irq 3
com2	at isa? port 0x3e8 irq 5
#com3	at isa? port 0x2e8 irq 9
@