head	1.607;
access;
symbols
	RELENG_8_4:1.603.0.2
	RELENG_9_1_0_RELEASE:1.568.2.14.2.2
	RELENG_9_1:1.568.2.14.0.2
	RELENG_9_1_BP:1.568.2.14
	RELENG_8_3_0_RELEASE:1.531.2.21.2.1
	RELENG_8_3:1.531.2.21.0.2
	RELENG_8_3_BP:1.531.2.21
	RELENG_9_0_0_RELEASE:1.568.2.7.2.1
	RELENG_9_0:1.568.2.7.0.2
	RELENG_9_0_BP:1.568.2.7
	RELENG_9:1.568.0.2
	RELENG_9_BP:1.568
	RELENG_7_4_0_RELEASE:1.484.2.25.2.1
	RELENG_8_2_0_RELEASE:1.531.2.15.2.1
	RELENG_7_4:1.484.2.25.0.2
	RELENG_7_4_BP:1.484.2.25
	RELENG_8_2:1.531.2.15.0.2
	RELENG_8_2_BP:1.531.2.15
	RELENG_8_1_0_RELEASE:1.531.2.13.2.1
	RELENG_8_1:1.531.2.13.0.2
	RELENG_8_1_BP:1.531.2.13
	RELENG_7_3_0_RELEASE:1.484.2.24.2.1
	RELENG_7_3:1.484.2.24.0.2
	RELENG_7_3_BP:1.484.2.24
	RELENG_8_0_0_RELEASE:1.531.2.4.2.2
	RELENG_8_0:1.531.2.4.0.2
	RELENG_8_0_BP:1.531.2.4
	RELENG_8:1.531.0.2
	RELENG_8_BP:1.531
	RELENG_7_2_0_RELEASE:1.484.2.19.2.1
	RELENG_7_2:1.484.2.19.0.2
	RELENG_7_2_BP:1.484.2.19
	RELENG_7_1_0_RELEASE:1.484.2.15.2.1
	RELENG_6_4_0_RELEASE:1.439.2.21.2.1
	RELENG_7_1:1.484.2.15.0.2
	RELENG_7_1_BP:1.484.2.15
	RELENG_6_4:1.439.2.21.0.2
	RELENG_6_4_BP:1.439.2.21
	RELENG_7_0_0_RELEASE:1.484.2.2.2.1
	RELENG_6_3_0_RELEASE:1.439.2.18.2.1
	RELENG_7_0:1.484.2.2.0.2
	RELENG_7_0_BP:1.484.2.2
	RELENG_6_3:1.439.2.18.0.2
	RELENG_6_3_BP:1.439.2.18
	RELENG_7:1.484.0.2
	RELENG_7_BP:1.484
	RELENG_6_2_0_RELEASE:1.439.2.14
	RELENG_6_2:1.439.2.14.0.2
	RELENG_6_2_BP:1.439.2.14
	RELENG_5_5_0_RELEASE:1.421.2.13
	RELENG_5_5:1.421.2.13.0.2
	RELENG_5_5_BP:1.421.2.13
	RELENG_6_1_0_RELEASE:1.439.2.9.2.2
	RELENG_6_1:1.439.2.9.0.2
	RELENG_6_1_BP:1.439.2.9
	RELENG_6_0_0_RELEASE:1.439.2.6.2.1
	RELENG_6_0:1.439.2.6.0.2
	RELENG_6_0_BP:1.439.2.6
	RELENG_6:1.439.0.2
	RELENG_6_BP:1.439
	RELENG_5_4_0_RELEASE:1.421.2.11.2.1
	RELENG_5_4:1.421.2.11.0.2
	RELENG_5_4_BP:1.421.2.11
	RELENG_5_3_0_RELEASE:1.421.2.4.2.1
	RELENG_5_3:1.421.2.4.0.2
	RELENG_5_3_BP:1.421.2.4
	RELENG_5:1.421.0.2
	RELENG_5_BP:1.421
	RELENG_5_2_1_RELEASE:1.399.2.3
	RELENG_5_2_0_RELEASE:1.399.2.2
	RELENG_5_2:1.399.0.2
	RELENG_5_2_BP:1.399
	RELENG_5_1_0_RELEASE:1.386
	RELENG_5_1:1.386.0.2
	RELENG_5_1_BP:1.386
	old_RELENG_4_8_0_RELEASE:1.246.2.51.2.2
	old_RELENG_4_8:1.246.2.51.0.2
	old_RELENG_4_8_BP:1.246.2.51
	old_RELENG_5_0_0_RELEASE:1.369.2.2
	old_RELENG_5_0:1.369.0.2
	old_RELENG_5_0_BP:1.369
	old_RELENG_4_7_0_RELEASE:1.246.2.48
	old_RELENG_4_7:1.246.2.48.0.2
	old_RELENG_4_7_BP:1.246.2.48
	old_RELENG_4_6_2_RELEASE:1.246.2.43
	old_RELENG_4_6_1_RELEASE:1.246.2.43
	old_RELENG_4_6_0_RELEASE:1.246.2.43
	old_RELENG_4_6:1.246.2.43.0.2
	old_RELENG_4_6_BP:1.246.2.43
	old_RELENG_4_5_0_RELEASE:1.246.2.38
	old_RELENG_4_5:1.246.2.38.0.2
	old_RELENG_4_5_BP:1.246.2.38
	old_RELENG_4_4_0_RELEASE:1.246.2.34
	old_RELENG_4_4:1.246.2.34.0.2
	old_RELENG_4_4_BP:1.246.2.34
	old_KSE_MILESTONE_2:1.318
	old_KSE_PRE_MILESTONE_2:1.318
	old_RELENG_4_3_0_RELEASE:1.246.2.24
	old_RELENG_4_3:1.246.2.24.0.2
	old_RELENG_4_3_BP:1.246.2.24
	old_RELENG_4_2_0_RELEASE:1.246.2.20
	old_RELENG_4_1_1_RELEASE:1.246.2.11
	old_PRE_SMPNG:1.273
	old_RELENG_4_1_0_RELEASE:1.246.2.8
	old_RELENG_3_5_0_RELEASE:1.143.2.27
	old_RELENG_4_0_0_RELEASE:1.246
	old_RELENG_4:1.246.0.2
	old_RELENG_4_BP:1.246
	old_RELENG_3_4_0_RELEASE:1.143.2.24
	old_RELENG_3_3_0_RELEASE:1.143.2.22
	old_RELENG_3_2_PAO:1.143.2.12.0.2
	old_RELENG_3_2_PAO_BP:1.143.2.12
	old_RELENG_3_2_0_RELEASE:1.143.2.12
	old_POST_VFS_BIO_NFS_PATCH:1.167
	old_PRE_VFS_BIO_NFS_PATCH:1.167
	old_POST_SMP_VMSHARE:1.166
	old_PRE_SMP_VMSHARE:1.166
	old_POST_NEWBUS:1.162
	old_PRE_NEWBUS:1.161
	old_RELENG_3_1_0_RELEASE:1.143.2.2
	old_RELENG_3:1.143.0.2
	old_RELENG_3_BP:1.143
	old_RELENG_2_2_8_RELEASE:1.77.2.28
	old_RELENG_3_0_0_RELEASE:1.125
	old_RELENG_2_2_7_RELEASE:1.77.2.25
	old_PRE_NOBDEV:1.110
	old_POST_DEVFS_SLICE:1.107
	old_PRE_DEVFS_SLICE:1.107
	old_RELENG_2_2_6_RELEASE:1.77.2.22
	old_POST_SOFTUPDATE:1.107
	old_PRE_SOFTUPDATE:1.107
	old_POST_DPT:1.77.2.17
	old_PRE_DPT:1.77.2.16
	old_RELENG_2_2_5_RELEASE:1.77.2.12
	old_WOLLMAN_MBUF:1.91.0.2
	old_BP_WOLLMAN_MBUF:1.91
	old_RELENG_2_2_2_RELEASE:1.77.2.8
	old_post_smp_merge:1.90
	old_pre_smp_merge:1.90
	old_RELENG_2_2_1_RELEASE:1.77.2.4
	old_RELENG_2_2_0_RELEASE:1.77.2.4
	old_RELENG_2_1_7_RELEASE:1.46.2.19
	old_RELENG_2_1_6_1_RELEASE:1.46.2.19
	old_RELENG_2_1_6_RELEASE:1.46.2.19
	old_RELENG_2_2:1.77.0.2
	old_RELENG_2_2_BP:1.77
	old_RELENG_2_1_5_RELEASE:1.46.2.18
	old_wollman_polling:1.63.0.2
	old_RELENG_2_1_0_RELEASE:1.46.2.6
	old_RELENG_2_1_0:1.46.0.2
	old_RELENG_2_1_0_BP:1.46
	old_RELENG_2_0_5_RELEASE:1.45.2.3
	old_RELENG_2_0_5:1.45.0.2
	old_RELENG_2_0_5_BP:1.45
	old_RELENG_2_0_5_ALPHA:1.45
	old_OLAH_TTCP:1.20.0.2
	old_RELEASE_2_0:1.20
	old_BETA_2_0:1.20
	old_ALPHA_2_0:1.11.0.2;
locks; strict;
comment	@# @;


1.607
date	2013.07.07.00.29.29;	author svnexp;	state Exp;
branches;
next	1.606;

1.606
date	2013.05.25.00.29.03;	author svnexp;	state Exp;
branches;
next	1.605;

1.605
date	2013.04.13.00.34.37;	author svnexp;	state Exp;
branches;
next	1.604;

1.604
date	2013.04.05.00.25.42;	author svnexp;	state Exp;
branches;
next	1.603;

1.603
date	2013.03.05.00.59.05;	author svnexp;	state Exp;
branches
	1.603.2.1;
next	1.602;

1.602
date	2013.03.03.01.15.36;	author svnexp;	state Exp;
branches;
next	1.601;

1.601
date	2013.02.02.00.54.50;	author svnexp;	state Exp;
branches;
next	1.600;

1.600
date	2013.01.14.00.28.54;	author svnexp;	state Exp;
branches;
next	1.599;

1.599
date	2013.01.04.00.42.23;	author svnexp;	state Exp;
branches;
next	1.598;

1.598
date	2013.01.04.00.29.23;	author svnexp;	state Exp;
branches;
next	1.597;

1.597
date	2012.11.17.01.51.05;	author svnexp;	state Exp;
branches;
next	1.596;

1.596
date	2012.09.13.10.12.16;	author kib;	state Exp;
branches;
next	1.595;

1.595
date	2012.09.05.13.18.51;	author kib;	state Exp;
branches;
next	1.594;

1.594
date	2012.09.04.21.02.57;	author delphij;	state Exp;
branches;
next	1.593;

1.593
date	2012.08.26.01.21.02;	author gjb;	state Exp;
branches;
next	1.592;

1.592
date	2012.07.01.08.10.49;	author delphij;	state Exp;
branches;
next	1.591;

1.591
date	2012.06.19.07.34.13;	author np;	state Exp;
branches;
next	1.590;

1.590
date	2012.06.15.15.32.16;	author adrian;	state Exp;
branches;
next	1.589;

1.589
date	2012.06.15.02.16.29;	author adrian;	state Exp;
branches;
next	1.588;

1.588
date	2012.05.10.12.37.32;	author mav;	state Exp;
branches;
next	1.587;

1.587
date	2012.05.09.01.37.48;	author brooks;	state Exp;
branches;
next	1.586;

1.586
date	2012.04.20.21.37.42;	author brooks;	state Exp;
branches;
next	1.585;

1.585
date	2012.03.24.18.08.28;	author marius;	state Exp;
branches;
next	1.584;

1.584
date	2012.03.22.16.19.04;	author joel;	state Exp;
branches;
next	1.583;

1.583
date	2012.03.21.08.38.42;	author ed;	state Exp;
branches;
next	1.582;

1.582
date	2012.03.05.18.47.42;	author jkim;	state Exp;
branches;
next	1.581;

1.581
date	2012.03.04.21.31.13;	author rmh;	state Exp;
branches;
next	1.580;

1.580
date	2012.03.03.00.11.46;	author jkim;	state Exp;
branches;
next	1.579;

1.579
date	2012.01.31.19.38.18;	author jimharris;	state Exp;
branches;
next	1.578;

1.578
date	2012.01.12.00.34.33;	author ken;	state Exp;
branches;
next	1.577;

1.577
date	2011.12.29.22.48.36;	author rwatson;	state Exp;
branches;
next	1.576;

1.576
date	2011.11.20.16.36.02;	author attilio;	state Exp;
branches;
next	1.575;

1.575
date	2011.11.20.16.33.09;	author attilio;	state Exp;
branches;
next	1.574;

1.574
date	2011.11.08.08.29.05;	author kevlo;	state Exp;
branches;
next	1.573;

1.573
date	2011.11.01.21.26.57;	author marius;	state Exp;
branches;
next	1.572;

1.572
date	2011.10.27.13.07.49;	author kensmith;	state Exp;
branches;
next	1.571;

1.571
date	2011.10.19.21.55.20;	author kensmith;	state Exp;
branches;
next	1.570;

1.570
date	2011.10.18.13.45.16;	author kensmith;	state Exp;
branches;
next	1.569;

1.569
date	2011.10.04.21.40.25;	author delphij;	state Exp;
branches;
next	1.568;

1.568
date	2011.09.11.17.39.51;	author brueffer;	state Exp;
branches
	1.568.2.1;
next	1.567;

1.567
date	2011.08.26.21.22.34;	author jhb;	state Exp;
branches;
next	1.566;

1.566
date	2011.08.07.20.16.46;	author rmacklem;	state Exp;
branches;
next	1.565;

1.565
date	2011.06.14.20.30.49;	author hselasky;	state Exp;
branches;
next	1.564;

1.564
date	2011.06.11.09.08.46;	author joel;	state Exp;
branches;
next	1.563;

1.563
date	2011.05.25.10.04.13;	author kevlo;	state Exp;
branches;
next	1.562;

1.562
date	2011.05.25.04.46.48;	author kevlo;	state Exp;
branches;
next	1.561;

1.561
date	2011.05.10.16.44.16;	author jkim;	state Exp;
branches;
next	1.560;

1.560
date	2011.05.01.13.26.34;	author bschmidt;	state Exp;
branches;
next	1.559;

1.559
date	2011.04.29.06.36.39;	author kevlo;	state Exp;
branches;
next	1.558;

1.558
date	2011.04.27.17.51.51;	author rmacklem;	state Exp;
branches;
next	1.557;

1.557
date	2011.04.26.17.01.49;	author mav;	state Exp;
branches;
next	1.556;

1.556
date	2011.04.24.08.58.58;	author mav;	state Exp;
branches;
next	1.555;

1.555
date	2011.03.31.08.07.13;	author adrian;	state Exp;
branches;
next	1.554;

1.554
date	2011.03.29.18.16.49;	author trasz;	state Exp;
branches;
next	1.553;

1.553
date	2011.03.29.17.47.25;	author trasz;	state Exp;
branches;
next	1.552;

1.552
date	2011.03.19.15.50.34;	author bz;	state Exp;
branches;
next	1.551;

1.551
date	2011.03.14.22.42.41;	author davidch;	state Exp;
branches;
next	1.550;

1.550
date	2011.03.09.17.15.11;	author julian;	state Exp;
branches;
next	1.549;

1.549
date	2010.09.24.09.04.16;	author davidxu;	state Exp;
branches;
next	1.548;

1.548
date	2010.09.10.15.03.56;	author ken;	state Exp;
branches;
next	1.547;

1.547
date	2010.08.06.18.46.27;	author bschmidt;	state Exp;
branches;
next	1.546;

1.546
date	2010.07.28.15.36.12;	author mdf;	state Exp;
branches;
next	1.545;

1.545
date	2010.07.07.09.23.46;	author kevlo;	state Exp;
branches;
next	1.544;

1.544
date	2010.04.25.22.01.32;	author thompsa;	state Exp;
branches;
next	1.543;

1.543
date	2010.04.22.21.31.34;	author thompsa;	state Exp;
branches;
next	1.542;

1.542
date	2010.04.14.20.45.33;	author yongari;	state Exp;
branches;
next	1.541;

1.541
date	2010.03.13.09.21.00;	author ed;	state Exp;
branches;
next	1.540;

1.540
date	2010.03.11.14.49.06;	author nwhitehorn;	state Exp;
branches;
next	1.539;

1.539
date	2010.02.15.23.44.48;	author attilio;	state Exp;
branches;
next	1.538;

1.538
date	2010.02.10.16.30.04;	author attilio;	state Exp;
branches;
next	1.537;

1.537
date	2010.01.19.17.20.34;	author jhb;	state Exp;
branches;
next	1.536;

1.536
date	2010.01.10.17.44.22;	author imp;	state Exp;
branches;
next	1.535;

1.535
date	2010.01.03.20.40.54;	author brooks;	state Exp;
branches;
next	1.534;

1.534
date	2009.10.13.19.02.03;	author jhb;	state Exp;
branches;
next	1.533;

1.533
date	2009.10.01.02.08.42;	author rpaulo;	state Exp;
branches;
next	1.532;

1.532
date	2009.08.13.17.09.45;	author attilio;	state Exp;
branches;
next	1.531;

1.531
date	2009.07.11.15.02.45;	author rpaulo;	state Exp;
branches
	1.531.2.1;
next	1.530;

1.530
date	2009.07.02.18.24.37;	author ed;	state Exp;
branches;
next	1.529;

1.529
date	2009.06.14.18.01.35;	author ed;	state Exp;
branches;
next	1.528;

1.528
date	2009.06.10.02.07.58;	author yongari;	state Exp;
branches;
next	1.527;

1.527
date	2009.06.09.21.58.14;	author kmacy;	state Exp;
branches;
next	1.526;

1.526
date	2009.06.02.18.31.08;	author rwatson;	state Exp;
branches;
next	1.525;

1.525
date	2009.05.10.00.00.25;	author kuriyama;	state Exp;
branches;
next	1.524;

1.524
date	2009.05.01.17.20.16;	author sam;	state Exp;
branches;
next	1.523;

1.523
date	2009.04.10.00.40.48;	author jfv;	state Exp;
branches;
next	1.522;

1.522
date	2009.03.19.20.33.26;	author thompsa;	state Exp;
branches;
next	1.521;

1.521
date	2009.02.23.18.34.56;	author thompsa;	state Exp;
branches;
next	1.520;

1.520
date	2009.02.15.23.40.37;	author svn;	state Exp;
branches;
next	1.519;

1.519
date	2009.02.15.22.33.44;	author thompsa;	state Exp;
branches;
next	1.518;

1.518
date	2009.01.19.15.33.06;	author sobomax;	state Exp;
branches;
next	1.517;

1.517
date	2009.01.19.08.51.20;	author sobomax;	state Exp;
branches;
next	1.516;

1.516
date	2009.01.19.08.25.41;	author sobomax;	state Exp;
branches;
next	1.515;

1.515
date	2009.01.19.07.18.32;	author sobomax;	state Exp;
branches;
next	1.514;

1.514
date	2009.01.19.07.10.11;	author sobomax;	state Exp;
branches;
next	1.513;

1.513
date	2009.01.13.12.35.33;	author luigi;	state Exp;
branches;
next	1.512;

1.512
date	2009.01.05.14.21.49;	author rwatson;	state Exp;
branches;
next	1.511;

1.511
date	2008.12.02.19.09.08;	author ed;	state Exp;
branches;
next	1.510;

1.510
date	2008.12.01.16.53.01;	author sam;	state Exp;
branches;
next	1.509;

1.509
date	2008.11.12.09.52.06;	author yongari;	state Exp;
branches;
next	1.508;

1.508
date	2008.10.03.10.31.31;	author stas;	state Exp;
branches;
next	1.507;

1.507
date	2008.08.20.08.31.58;	author ed;	state Exp;
branches;
next	1.506;

1.506
date	2008.08.03.10.32.17;	author ed;	state Exp;
branches;
next	1.505;

1.505
date	2008.07.30.22.27.38;	author jfv;	state Exp;
branches;
next	1.504;

1.504
date	2008.07.13.07.20.14;	author ed;	state Exp;
branches;
next	1.503;

1.503
date	2008.07.07.22.55.11;	author delphij;	state Exp;
branches;
next	1.502;

1.502
date	2008.06.20.19.28.33;	author delphij;	state Exp;
branches;
next	1.501;

1.501
date	2008.05.27.02.22.32;	author yongari;	state Exp;
branches;
next	1.500;

1.500
date	2008.05.19.02.30.27;	author yongari;	state Exp;
branches;
next	1.499;

1.499
date	2008.05.17.23.49.59;	author remko;	state Exp;
branches;
next	1.498;

1.498
date	2008.05.03.17.05.38;	author sam;	state Exp;
branches;
next	1.497;

1.497
date	2008.04.20.20.35.34;	author sam;	state Exp;
branches;
next	1.496;

1.496
date	2008.04.20.19.20.36;	author sam;	state Exp;
branches;
next	1.495;

1.495
date	2008.03.27.11.54.17;	author dfr;	state Exp;
branches;
next	1.494;

1.494
date	2008.03.05.14.13.29;	author rink;	state Exp;
branches;
next	1.493;

1.493
date	2008.02.19.06.30.49;	author ru;	state Exp;
branches;
next	1.492;

1.492
date	2008.02.03.07.07.30;	author scottl;	state Exp;
branches;
next	1.491;

1.491
date	2008.01.07.21.40.09;	author jhb;	state Exp;
branches;
next	1.490;

1.490
date	2007.12.15.00.56.16;	author scottl;	state Exp;
branches;
next	1.489;

1.489
date	2007.12.02.20.40.30;	author rwatson;	state Exp;
branches;
next	1.488;

1.488
date	2007.11.28.05.50.44;	author attilio;	state Exp;
branches;
next	1.487;

1.487
date	2007.10.26.02.35.42;	author imp;	state Exp;
branches;
next	1.486;

1.486
date	2007.10.26.02.20.28;	author imp;	state Exp;
branches;
next	1.485;

1.485
date	2007.10.19.12.30.33;	author kensmith;	state Exp;
branches;
next	1.484;

1.484
date	2007.09.26.20.05.06;	author brueffer;	state Exp;
branches
	1.484.2.1;
next	1.483;

1.483
date	2007.07.01.21.47.45;	author njl;	state Exp;
branches;
next	1.482;

1.482
date	2007.06.14.17.14.25;	author delphij;	state Exp;
branches;
next	1.481;

1.481
date	2007.06.12.02.24.30;	author yongari;	state Exp;
branches;
next	1.480;

1.480
date	2007.06.11.08.26.40;	author thompsa;	state Exp;
branches;
next	1.479;

1.479
date	2007.06.08.20.29.05;	author rwatson;	state Exp;
branches;
next	1.478;

1.478
date	2007.05.28.14.38.42;	author simokawa;	state Exp;
branches;
next	1.477;

1.477
date	2007.05.10.01.39.50;	author kevlo;	state Exp;
branches;
next	1.476;

1.476
date	2007.05.09.07.07.25;	author scottl;	state Exp;
branches;
next	1.475;

1.475
date	2007.04.10.21.40.12;	author pjd;	state Exp;
branches;
next	1.474;

1.474
date	2007.04.10.16.49.39;	author pjd;	state Exp;
branches;
next	1.473;

1.473
date	2007.02.09.19.03.17;	author brooks;	state Exp;
branches;
next	1.472;

1.472
date	2007.02.07.18.55.29;	author marcel;	state Exp;
branches;
next	1.471;

1.471
date	2006.12.13.03.41.47;	author yongari;	state Exp;
branches;
next	1.470;

1.470
date	2006.12.03.21.02.09;	author netchild;	state Exp;
branches;
next	1.469;

1.469
date	2006.11.22.10.34.12;	author ru;	state Exp;
branches;
next	1.468;

1.468
date	2006.10.26.22.11.34;	author jb;	state Exp;
branches;
next	1.467;

1.467
date	2006.10.26.21.42.16;	author jb;	state Exp;
branches;
next	1.466;

1.466
date	2006.10.05.20.31.57;	author simon;	state Exp;
branches;
next	1.465;

1.465
date	2006.09.26.12.36.33;	author ru;	state Exp;
branches;
next	1.464;

1.464
date	2006.07.09.16.39.21;	author mjacob;	state Exp;
branches;
next	1.463;

1.463
date	2006.07.05.02.32.55;	author davidxu;	state Exp;
branches;
next	1.462;

1.462
date	2006.06.26.22.03.20;	author babkin;	state Exp;
branches;
next	1.461;

1.461
date	2006.06.25.18.37.43;	author babkin;	state Exp;
branches;
next	1.460;

1.460
date	2006.06.15.19.58.52;	author netchild;	state Exp;
branches;
next	1.459;

1.459
date	2006.06.13.13.12.56;	author davidxu;	state Exp;
branches;
next	1.458;

1.458
date	2006.05.17.20.45.44;	author marius;	state Exp;
branches;
next	1.457;

1.457
date	2006.05.16.12.15.34;	author ru;	state Exp;
branches;
next	1.456;

1.456
date	2006.05.09.22.27.00;	author ambrisko;	state Exp;
branches;
next	1.455;

1.455
date	2006.05.03.18.15.36;	author sam;	state Exp;
branches;
next	1.454;

1.454
date	2006.04.28.05.23.10;	author scottl;	state Exp;
branches;
next	1.453;

1.453
date	2006.04.24.08.44.33;	author delphij;	state Exp;
branches;
next	1.452;

1.452
date	2006.04.10.20.04.22;	author ps;	state Exp;
branches;
next	1.451;

1.451
date	2006.03.31.23.04.48;	author emax;	state Exp;
branches;
next	1.450;

1.450
date	2006.03.29.09.57.21;	author scottl;	state Exp;
branches;
next	1.449;

1.449
date	2006.01.12.01.20.59;	author obrien;	state Exp;
branches;
next	1.448;

1.448
date	2006.01.10.09.19.07;	author phk;	state Exp;
branches;
next	1.447;

1.447
date	2005.11.27.23.16.58;	author ru;	state Exp;
branches;
next	1.446;

1.446
date	2005.11.05.19.48.53;	author marcel;	state Exp;
branches;
next	1.445;

1.445
date	2005.11.01.22.59.02;	author jhb;	state Exp;
branches;
next	1.444;

1.444
date	2005.10.27.18.54.43;	author peter;	state Exp;
branches;
next	1.443;

1.443
date	2005.10.27.18.40.56;	author obrien;	state Exp;
branches;
next	1.442;

1.442
date	2005.09.08.03.29.18;	author scottl;	state Exp;
branches;
next	1.441;

1.441
date	2005.07.24.17.55.57;	author mux;	state Exp;
branches;
next	1.440;

1.440
date	2005.07.14.15.39.04;	author kensmith;	state Exp;
branches;
next	1.439;

1.439
date	2005.05.24.16.48.06;	author damien;	state Exp;
branches
	1.439.2.1;
next	1.438;

1.438
date	2005.04.15.18.45.07;	author peter;	state Exp;
branches;
next	1.437;

1.437
date	2005.04.13.06.00.07;	author anholt;	state Exp;
branches;
next	1.436;

1.436
date	2005.03.31.20.55.10;	author obrien;	state Exp;
branches;
next	1.435;

1.435
date	2005.03.31.20.21.42;	author scottl;	state Exp;
branches;
next	1.434;

1.434
date	2005.03.22.14.52.38;	author sobomax;	state Exp;
branches;
next	1.433;

1.433
date	2005.03.18.15.23.58;	author murray;	state Exp;
branches;
next	1.432;

1.432
date	2005.03.16.20.23.31;	author obrien;	state Exp;
branches;
next	1.431;

1.431
date	2005.03.16.02.34.50;	author iedowse;	state Exp;
branches;
next	1.430;

1.430
date	2005.03.12.00.29.29;	author obrien;	state Exp;
branches;
next	1.429;

1.429
date	2005.02.28.23.39.58;	author peter;	state Exp;
branches;
next	1.428;

1.428
date	2005.01.05.05.25.21;	author kuriyama;	state Exp;
branches;
next	1.427;

1.427
date	2004.12.30.18.51.23;	author jhb;	state Exp;
branches;
next	1.426;

1.426
date	2004.11.02.20.57.19;	author andre;	state Exp;
branches;
next	1.425;

1.425
date	2004.09.22.00.44.13;	author peter;	state Exp;
branches;
next	1.424;

1.424
date	2004.09.10.20.57.46;	author wpaul;	state Exp;
branches;
next	1.423;

1.423
date	2004.09.07.22.37.43;	author scottl;	state Exp;
branches;
next	1.422;

1.422
date	2004.08.27.15.16.21;	author andre;	state Exp;
branches;
next	1.421;

1.421
date	2004.08.16.22.59.24;	author peter;	state Exp;
branches
	1.421.2.1;
next	1.420;

1.420
date	2004.08.16.12.51.32;	author obrien;	state Exp;
branches;
next	1.419;

1.419
date	2004.08.03.19.24.52;	author markm;	state Exp;
branches;
next	1.418;

1.418
date	2004.08.01.19.37.34;	author markm;	state Exp;
branches;
next	1.417;

1.417
date	2004.08.01.11.40.51;	author markm;	state Exp;
branches;
next	1.416;

1.416
date	2004.07.22.22.29.45;	author imp;	state Exp;
branches;
next	1.415;

1.415
date	2004.07.18.15.59.03;	author scottl;	state Exp;
branches;
next	1.414;

1.414
date	2004.07.18.09.03.12;	author maxim;	state Exp;
branches;
next	1.413;

1.413
date	2004.07.16.21.48.30;	author ps;	state Exp;
branches;
next	1.412;

1.412
date	2004.07.11.03.09.53;	author marcel;	state Exp;
branches;
next	1.411;

1.411
date	2004.06.13.23.03.57;	author obrien;	state Exp;
branches;
next	1.410;

1.410
date	2004.06.03.21.40.41;	author peter;	state Exp;
branches;
next	1.409;

1.409
date	2004.05.17.22.13.14;	author peter;	state Exp;
branches;
next	1.408;

1.408
date	2004.05.16.20.57.01;	author peter;	state Exp;
branches;
next	1.407;

1.407
date	2004.05.02.20.40.18;	author marcel;	state Exp;
branches;
next	1.406;

1.406
date	2004.05.02.18.57.27;	author obrien;	state Exp;
branches;
next	1.405;

1.405
date	2004.03.25.03.19.28;	author obrien;	state Exp;
branches;
next	1.404;

1.404
date	2004.03.15.00.49.39;	author obrien;	state Exp;
branches;
next	1.403;

1.403
date	2004.02.02.00.54.59;	author obrien;	state Exp;
branches;
next	1.402;

1.402
date	2004.01.30.03.02.45;	author peter;	state Exp;
branches;
next	1.401;

1.401
date	2004.01.24.21.38.51;	author jeff;	state Exp;
branches;
next	1.400;

1.400
date	2004.01.24.14.59.50;	author nectar;	state Exp;
branches;
next	1.399;

1.399
date	2003.11.21.03.19.59;	author peter;	state Exp;
branches
	1.399.2.1;
next	1.398;

1.398
date	2003.11.19.18.11.27;	author peter;	state Exp;
branches;
next	1.397;

1.397
date	2003.11.08.03.17.36;	author peter;	state Exp;
branches;
next	1.396;

1.396
date	2003.09.19.20.04.55;	author joerg;	state Exp;
branches;
next	1.395;

1.395
date	2003.09.15.22.40.00;	author obrien;	state Exp;
branches;
next	1.394;

1.394
date	2003.09.10.18.54.58;	author obrien;	state Exp;
branches;
next	1.393;

1.393
date	2003.09.08.20.00.55;	author peter;	state Exp;
branches;
next	1.392;

1.392
date	2003.09.08.02.11.24;	author wpaul;	state Exp;
branches;
next	1.391;

1.391
date	2003.09.03.01.24.47;	author obrien;	state Exp;
branches;
next	1.390;

1.390
date	2003.06.27.23.11.22;	author peter;	state Exp;
branches;
next	1.389;

1.389
date	2003.06.26.04.01.59;	author peter;	state Exp;
branches;
next	1.388;

1.388
date	2003.06.26.03.49.54;	author peter;	state Exp;
branches;
next	1.387;

1.387
date	2003.06.01.20.26.38;	author obrien;	state Exp;
branches;
next	1.386;

1.386
date	2003.05.31.07.00.08;	author peter;	state Exp;
branches;
next	1.385;

1.385
date	2003.05.14.04.10.48;	author peter;	state Exp;
branches;
next	1.384;

1.384
date	2003.05.09.18.26.06;	author peter;	state Exp;
branches;
next	1.383;

1.383
date	2003.05.01.01.05.22;	author peter;	state Exp;
branches;
next	1.382;

1.382
date	2003.04.21.16.44.04;	author simokawa;	state Exp;
branches;
next	1.381;

1.381
date	2003.04.20.19.05.32;	author wpaul;	state Exp;
branches;
next	1.380;

1.380
date	2003.03.29.13.36.41;	author mdodd;	state Exp;
branches;
next	1.379;

1.379
date	2003.03.26.19.55.03;	author ps;	state Exp;
branches;
next	1.378;

1.378
date	2003.03.25.23.31.14;	author jhb;	state Exp;
branches;
next	1.377;

1.377
date	2003.03.22.14.18.22;	author ru;	state Exp;
branches;
next	1.376;

1.376
date	2003.02.13.22.24.43;	author obrien;	state Exp;
branches;
next	1.375;

1.375
date	2003.02.01.18.45.17;	author joe;	state Exp;
branches;
next	1.374;

1.374
date	2003.01.26.06.37.43;	author jeff;	state Exp;
branches;
next	1.373;

1.373
date	2003.01.26.05.29.11;	author jeff;	state Exp;
branches;
next	1.372;

1.372
date	2003.01.16.00.21.52;	author sam;	state Exp;
branches;
next	1.371;

1.371
date	2002.12.28.06.22.17;	author scottl;	state Exp;
branches;
next	1.370;

1.370
date	2002.12.16.18.47.37;	author cognet;	state Exp;
branches;
next	1.369;

1.369
date	2002.10.19.16.54.07;	author rwatson;	state Exp;
branches
	1.369.2.1;
next	1.368;

1.368
date	2002.10.13.16.29.15;	author mike;	state Exp;
branches;
next	1.367;

1.367
date	2002.10.12.07.26.48;	author phk;	state Exp;
branches;
next	1.366;

1.366
date	2002.10.05.16.35.30;	author phk;	state Exp;
branches;
next	1.365;

1.365
date	2002.09.27.19.09.21;	author sos;	state Exp;
branches;
next	1.364;

1.364
date	2002.09.11.16.51.48;	author rwatson;	state Exp;
branches;
next	1.363;

1.363
date	2002.09.09.02.40.58;	author kuriyama;	state Exp;
branches;
next	1.362;

1.362
date	2002.09.05.15.45.01;	author obrien;	state Exp;
branches;
next	1.361;

1.361
date	2002.08.31.06.56.43;	author gibbs;	state Exp;
branches;
next	1.360;

1.360
date	2002.08.20.00.10.20;	author peter;	state Exp;
branches;
next	1.359;

1.359
date	2002.08.15.08.05.40;	author imp;	state Exp;
branches;
next	1.358;

1.358
date	2002.08.11.23.34.19;	author mjacob;	state Exp;
branches;
next	1.357;

1.357
date	2002.08.09.15.30.42;	author brooks;	state Exp;
branches;
next	1.356;

1.356
date	2002.08.07.05.40.34;	author imp;	state Exp;
branches;
next	1.355;

1.355
date	2002.08.04.18.34.58;	author anholt;	state Exp;
branches;
next	1.354;

1.354
date	2002.08.04.18.06.15;	author imp;	state Exp;
branches;
next	1.353;

1.353
date	2002.08.01.17.21.09;	author blackend;	state Exp;
branches;
next	1.352;

1.352
date	2002.07.23.06.35.08;	author peter;	state Exp;
branches;
next	1.351;

1.351
date	2002.07.21.23.07.30;	author peter;	state Exp;
branches;
next	1.350;

1.350
date	2002.07.16.18.20.16;	author jhb;	state Exp;
branches;
next	1.349;

1.349
date	2002.07.12.06.38.34;	author alfred;	state Exp;
branches;
next	1.348;

1.348
date	2002.07.08.11.56.44;	author markm;	state Exp;
branches;
next	1.347;

1.347
date	2002.07.07.19.00.00;	author imp;	state Exp;
branches;
next	1.346;

1.346
date	2002.06.30.04.12.20;	author rwatson;	state Exp;
branches;
next	1.345;

1.345
date	2002.06.06.16.35.58;	author gibbs;	state Exp;
branches;
next	1.344;

1.344
date	2002.05.29.18.42.26;	author obrien;	state Exp;
branches;
next	1.343;

1.343
date	2002.05.22.19.00.48;	author obrien;	state Exp;
branches;
next	1.342;

1.342
date	2002.05.21.23.35.51;	author rwatson;	state Exp;
branches;
next	1.341;

1.341
date	2002.05.03.17.59.22;	author jmallett;	state Exp;
branches;
next	1.340;

1.340
date	2002.04.27.01.31.16;	author scottl;	state Exp;
branches;
next	1.339;

1.339
date	2002.04.18.03.44.44;	author rwatson;	state Exp;
branches;
next	1.338;

1.338
date	2002.04.09.11.18.38;	author phk;	state Exp;
branches;
next	1.337;

1.337
date	2002.04.03.10.56.54;	author ru;	state Exp;
branches;
next	1.336;

1.336
date	2002.03.17.23.48.24;	author des;	state Exp;
branches;
next	1.335;

1.335
date	2002.02.13.18.47.50;	author alfred;	state Exp;
branches;
next	1.334;

1.334
date	2002.02.13.07.44.58;	author rwatson;	state Exp;
branches;
next	1.333;

1.333
date	2002.01.20.08.51.07;	author msmith;	state Exp;
branches;
next	1.332;

1.332
date	2001.12.14.16.27.08;	author iedowse;	state Exp;
branches;
next	1.331;

1.331
date	2001.12.09.01.57.06;	author dillon;	state Exp;
branches;
next	1.330;

1.330
date	2001.12.04.11.12.20;	author des;	state Exp;
branches;
next	1.329;

1.329
date	2001.11.06.16.15.47;	author obrien;	state Exp;
branches;
next	1.328;

1.328
date	2001.10.31.20.15.18;	author rwatson;	state Exp;
branches;
next	1.327;

1.327
date	2001.10.30.06.08.56;	author imp;	state Exp;
branches;
next	1.326;

1.326
date	2001.10.25.04.44.50;	author jlemon;	state Exp;
branches;
next	1.325;

1.325
date	2001.10.20.18.50.31;	author mjacob;	state Exp;
branches;
next	1.324;

1.324
date	2001.10.20.01.15.54;	author obrien;	state Exp;
branches;
next	1.323;

1.323
date	2001.10.16.22.22.58;	author mjacob;	state Exp;
branches;
next	1.322;

1.322
date	2001.09.25.18.56.37;	author brooks;	state Exp;
branches;
next	1.321;

1.321
date	2001.09.24.03.23.47;	author obrien;	state Exp;
branches;
next	1.320;

1.320
date	2001.09.22.19.02.18;	author jedgar;	state Exp;
branches;
next	1.319;

1.319
date	2001.09.18.23.31.27;	author peter;	state Exp;
branches;
next	1.318;

1.318
date	2001.08.25.07.42.27;	author peter;	state Exp;
branches;
next	1.317;

1.317
date	2001.08.25.02.20.00;	author peter;	state Exp;
branches;
next	1.316;

1.316
date	2001.08.05.21.56.11;	author nate;	state Exp;
branches;
next	1.315;

1.315
date	2001.07.23.20.44.52;	author wpaul;	state Exp;
branches;
next	1.314;

1.314
date	2001.07.13.13.34.07;	author dd;	state Exp;
branches;
next	1.313;

1.313
date	2001.07.02.21.01.48;	author brooks;	state Exp;
branches;
next	1.312;

1.312
date	2001.06.12.09.39.57;	author peter;	state Exp;
branches;
next	1.311;

1.311
date	2001.05.30.03.18.22;	author mjacob;	state Exp;
branches;
next	1.310;

1.310
date	2001.05.29.18.49.01;	author phk;	state Exp;
branches;
next	1.309;

1.309
date	2001.05.25.17.55.39;	author jkh;	state Exp;
branches;
next	1.308;

1.308
date	2001.05.13.20.52.39;	author phk;	state Exp;
branches;
next	1.307;

1.307
date	2001.04.15.19.37.27;	author obrien;	state Exp;
branches;
next	1.306;

1.306
date	2001.03.16.11.52.25;	author sos;	state Exp;
branches;
next	1.305;

1.305
date	2001.03.12.21.51.07;	author jlemon;	state Exp;
branches;
next	1.304;

1.304
date	2001.03.07.04.58.38;	author gsutter;	state Exp;
branches;
next	1.303;

1.303
date	2001.03.03.08.31.37;	author imp;	state Exp;
branches;
next	1.302;

1.302
date	2001.02.25.05.52.38;	author peter;	state Exp;
branches;
next	1.301;

1.301
date	2001.02.04.15.35.08;	author peter;	state Exp;
branches;
next	1.300;

1.300
date	2001.01.27.08.18.36;	author phk;	state Exp;
branches;
next	1.299;

1.299
date	2001.01.19.13.06.37;	author peter;	state Exp;
branches;
next	1.298;

1.298
date	2001.01.14.17.50.13;	author markm;	state Exp;
branches;
next	1.297;

1.297
date	2001.01.14.10.19.42;	author jhb;	state Exp;
branches;
next	1.296;

1.296
date	2001.01.14.10.11.10;	author jhb;	state Exp;
branches;
next	1.295;

1.295
date	2000.12.20.11.24.47;	author paul;	state Exp;
branches;
next	1.294;

1.294
date	2000.12.13.01.11.34;	author msmith;	state Exp;
branches;
next	1.293;

1.293
date	2000.12.11.14.02.00;	author phk;	state Exp;
branches;
next	1.292;

1.292
date	2000.12.08.20.08.18;	author phk;	state Exp;
branches;
next	1.291;

1.291
date	2000.11.15.18.36.24;	author imp;	state Exp;
branches;
next	1.290;

1.290
date	2000.11.14.01.13.57;	author jkh;	state Exp;
branches;
next	1.289;

1.289
date	2000.11.14.01.11.13;	author jkh;	state Exp;
branches;
next	1.288;

1.288
date	2000.11.07.21.20.52;	author imp;	state Exp;
branches;
next	1.287;

1.287
date	2000.11.07.21.06.57;	author imp;	state Exp;
branches;
next	1.286;

1.286
date	2000.11.07.20.22.18;	author semenu;	state Exp;
branches;
next	1.285;

1.285
date	2000.11.07.00.58.35;	author wpaul;	state Exp;
branches;
next	1.284;

1.284
date	2000.10.28.22.32.17;	author nik;	state Exp;
branches;
next	1.283;

1.283
date	2000.10.27.06.05.59;	author markm;	state Exp;
branches;
next	1.282;

1.282
date	2000.10.25.10.34.31;	author n_hibma;	state Exp;
branches;
next	1.281;

1.281
date	2000.10.23.12.55.39;	author non;	state Exp;
branches;
next	1.280;

1.280
date	2000.10.12.01.46.43;	author msmith;	state Exp;
branches;
next	1.279;

1.279
date	2000.09.22.23.39.47;	author ps;	state Exp;
branches;
next	1.278;

1.278
date	2000.09.20.17.30.20;	author wpaul;	state Exp;
branches;
next	1.277;

1.277
date	2000.09.15.02.25.41;	author nyan;	state Exp;
branches;
next	1.276;

1.276
date	2000.09.13.03.20.34;	author msmith;	state Exp;
branches;
next	1.275;

1.275
date	2000.09.12.13.21.40;	author markm;	state Exp;
branches;
next	1.274;

1.274
date	2000.09.11.21.20.39;	author billf;	state Exp;
branches;
next	1.273;

1.273
date	2000.09.01.07.51.23;	author msmith;	state Exp;
branches;
next	1.272;

1.272
date	2000.08.24.18.56.54;	author peter;	state Exp;
branches;
next	1.271;

1.271
date	2000.08.23.03.29.49;	author msmith;	state Exp;
branches;
next	1.270;

1.270
date	2000.08.20.21.34.31;	author phk;	state Exp;
branches;
next	1.269;

1.269
date	2000.07.29.02.12.44;	author obrien;	state Exp;
branches;
next	1.268;

1.268
date	2000.07.29.02.00.28;	author obrien;	state Exp;
branches;
next	1.267;

1.267
date	2000.07.29.01.31.08;	author obrien;	state Exp;
branches;
next	1.266;

1.266
date	2000.07.25.08.25.48;	author billf;	state Exp;
branches;
next	1.265;

1.265
date	2000.07.10.15.17.52;	author mjacob;	state Exp;
branches;
next	1.264;

1.264
date	2000.07.08.07.05.40;	author mjacob;	state Exp;
branches;
next	1.263;

1.263
date	2000.07.08.07.02.58;	author mjacob;	state Exp;
branches;
next	1.262;

1.262
date	2000.06.25.09.18.07;	author markm;	state Exp;
branches;
next	1.261;

1.261
date	2000.06.22.06.01.02;	author peter;	state Exp;
branches;
next	1.260;

1.260
date	2000.06.13.22.28.46;	author peter;	state Exp;
branches;
next	1.259;

1.259
date	2000.05.31.19.01.45;	author msmith;	state Exp;
branches;
next	1.258;

1.258
date	2000.05.30.23.01.37;	author green;	state Exp;
branches;
next	1.257;

1.257
date	2000.05.22.16.12.27;	author dan;	state Exp;
branches;
next	1.256;

1.256
date	2000.05.13.11.21.19;	author hoek;	state Exp;
branches;
next	1.255;

1.255
date	2000.05.12.03.05.35;	author jhb;	state Exp;
branches;
next	1.254;

1.254
date	2000.05.03.00.49.57;	author imp;	state Exp;
branches;
next	1.253;

1.253
date	2000.05.01.22.48.19;	author n_hibma;	state Exp;
branches;
next	1.252;

1.252
date	2000.04.15.18.46.15;	author asmodai;	state Exp;
branches;
next	1.251;

1.251
date	2000.04.06.02.48.43;	author imp;	state Exp;
branches;
next	1.250;

1.250
date	2000.04.04.13.14.43;	author hm;	state Exp;
branches;
next	1.249;

1.249
date	2000.03.21.17.00.58;	author dan;	state Exp;
branches;
next	1.248;

1.248
date	2000.03.19.13.33.25;	author peter;	state Exp;
branches;
next	1.247;

1.247
date	2000.03.16.09.16.06;	author n_hibma;	state Exp;
branches;
next	1.246;

1.246
date	2000.03.09.16.32.55;	author jlemon;	state Exp;
branches
	1.246.2.1;
next	1.245;

1.245
date	2000.02.27.07.35.42;	author green;	state Exp;
branches;
next	1.244;

1.244
date	2000.02.26.22.09.31;	author jkh;	state Exp;
branches;
next	1.243;

1.243
date	2000.02.20.14.41.54;	author n_hibma;	state Exp;
branches;
next	1.242;

1.242
date	2000.02.16.04.27.03;	author yokota;	state Exp;
branches;
next	1.241;

1.241
date	2000.02.04.07.02.53;	author jkh;	state Exp;
branches;
next	1.240;

1.240
date	2000.02.01.09.32.04;	author n_hibma;	state Exp;
branches;
next	1.239;

1.239
date	2000.01.29.18.07.04;	author peter;	state Exp;
branches;
next	1.238;

1.238
date	2000.01.28.06.13.08;	author imp;	state Exp;
branches;
next	1.237;

1.237
date	2000.01.24.08.49.24;	author peter;	state Exp;
branches;
next	1.236;

1.236
date	2000.01.24.05.38.55;	author bde;	state Exp;
branches;
next	1.235;

1.235
date	2000.01.23.18.30.35;	author peter;	state Exp;
branches;
next	1.234;

1.234
date	2000.01.23.14.46.19;	author peter;	state Exp;
branches;
next	1.233;

1.233
date	2000.01.23.12.18.53;	author peter;	state Exp;
branches;
next	1.232;

1.232
date	2000.01.23.04.29.17;	author imp;	state Exp;
branches;
next	1.231;

1.231
date	2000.01.21.20.19.18;	author wilko;	state Exp;
branches;
next	1.230;

1.230
date	2000.01.18.07.52.12;	author jkh;	state Exp;
branches;
next	1.229;

1.229
date	2000.01.14.20.40.58;	author wpaul;	state Exp;
branches;
next	1.228;

1.228
date	2000.01.14.08.16.28;	author peter;	state Exp;
branches;
next	1.227;

1.227
date	2000.01.14.03.14.42;	author wpaul;	state Exp;
branches;
next	1.226;

1.226
date	2000.01.13.07.01.12;	author mdodd;	state Exp;
branches;
next	1.225;

1.225
date	2000.01.12.02.30.42;	author obrien;	state Exp;
branches;
next	1.224;

1.224
date	2000.01.10.02.29.23;	author imp;	state Exp;
branches;
next	1.223;

1.223
date	2000.01.08.15.59.12;	author peter;	state Exp;
branches;
next	1.222;

1.222
date	2000.01.05.04.27.11;	author wpaul;	state Exp;
branches;
next	1.221;

1.221
date	2000.01.04.11.15.02;	author mjacob;	state Exp;
branches;
next	1.220;

1.220
date	99.12.28.02.01.02;	author wpaul;	state Exp;
branches;
next	1.219;

1.219
date	99.12.23.05.32.53;	author wpaul;	state Exp;
branches;
next	1.218;

1.218
date	99.12.22.05.52.04;	author obrien;	state Exp;
branches;
next	1.217;

1.217
date	99.12.19.20.33.05;	author billf;	state Exp;
branches;
next	1.216;

1.216
date	99.12.19.17.12.19;	author markm;	state Exp;
branches;
next	1.215;

1.215
date	99.12.18.07.49.53;	author imp;	state Exp;
branches;
next	1.214;

1.214
date	99.12.18.06.11.20;	author imp;	state Exp;
branches;
next	1.213;

1.213
date	99.12.10.10.44.45;	author phk;	state Exp;
branches;
next	1.212;

1.212
date	99.12.08.09.19.36;	author sos;	state Exp;
branches;
next	1.211;

1.211
date	99.12.06.18.17.41;	author peter;	state Exp;
branches;
next	1.210;

1.210
date	99.12.05.01.55.41;	author luoqi;	state Exp;
branches;
next	1.209;

1.209
date	99.12.04.17.41.18;	author wpaul;	state Exp;
branches;
next	1.208;

1.208
date	99.12.03.00.16.20;	author msmith;	state Exp;
branches;
next	1.207;

1.207
date	99.12.02.03.13.10;	author jlemon;	state Exp;
branches;
next	1.206;

1.206
date	99.12.02.02.53.08;	author msmith;	state Exp;
branches;
next	1.205;

1.205
date	99.11.28.00.59.03;	author obrien;	state Exp;
branches;
next	1.204;

1.204
date	99.11.28.00.48.13;	author obrien;	state Exp;
branches;
next	1.203;

1.203
date	99.11.27.23.25.17;	author obrien;	state Exp;
branches;
next	1.202;

1.202
date	99.11.26.20.08.39;	author phk;	state Exp;
branches;
next	1.201;

1.201
date	99.11.22.11.13.00;	author shin;	state Exp;
branches;
next	1.200;

1.200
date	99.11.22.02.44.48;	author shin;	state Exp;
branches;
next	1.199;

1.199
date	99.11.01.04.02.56;	author peter;	state Exp;
branches;
next	1.198;

1.198
date	99.10.27.06.30.10;	author mdodd;	state Exp;
branches;
next	1.197;

1.197
date	99.10.25.02.41.57;	author imp;	state Exp;
branches;
next	1.196;

1.196
date	99.10.22.04.36.52;	author n_hibma;	state Exp;
branches;
next	1.195;

1.195
date	99.10.16.05.24.12;	author wpaul;	state Exp;
branches;
next	1.194;

1.194
date	99.10.15.07.07.41;	author obrien;	state Exp;
branches;
next	1.193;

1.193
date	99.10.14.11.33.57;	author obrien;	state Exp;
branches;
next	1.192;

1.192
date	99.09.22.05.07.49;	author wpaul;	state Exp;
branches;
next	1.191;

1.191
date	99.09.19.22.03.31;	author wpaul;	state Exp;
branches;
next	1.190;

1.190
date	99.09.11.16.05.48;	author gibbs;	state Exp;
branches;
next	1.189;

1.189
date	99.09.09.18.30.58;	author peter;	state Exp;
branches;
next	1.188;

1.188
date	99.09.06.06.14.28;	author wpaul;	state Exp;
branches;
next	1.187;

1.187
date	99.09.05.21.01.01;	author wpaul;	state Exp;
branches;
next	1.186;

1.186
date	99.09.01.09.01.54;	author jkh;	state Exp;
branches;
next	1.185;

1.185
date	99.09.01.00.51.23;	author brian;	state Exp;
branches;
next	1.184;

1.184
date	99.08.28.00.43.31;	author peter;	state Exp;
branches;
next	1.183;

1.183
date	99.08.21.18.34.53;	author wpaul;	state Exp;
branches;
next	1.182;

1.182
date	99.08.15.09.54.56;	author phk;	state Exp;
branches;
next	1.181;

1.181
date	99.08.15.09.38.20;	author phk;	state Exp;
branches;
next	1.180;

1.180
date	99.08.08.19.28.57;	author phk;	state Exp;
branches;
next	1.179;

1.179
date	99.08.07.01.42.08;	author jkh;	state Exp;
branches;
next	1.178;

1.178
date	99.07.25.04.32.43;	author wpaul;	state Exp;
branches;
next	1.177;

1.177
date	99.07.13.08.08.20;	author obrien;	state Exp;
branches;
next	1.176;

1.176
date	99.07.06.19.22.38;	author des;	state Exp;
branches;
next	1.175;

1.175
date	99.06.29.18.55.53;	author peter;	state Exp;
branches;
next	1.174;

1.174
date	99.06.20.03.36.46;	author jkh;	state Exp;
branches;
next	1.173;

1.173
date	99.06.15.13.14.39;	author des;	state Exp;
branches;
next	1.172;

1.172
date	99.05.21.04.37.35;	author wpaul;	state Exp;
branches;
next	1.171;

1.171
date	99.05.20.20.02.34;	author n_hibma;	state Exp;
branches;
next	1.170;

1.170
date	99.05.14.03.57.23;	author obrien;	state Exp;
branches;
next	1.169;

1.169
date	99.05.09.16.45.52;	author phk;	state Exp;
branches;
next	1.168;

1.168
date	99.05.04.00.15.15;	author msmith;	state Exp;
branches;
next	1.167;

1.167
date	99.05.02.21.54.02;	author n_hibma;	state Exp;
branches;
next	1.166;

1.166
date	99.04.24.21.45.44;	author peter;	state Exp;
branches;
next	1.165;

1.165
date	99.04.24.16.04.16;	author peter;	state Exp;
branches;
next	1.164;

1.164
date	99.04.19.11.53.36;	author peter;	state Exp;
branches;
next	1.163;

1.163
date	99.04.19.10.18.34;	author brian;	state Exp;
branches;
next	1.162;

1.162
date	99.04.16.21.22.07;	author peter;	state Exp;
branches;
next	1.161;

1.161
date	99.04.16.18.27.18;	author jkh;	state Exp;
branches;
next	1.160;

1.160
date	99.04.16.16.17.05;	author n_hibma;	state Exp;
branches;
next	1.159;

1.159
date	99.04.13.20.59.36;	author peter;	state Exp;
branches;
next	1.158;

1.158
date	99.04.13.19.38.09;	author peter;	state Exp;
branches;
next	1.157;

1.157
date	99.04.11.20.53.50;	author n_hibma;	state Exp;
branches;
next	1.156;

1.156
date	99.03.29.17.56.27;	author ken;	state Exp;
branches;
next	1.155;

1.155
date	99.03.16.13.34.00;	author sos;	state Exp;
branches;
next	1.154;

1.154
date	99.02.21.16.23.22;	author n_hibma;	state Exp;
branches;
next	1.153;

1.153
date	99.02.20.23.29.24;	author n_hibma;	state Exp;
branches;
next	1.152;

1.152
date	99.02.20.21.12.24;	author obrien;	state Exp;
branches;
next	1.151;

1.151
date	99.02.18.01.13.40;	author wollman;	state Exp;
branches;
next	1.150;

1.150
date	99.02.14.20.28.38;	author jkh;	state Exp;
branches;
next	1.149;

1.149
date	99.02.14.12.00.00;	author nsouch;	state Exp;
branches;
next	1.148;

1.148
date	99.02.11.06.07.27;	author jkoshy;	state Exp;
branches;
next	1.147;

1.147
date	99.02.10.02.18.31;	author des;	state Exp;
branches;
next	1.146;

1.146
date	99.02.04.22.34.23;	author adam;	state Exp;
branches;
next	1.145;

1.145
date	99.02.04.18.08.55;	author adam;	state Exp;
branches;
next	1.144;

1.144
date	99.01.27.15.34.25;	author eivind;	state Exp;
branches;
next	1.143;

1.143
date	99.01.11.03.18.31;	author yokota;	state Exp;
branches
	1.143.2.1;
next	1.142;

1.142
date	99.01.09.18.12.07;	author wpaul;	state Exp;
branches;
next	1.141;

1.141
date	99.01.01.08.09.57;	author peter;	state Exp;
branches;
next	1.140;

1.140
date	98.12.27.13.55.47;	author sos;	state Exp;
branches;
next	1.139;

1.139
date	98.12.27.13.40.55;	author phk;	state Exp;
branches;
next	1.138;

1.138
date	98.12.27.13.12.59;	author phk;	state Exp;
branches;
next	1.137;

1.137
date	98.12.27.13.06.40;	author phk;	state Exp;
branches;
next	1.136;

1.136
date	98.12.27.12.52.45;	author phk;	state Exp;
branches;
next	1.135;

1.135
date	98.12.13.23.04.35;	author n_hibma;	state Exp;
branches;
next	1.134;

1.134
date	98.12.09.23.28.43;	author n_hibma;	state Exp;
branches;
next	1.133;

1.133
date	98.12.04.18.01.23;	author wpaul;	state Exp;
branches;
next	1.132;

1.132
date	98.11.26.23.13.11;	author n_hibma;	state Exp;
branches;
next	1.131;

1.131
date	98.11.12.11.29.28;	author obrien;	state Exp;
branches;
next	1.130;

1.130
date	98.11.03.22.01.21;	author des;	state Exp;
branches;
next	1.129;

1.129
date	98.11.03.21.12.20;	author des;	state Exp;
branches;
next	1.128;

1.128
date	98.10.22.13.49.51;	author bde;	state Exp;
branches;
next	1.127;

1.127
date	98.10.22.12.23.03;	author bde;	state Exp;
branches;
next	1.126;

1.126
date	98.10.18.16.24.32;	author wpaul;	state Exp;
branches;
next	1.125;

1.125
date	98.10.16.01.30.11;	author obrien;	state Exp;
branches;
next	1.124;

1.124
date	98.10.10.08.13.58;	author jkh;	state Exp;
branches;
next	1.123;

1.123
date	98.10.07.13.51.45;	author obrien;	state Exp;
branches;
next	1.122;

1.122
date	98.10.07.03.42.44;	author gibbs;	state Exp;
branches;
next	1.121;

1.121
date	98.10.05.07.45.54;	author obrien;	state Exp;
branches;
next	1.120;

1.120
date	98.10.03.17.09.00;	author jkh;	state Exp;
branches;
next	1.119;

1.119
date	98.10.01.19.35.28;	author msmith;	state Exp;
branches;
next	1.118;

1.118
date	98.09.18.00.46.40;	author mjacob;	state Exp;
branches;
next	1.117;

1.117
date	98.09.17.03.15.30;	author msmith;	state Exp;
branches;
next	1.116;

1.116
date	98.09.15.10.01.12;	author gibbs;	state Exp;
branches;
next	1.115;

1.115
date	98.09.04.19.55.51;	author msmith;	state Exp;
branches;
next	1.114;

1.114
date	98.08.17.16.46.33;	author bde;	state Exp;
branches;
next	1.113;

1.113
date	98.08.16.17.14.59;	author wpaul;	state Exp;
branches;
next	1.112;

1.112
date	98.07.20.20.00.29;	author msmith;	state Exp;
branches;
next	1.111;

1.111
date	98.07.17.06.45.26;	author joerg;	state Exp;
branches;
next	1.110;

1.110
date	98.06.03.13.33.34;	author jkh;	state Exp;
branches;
next	1.109;

1.109
date	98.05.21.03.22.19;	author wpaul;	state Exp;
branches;
next	1.108;

1.108
date	98.04.22.18.18.12;	author mjacob;	state Exp;
branches;
next	1.107;

1.107
date	98.02.16.23.57.03;	author msmith;	state Exp;
branches;
next	1.106;

1.106
date	98.02.16.00.29.05;	author msmith;	state Exp;
branches;
next	1.105;

1.105
date	98.01.24.02.54.09;	author eivind;	state Exp;
branches;
next	1.104;

1.104
date	98.01.21.18.34.44;	author jkh;	state Exp;
branches;
next	1.103;

1.103
date	98.01.16.22.12.58;	author pst;	state Exp;
branches;
next	1.102;

1.102
date	98.01.11.02.16.38;	author jkh;	state Exp;
branches;
next	1.101;

1.101
date	97.10.31.22.10.02;	author jseger;	state Exp;
branches;
next	1.100;

1.100
date	97.10.28.07.24.30;	author joerg;	state Exp;
branches;
next	1.99;

1.99
date	97.10.26.04.36.07;	author nate;	state Exp;
branches;
next	1.98;

1.98
date	97.10.18.10.59.06;	author joerg;	state Exp;
branches;
next	1.97;

1.97
date	97.10.08.17.05.03;	author nate;	state Exp;
branches;
next	1.96;

1.96
date	97.09.22.00.37.08;	author gibbs;	state Exp;
branches;
next	1.95;

1.95
date	97.09.21.21.34.30;	author gibbs;	state Exp;
branches;
next	1.94;

1.94
date	97.09.14.18.57.01;	author joerg;	state Exp;
branches;
next	1.93;

1.93
date	97.07.22.08.33.52;	author jkh;	state Exp;
branches;
next	1.92;

1.92
date	97.07.15.04.04.45;	author jkh;	state Exp;
branches;
next	1.91;

1.91
date	97.06.06.12.24.43;	author jkh;	state Exp;
branches;
next	1.90;

1.90
date	97.04.14.00.35.20;	author gibbs;	state Exp;
branches;
next	1.89;

1.89
date	97.03.29.11.06.55;	author phk;	state Exp;
branches;
next	1.88;

1.88
date	97.03.13.19.03.58;	author bde;	state Exp;
branches;
next	1.87;

1.87
date	97.03.12.19.59.58;	author se;	state Exp;
branches;
next	1.86;

1.86
date	97.02.22.09.31.34;	author peter;	state Exp;
branches;
next	1.85;

1.85
date	97.01.17.14.18.59;	author jkh;	state Exp;
branches;
next	1.84;

1.84
date	97.01.16.12.19.18;	author jkh;	state Exp;
branches;
next	1.83;

1.83
date	97.01.14.06.38.16;	author jkh;	state Exp;
branches;
next	1.82;

1.82
date	96.12.21.02.09.04;	author se;	state Exp;
branches;
next	1.81;

1.81
date	96.12.18.01.30.19;	author se;	state Exp;
branches;
next	1.80;

1.80
date	96.12.15.16.31.18;	author se;	state Exp;
branches;
next	1.79;

1.79
date	96.12.13.07.55.10;	author jkh;	state Exp;
branches;
next	1.78;

1.78
date	96.11.16.01.09.17;	author gibbs;	state Exp;
branches;
next	1.77;

1.77
date	96.10.28.06.05.56;	author gibbs;	state Exp;
branches
	1.77.2.1;
next	1.76;

1.76
date	96.09.11.19.53.28;	author phk;	state Exp;
branches;
next	1.75;

1.75
date	96.08.27.16.25.53;	author wosch;	state Exp;
branches;
next	1.74;

1.74
date	96.07.11.11.18.45;	author jkh;	state Exp;
branches;
next	1.73;

1.73
date	96.07.10.03.35.59;	author jkh;	state Exp;
branches;
next	1.72;

1.72
date	96.06.30.09.39.29;	author joerg;	state Exp;
branches;
next	1.71;

1.71
date	96.06.16.20.04.44;	author joerg;	state Exp;
branches;
next	1.70;

1.70
date	96.05.13.04.29.13;	author nate;	state Exp;
branches;
next	1.69;

1.69
date	96.05.01.03.26.58;	author bde;	state Exp;
branches;
next	1.68;

1.68
date	96.04.29.20.03.41;	author jkh;	state Exp;
branches;
next	1.67;

1.67
date	96.04.22.19.40.24;	author nate;	state Exp;
branches;
next	1.66;

1.66
date	96.04.18.04.02.30;	author nate;	state Exp;
branches;
next	1.65;

1.65
date	96.04.10.23.03.36;	author jkh;	state Exp;
branches;
next	1.64;

1.64
date	96.04.09.09.00.41;	author jkh;	state Exp;
branches;
next	1.63;

1.63
date	96.03.20.10.42.56;	author jkh;	state Exp;
branches;
next	1.62;

1.62
date	96.03.17.08.39.50;	author jkh;	state Exp;
branches;
next	1.61;

1.61
date	96.03.11.18.47.38;	author jkh;	state Exp;
branches;
next	1.60;

1.60
date	96.01.20.06.14.33;	author nate;	state Exp;
branches;
next	1.59;

1.59
date	96.01.07.19.19.38;	author gibbs;	state Exp;
branches;
next	1.58;

1.58
date	95.12.29.02.04.19;	author jkh;	state Exp;
branches;
next	1.57;

1.57
date	95.12.24.08.13.22;	author davidg;	state Exp;
branches;
next	1.56;

1.56
date	95.12.24.08.11.44;	author davidg;	state Exp;
branches;
next	1.55;

1.55
date	95.12.14.14.35.27;	author peter;	state Exp;
branches;
next	1.54;

1.54
date	95.12.12.08.46.34;	author gibbs;	state Exp;
branches;
next	1.53;

1.53
date	95.12.10.22.14.15;	author bde;	state Exp;
branches;
next	1.52;

1.52
date	95.11.29.20.07.46;	author nate;	state Exp;
branches;
next	1.51;

1.51
date	95.11.09.22.46.58;	author gibbs;	state Exp;
branches;
next	1.50;

1.50
date	95.11.05.17.02.50;	author gibbs;	state Exp;
branches;
next	1.49;

1.49
date	95.10.31.16.59.59;	author joerg;	state Exp;
branches;
next	1.48;

1.48
date	95.10.25.16.43.00;	author jkh;	state Exp;
branches;
next	1.47;

1.47
date	95.08.18.11.26.16;	author jkh;	state Exp;
branches;
next	1.46;

1.46
date	95.06.11.19.31.11;	author rgrimes;	state Exp;
branches
	1.46.2.1;
next	1.45;

1.45
date	95.05.14.02.59.44;	author davidg;	state Exp;
branches
	1.45.2.1;
next	1.44;

1.44
date	95.05.02.04.40.06;	author phk;	state Exp;
branches;
next	1.43;

1.43
date	95.04.24.05.33.58;	author phk;	state Exp;
branches;
next	1.42;

1.42
date	95.04.20.06.05.17;	author phk;	state Exp;
branches;
next	1.41;

1.41
date	95.04.10.19.13.51;	author phk;	state Exp;
branches;
next	1.40;

1.40
date	95.04.10.19.12.29;	author phk;	state Exp;
branches;
next	1.39;

1.39
date	95.04.08.21.41.51;	author phk;	state Exp;
branches;
next	1.38;

1.38
date	95.04.08.09.36.00;	author phk;	state Exp;
branches;
next	1.37;

1.37
date	95.03.30.00.20.07;	author rgrimes;	state Exp;
branches;
next	1.36;

1.36
date	95.03.18.08.12.47;	author rgrimes;	state Exp;
branches;
next	1.35;

1.35
date	95.03.12.12.10.35;	author amurai;	state Exp;
branches;
next	1.34;

1.34
date	95.03.05.22.23.31;	author joerg;	state Exp;
branches;
next	1.33;

1.33
date	95.03.02.04.06.03;	author jkh;	state Exp;
branches;
next	1.32;

1.32
date	95.02.15.20.38.36;	author joerg;	state Exp;
branches;
next	1.31;

1.31
date	95.02.09.11.21.07;	author jkh;	state Exp;
branches;
next	1.30;

1.30
date	95.01.28.05.01.43;	author jkh;	state Exp;
branches;
next	1.29;

1.29
date	95.01.27.07.48.58;	author phk;	state Exp;
branches;
next	1.28;

1.28
date	95.01.26.05.04.34;	author ache;	state Exp;
branches;
next	1.27;

1.27
date	95.01.24.20.38.27;	author paul;	state Exp;
branches;
next	1.26;

1.26
date	95.01.14.10.48.56;	author jkh;	state Exp;
branches;
next	1.25;

1.25
date	95.01.14.02.39.19;	author jkh;	state Exp;
branches;
next	1.24;

1.24
date	95.01.13.02.23.03;	author gibbs;	state Exp;
branches;
next	1.23;

1.23
date	95.01.12.15.37.14;	author jkh;	state Exp;
branches;
next	1.22;

1.22
date	94.12.18.12.01.40;	author jkh;	state Exp;
branches;
next	1.21;

1.21
date	94.12.16.06.04.14;	author phk;	state Exp;
branches;
next	1.20;

1.20
date	94.11.18.19.10.25;	author jkh;	state Exp;
branches;
next	1.19;

1.19
date	94.11.17.20.20.53;	author gibbs;	state Exp;
branches;
next	1.18;

1.18
date	94.11.13.10.17.04;	author gibbs;	state Exp;
branches;
next	1.17;

1.17
date	94.11.13.09.42.07;	author nate;	state Exp;
branches;
next	1.16;

1.16
date	94.11.13.07.20.03;	author davidg;	state Exp;
branches;
next	1.15;

1.15
date	94.11.12.20.27.24;	author jkh;	state Exp;
branches;
next	1.14;

1.14
date	94.11.12.06.12.01;	author jkh;	state Exp;
branches;
next	1.13;

1.13
date	94.11.11.05.48.49;	author davidg;	state Exp;
branches;
next	1.12;

1.12
date	94.11.10.23.46.31;	author jkh;	state Exp;
branches;
next	1.11;

1.11
date	94.11.08.07.39.26;	author jkh;	state Exp;
branches;
next	1.10;

1.10
date	94.11.05.07.41.08;	author jkh;	state Exp;
branches;
next	1.9;

1.9
date	94.11.05.07.38.50;	author jkh;	state Exp;
branches;
next	1.8;

1.8
date	94.11.03.15.51.36;	author jkh;	state Exp;
branches;
next	1.7;

1.7
date	94.11.03.01.46.59;	author gpalmer;	state Exp;
branches;
next	1.6;

1.6
date	94.10.26.19.20.26;	author jkh;	state Exp;
branches;
next	1.5;

1.5
date	94.10.24.22.18.11;	author sos;	state Exp;
branches;
next	1.4;

1.4
date	94.10.22.17.50.17;	author phk;	state Exp;
branches;
next	1.3;

1.3
date	94.10.20.00.53.25;	author phk;	state Exp;
branches;
next	1.2;

1.2
date	94.10.20.00.19.34;	author phk;	state Exp;
branches;
next	1.1;

1.1
date	94.10.17.21.10.19;	author phk;	state Exp;
branches;
next	;

1.603.2.1
date	2013.03.05.00.59.05;	author svnexp;	state dead;
branches;
next	1.603.2.2;

1.603.2.2
date	2013.03.28.13.03.56;	author svnexp;	state Exp;
branches;
next	;

1.568.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches;
next	1.568.2.2;

1.568.2.2
date	2011.10.07.20.40.45;	author delphij;	state Exp;
branches;
next	1.568.2.3;

1.568.2.3
date	2011.10.15.21.23.04;	author kensmith;	state Exp;
branches;
next	1.568.2.4;

1.568.2.4
date	2011.10.26.19.45.20;	author kensmith;	state Exp;
branches;
next	1.568.2.5;

1.568.2.5
date	2011.10.26.19.59.06;	author kensmith;	state Exp;
branches;
next	1.568.2.6;

1.568.2.6
date	2011.10.26.23.05.59;	author kensmith;	state Exp;
branches;
next	1.568.2.7;

1.568.2.7
date	2011.11.07.13.40.54;	author marius;	state Exp;
branches
	1.568.2.7.2.1;
next	1.568.2.8;

1.568.2.8
date	2012.02.14.15.58.49;	author jimharris;	state Exp;
branches;
next	1.568.2.9;

1.568.2.9
date	2012.02.15.17.28.09;	author ken;	state Exp;
branches;
next	1.568.2.10;

1.568.2.10
date	2012.03.31.10.47.34;	author marius;	state Exp;
branches;
next	1.568.2.11;

1.568.2.11
date	2012.04.02.18.13.29;	author jkim;	state Exp;
branches;
next	1.568.2.12;

1.568.2.12
date	2012.05.22.02.24.52;	author pfg;	state Exp;
branches;
next	1.568.2.13;

1.568.2.13
date	2012.05.24.03.45.13;	author mav;	state Exp;
branches;
next	1.568.2.14;

1.568.2.14
date	2012.07.04.00.54.16;	author delphij;	state Exp;
branches
	1.568.2.14.2.1;
next	1.568.2.15;

1.568.2.15
date	2012.08.29.15.38.18;	author gjb;	state Exp;
branches;
next	1.568.2.16;

1.568.2.16
date	2012.09.26.09.22.28;	author kib;	state Exp;
branches;
next	1.568.2.17;

1.568.2.17
date	2012.11.17.11.36.44;	author svnexp;	state Exp;
branches;
next	1.568.2.18;

1.568.2.18
date	2013.01.18.05.04.45;	author svnexp;	state Exp;
branches;
next	1.568.2.19;

1.568.2.19
date	2013.01.26.06.03.10;	author svnexp;	state Exp;
branches;
next	1.568.2.20;

1.568.2.20
date	2013.02.04.16.07.56;	author svnexp;	state Exp;
branches;
next	1.568.2.21;

1.568.2.21
date	2013.02.26.06.03.13;	author svnexp;	state Exp;
branches;
next	1.568.2.22;

1.568.2.22
date	2013.04.16.17.01.44;	author svnexp;	state Exp;
branches;
next	1.568.2.23;

1.568.2.23
date	2013.07.03.10.01.45;	author svnexp;	state Exp;
branches;
next	1.568.2.24;

1.568.2.24
date	2013.07.05.10.01.44;	author svnexp;	state Exp;
branches;
next	1.568.2.25;

1.568.2.25
date	2013.07.07.00.02.34;	author svnexp;	state Exp;
branches;
next	1.568.2.26;

1.568.2.26
date	2013.08.01.14.01.43;	author svnexp;	state Exp;
branches;
next	1.568.2.27;

1.568.2.27
date	2014.01.04.05.01.47;	author svnexp;	state Exp;
branches;
next	1.568.2.28;

1.568.2.28
date	2014.03.21.18.09.53;	author svnexp;	state Exp;
branches;
next	1.568.2.29;

1.568.2.29
date	2014.05.09.04.01.45;	author svnexp;	state Exp;
branches;
next	;

1.568.2.7.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.568.2.7.2.2;

1.568.2.7.2.2
date	2012.11.17.08.36.43;	author svnexp;	state Exp;
branches;
next	;

1.568.2.14.2.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.568.2.14.2.2;

1.568.2.14.2.2
date	2012.11.17.08.47.33;	author svnexp;	state Exp;
branches;
next	;

1.531.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches;
next	1.531.2.2;

1.531.2.2
date	2009.08.13.17.54.11;	author attilio;	state Exp;
branches;
next	1.531.2.3;

1.531.2.3
date	2009.09.10.14.04.00;	author kensmith;	state Exp;
branches;
next	1.531.2.4;

1.531.2.4
date	2009.10.01.10.06.09;	author rpaulo;	state Exp;
branches
	1.531.2.4.2.1;
next	1.531.2.5;

1.531.2.5
date	2009.11.09.21.39.42;	author kensmith;	state Exp;
branches;
next	1.531.2.6;

1.531.2.6
date	2009.11.17.15.56.45;	author jhb;	state Exp;
branches;
next	1.531.2.7;

1.531.2.7
date	2010.01.12.06.00.56;	author brooks;	state Exp;
branches;
next	1.531.2.8;

1.531.2.8
date	2010.01.18.00.53.21;	author imp;	state Exp;
branches;
next	1.531.2.9;

1.531.2.9
date	2010.04.07.02.24.41;	author nwhitehorn;	state Exp;
branches;
next	1.531.2.10;

1.531.2.10
date	2010.04.26.17.03.56;	author yongari;	state Exp;
branches;
next	1.531.2.11;

1.531.2.11
date	2010.04.29.22.44.04;	author thompsa;	state Exp;
branches;
next	1.531.2.12;

1.531.2.12
date	2010.05.02.06.20.42;	author imp;	state Exp;
branches;
next	1.531.2.13;

1.531.2.13
date	2010.05.02.06.24.17;	author imp;	state Exp;
branches
	1.531.2.13.2.1;
next	1.531.2.14;

1.531.2.14
date	2010.08.11.07.11.20;	author bschmidt;	state Exp;
branches;
next	1.531.2.15;

1.531.2.15
date	2010.10.25.07.58.37;	author avg;	state Exp;
branches
	1.531.2.15.2.1;
next	1.531.2.16;

1.531.2.16
date	2011.02.18.16.29.38;	author ken;	state Exp;
branches;
next	1.531.2.17;

1.531.2.17
date	2011.04.09.12.04.35;	author bz;	state Exp;
branches;
next	1.531.2.18;

1.531.2.18
date	2011.09.16.18.41.19;	author jhb;	state Exp;
branches;
next	1.531.2.19;

1.531.2.19
date	2011.10.11.04.40.06;	author delphij;	state Exp;
branches;
next	1.531.2.20;

1.531.2.20
date	2011.11.07.13.45.18;	author marius;	state Exp;
branches;
next	1.531.2.21;

1.531.2.21
date	2012.02.14.15.56.01;	author jimharris;	state Exp;
branches
	1.531.2.21.2.1;
next	1.531.2.22;

1.531.2.22
date	2012.03.31.10.47.40;	author marius;	state Exp;
branches;
next	1.531.2.23;

1.531.2.23
date	2012.06.25.12.30.51;	author brueffer;	state Exp;
branches;
next	1.531.2.24;

1.531.2.24
date	2012.09.27.10.56.25;	author kib;	state Exp;
branches;
next	1.531.2.25;

1.531.2.25
date	2012.11.17.10.36.24;	author svnexp;	state Exp;
branches;
next	1.531.2.26;

1.531.2.26
date	2013.01.26.06.22.58;	author svnexp;	state Exp;
branches;
next	1.531.2.27;

1.531.2.27
date	2013.03.07.08.21.40;	author svnexp;	state Exp;
branches;
next	1.531.2.28;

1.531.2.28
date	2013.07.08.12.22.21;	author svnexp;	state Exp;
branches;
next	1.531.2.29;

1.531.2.29
date	2014.01.04.18.22.52;	author svnexp;	state Exp;
branches;
next	;

1.531.2.4.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	1.531.2.4.2.2;

1.531.2.4.2.2
date	2009.11.09.23.48.01;	author kensmith;	state Exp;
branches;
next	;

1.531.2.13.2.1
date	2010.06.14.02.09.06;	author kensmith;	state Exp;
branches;
next	;

1.531.2.15.2.1
date	2010.12.21.17.09.25;	author kensmith;	state Exp;
branches;
next	;

1.531.2.21.2.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.531.2.21.2.2;

1.531.2.21.2.2
date	2012.11.17.08.25.05;	author svnexp;	state Exp;
branches;
next	;

1.484.2.1
date	2007.10.11.06.20.26;	author kensmith;	state Exp;
branches;
next	1.484.2.2;

1.484.2.2
date	2007.12.15.02.57.30;	author scottl;	state Exp;
branches
	1.484.2.2.2.1;
next	1.484.2.3;

1.484.2.3
date	2008.02.03.07.28.37;	author scottl;	state Exp;
branches;
next	1.484.2.4;

1.484.2.4
date	2008.03.07.23.09.09;	author delphij;	state Exp;
branches;
next	1.484.2.5;

1.484.2.5
date	2008.04.07.08.35.31;	author rink;	state Exp;
branches;
next	1.484.2.6;

1.484.2.6
date	2008.04.10.09.39.20;	author dfr;	state Exp;
branches;
next	1.484.2.7;

1.484.2.7
date	2008.04.10.22.09.21;	author rwatson;	state Exp;
branches;
next	1.484.2.8;

1.484.2.8
date	2008.07.04.01.29.12;	author delphij;	state Exp;
branches;
next	1.484.2.9;

1.484.2.9
date	2008.07.10.03.20.34;	author yongari;	state Exp;
branches;
next	1.484.2.10;

1.484.2.10
date	2008.07.16.02.05.40;	author yongari;	state Exp;
branches;
next	1.484.2.11;

1.484.2.11
date	2008.08.11.20.31.14;	author jfv;	state Exp;
branches;
next	1.484.2.12;

1.484.2.12
date	2008.08.27.04.41.15;	author jb;	state Exp;
branches;
next	1.484.2.13;

1.484.2.13
date	2008.08.27.17.02.11;	author jhb;	state Exp;
branches;
next	1.484.2.14;

1.484.2.14
date	2008.08.29.18.54.35;	author jhb;	state Exp;
branches;
next	1.484.2.15;

1.484.2.15
date	2008.11.24.00.52.26;	author yongari;	state Exp;
branches
	1.484.2.15.2.1;
next	1.484.2.16;

1.484.2.16
date	2009.01.19.15.36.25;	author sobomax;	state Exp;
branches;
next	1.484.2.17;

1.484.2.17
date	2009.03.04.01.50.00;	author yongari;	state Exp;
branches;
next	1.484.2.18;

1.484.2.18
date	2009.03.12.03.09.11;	author bms;	state Exp;
branches;
next	1.484.2.19;

1.484.2.19
date	2009.04.14.00.35.56;	author jfv;	state Exp;
branches
	1.484.2.19.2.1;
next	1.484.2.20;

1.484.2.20
date	2009.06.18.06.03.58;	author yongari;	state Exp;
branches;
next	1.484.2.21;

1.484.2.21
date	2009.07.15.08.32.19;	author ed;	state Exp;
branches;
next	1.484.2.22;

1.484.2.22
date	2009.11.17.15.59.26;	author jhb;	state Exp;
branches;
next	1.484.2.23;

1.484.2.23
date	2010.01.12.06.04.32;	author brooks;	state Exp;
branches;
next	1.484.2.24;

1.484.2.24
date	2010.01.18.04.08.43;	author imp;	state Exp;
branches
	1.484.2.24.2.1;
next	1.484.2.25;

1.484.2.25
date	2010.04.26.17.22.02;	author yongari;	state Exp;
branches
	1.484.2.25.2.1;
next	1.484.2.26;

1.484.2.26
date	2011.11.07.13.46.16;	author marius;	state Exp;
branches;
next	1.484.2.27;

1.484.2.27
date	2012.02.17.06.58.40;	author sbruno;	state Exp;
branches;
next	1.484.2.28;

1.484.2.28
date	2012.11.17.08.04.37;	author svnexp;	state Exp;
branches;
next	;

1.484.2.2.2.1
date	2008.02.06.03.24.28;	author scottl;	state Exp;
branches;
next	;

1.484.2.15.2.1
date	2008.11.25.02.59.29;	author kensmith;	state Exp;
branches;
next	;

1.484.2.19.2.1
date	2009.04.15.03.14.26;	author kensmith;	state Exp;
branches;
next	;

1.484.2.24.2.1
date	2010.02.10.00.26.20;	author kensmith;	state Exp;
branches;
next	;

1.484.2.25.2.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.484.2.25.2.2;

1.484.2.25.2.2
date	2012.11.17.08.17.02;	author svnexp;	state Exp;
branches;
next	;

1.439.2.1
date	2005.07.18.12.23.41;	author kensmith;	state Exp;
branches;
next	1.439.2.2;

1.439.2.2
date	2005.07.29.15.40.58;	author mux;	state Exp;
branches;
next	1.439.2.3;

1.439.2.3
date	2005.09.18.03.37.58;	author scottl;	state Exp;
branches;
next	1.439.2.4;

1.439.2.4
date	2005.09.22.12.36.38;	author kensmith;	state Exp;
branches;
next	1.439.2.5;

1.439.2.5
date	2005.10.06.18.47.57;	author delphij;	state Exp;
branches;
next	1.439.2.6;

1.439.2.6
date	2005.10.06.18.52.25;	author delphij;	state Exp;
branches
	1.439.2.6.2.1;
next	1.439.2.7;

1.439.2.7
date	2005.10.28.19.21.27;	author jhb;	state Exp;
branches;
next	1.439.2.8;

1.439.2.8
date	2006.04.04.04.08.07;	author scottl;	state Exp;
branches;
next	1.439.2.9;

1.439.2.9
date	2006.04.04.17.03.43;	author emax;	state Exp;
branches
	1.439.2.9.2.1;
next	1.439.2.10;

1.439.2.10
date	2006.04.12.17.45.24;	author ps;	state Exp;
branches;
next	1.439.2.11;

1.439.2.11
date	2006.04.30.17.39.43;	author scottl;	state Exp;
branches;
next	1.439.2.12;

1.439.2.12
date	2006.07.11.16.35.52;	author sam;	state Exp;
branches;
next	1.439.2.13;

1.439.2.13
date	2006.07.13.08.11.46;	author delphij;	state Exp;
branches;
next	1.439.2.14;

1.439.2.14
date	2006.10.09.18.41.36;	author simon;	state Exp;
branches;
next	1.439.2.15;

1.439.2.15
date	2006.11.26.22.28.10;	author marius;	state Exp;
branches;
next	1.439.2.16;

1.439.2.16
date	2006.12.14.03.57.34;	author obrien;	state Exp;
branches;
next	1.439.2.17;

1.439.2.17
date	2006.12.14.04.06.59;	author obrien;	state Exp;
branches;
next	1.439.2.18;

1.439.2.18
date	2007.03.27.02.33.00;	author yongari;	state Exp;
branches
	1.439.2.18.2.1;
next	1.439.2.19;

1.439.2.19
date	2007.12.15.06.03.43;	author scottl;	state Exp;
branches;
next	1.439.2.20;

1.439.2.20
date	2008.04.24.10.46.17;	author dfr;	state Exp;
branches;
next	1.439.2.21;

1.439.2.21
date	2008.07.28.02.20.29;	author yongari;	state Exp;
branches
	1.439.2.21.2.1;
next	1.439.2.22;

1.439.2.22
date	2009.01.19.15.38.26;	author sobomax;	state Exp;
branches;
next	1.439.2.23;

1.439.2.23
date	2009.01.19.17.17.32;	author sobomax;	state Exp;
branches;
next	1.439.2.24;

1.439.2.24
date	2012.11.17.07.42.21;	author svnexp;	state Exp;
branches;
next	;

1.439.2.6.2.1
date	2005.10.28.19.22.41;	author jhb;	state Exp;
branches;
next	;

1.439.2.9.2.1
date	2006.04.12.18.09.27;	author ps;	state Exp;
branches;
next	1.439.2.9.2.2;

1.439.2.9.2.2
date	2006.05.01.00.15.12;	author scottl;	state Exp;
branches;
next	;

1.439.2.18.2.1
date	2007.12.15.06.32.33;	author scottl;	state Exp;
branches;
next	;

1.439.2.21.2.1
date	2008.10.02.02.57.24;	author kensmith;	state Exp;
branches;
next	;

1.421.2.1
date	2004.09.07.23.49.57;	author scottl;	state Exp;
branches;
next	1.421.2.2;

1.421.2.2
date	2004.09.09.23.10.48;	author scottl;	state Exp;
branches;
next	1.421.2.3;

1.421.2.3
date	2004.09.14.21.22.34;	author wpaul;	state Exp;
branches;
next	1.421.2.4;

1.421.2.4
date	2004.09.22.19.23.36;	author andre;	state Exp;
branches
	1.421.2.4.2.1;
next	1.421.2.5;

1.421.2.5
date	2004.10.23.19.58.27;	author kensmith;	state Exp;
branches;
next	1.421.2.6;

1.421.2.6
date	2005.02.28.06.49.30;	author obrien;	state Exp;
branches;
next	1.421.2.7;

1.421.2.7
date	2005.02.28.07.59.21;	author obrien;	state Exp;
branches;
next	1.421.2.8;

1.421.2.8
date	2005.03.30.01.05.53;	author murray;	state Exp;
branches;
next	1.421.2.9;

1.421.2.9
date	2005.03.31.19.40.49;	author iedowse;	state Exp;
branches;
next	1.421.2.10;

1.421.2.10
date	2005.04.01.12.46.25;	author sobomax;	state Exp;
branches;
next	1.421.2.11;

1.421.2.11
date	2005.04.02.16.37.57;	author scottl;	state Exp;
branches
	1.421.2.11.2.1;
next	1.421.2.12;

1.421.2.12
date	2005.04.09.17.00.17;	author kensmith;	state Exp;
branches;
next	1.421.2.13;

1.421.2.13
date	2005.05.10.22.45.14;	author anholt;	state Exp;
branches;
next	;

1.421.2.4.2.1
date	2004.10.23.20.04.00;	author kensmith;	state Exp;
branches;
next	;

1.421.2.11.2.1
date	2005.04.09.17.28.37;	author kensmith;	state Exp;
branches;
next	;

1.399.2.1
date	2003.12.07.04.10.47;	author scottl;	state Exp;
branches;
next	1.399.2.2;

1.399.2.2
date	2003.12.07.23.52.54;	author scottl;	state Exp;
branches;
next	1.399.2.3;

1.399.2.3
date	2004.01.26.19.42.11;	author nectar;	state Exp;
branches;
next	;

1.369.2.1
date	2002.12.18.08.11.24;	author scottl;	state Exp;
branches;
next	1.369.2.2;

1.369.2.2
date	2002.12.31.05.35.45;	author scottl;	state Exp;
branches;
next	;

1.246.2.1
date	2000.04.05.18.16.15;	author billf;	state Exp;
branches;
next	1.246.2.2;

1.246.2.2
date	2000.04.15.18.47.42;	author asmodai;	state Exp;
branches;
next	1.246.2.3;

1.246.2.3
date	2000.05.13.11.22.14;	author hoek;	state Exp;
branches;
next	1.246.2.4;

1.246.2.4
date	2000.05.14.10.40.27;	author groudier;	state Exp;
branches;
next	1.246.2.5;

1.246.2.5
date	2000.06.08.23.07.29;	author jhb;	state Exp;
branches;
next	1.246.2.6;

1.246.2.6
date	2000.06.22.06.03.12;	author peter;	state Exp;
branches;
next	1.246.2.7;

1.246.2.7
date	2000.07.13.16.13.46;	author imp;	state Exp;
branches;
next	1.246.2.8;

1.246.2.8
date	2000.07.20.02.51.02;	author msmith;	state Exp;
branches;
next	1.246.2.9;

1.246.2.9
date	2000.09.21.20.33.51;	author msmith;	state Exp;
branches;
next	1.246.2.10;

1.246.2.10
date	2000.09.21.20.42.29;	author msmith;	state Exp;
branches;
next	1.246.2.11;

1.246.2.11
date	2000.09.22.10.01.48;	author nyan;	state Exp;
branches;
next	1.246.2.12;

1.246.2.12
date	2000.09.30.02.49.30;	author ps;	state Exp;
branches;
next	1.246.2.13;

1.246.2.13
date	2000.10.03.18.46.52;	author wpaul;	state Exp;
branches;
next	1.246.2.14;

1.246.2.14
date	2000.10.05.00.45.17;	author sanpei;	state Exp;
branches;
next	1.246.2.15;

1.246.2.15
date	2000.10.12.01.47.16;	author msmith;	state Exp;
branches;
next	1.246.2.16;

1.246.2.16
date	2000.10.27.03.24.41;	author jkh;	state Exp;
branches;
next	1.246.2.17;

1.246.2.17
date	2000.10.27.10.06.56;	author msmith;	state Exp;
branches;
next	1.246.2.18;

1.246.2.18
date	2000.10.28.22.33.42;	author nik;	state Exp;
branches;
next	1.246.2.19;

1.246.2.19
date	2000.10.29.11.05.45;	author non;	state Exp;
branches;
next	1.246.2.20;

1.246.2.20
date	2000.10.31.23.16.07;	author n_hibma;	state Exp;
branches;
next	1.246.2.21;

1.246.2.21
date	2001.01.12.23.45.14;	author scottl;	state Exp;
branches;
next	1.246.2.22;

1.246.2.22
date	2001.03.07.06.43.55;	author gsutter;	state Exp;
branches;
next	1.246.2.23;

1.246.2.23
date	2001.03.07.08.08.42;	author imp;	state Exp;
branches;
next	1.246.2.24;

1.246.2.24
date	2001.04.05.17.23.10;	author sos;	state Exp;
branches;
next	1.246.2.25;

1.246.2.25
date	2001.05.13.03.50.01;	author jlemon;	state Exp;
branches;
next	1.246.2.26;

1.246.2.26
date	2001.05.30.03.21.49;	author mjacob;	state Exp;
branches;
next	1.246.2.27;

1.246.2.27
date	2001.07.11.01.08.15;	author semenu;	state Exp;
branches;
next	1.246.2.28;

1.246.2.28
date	2001.07.19.05.40.42;	author dd;	state Exp;
branches;
next	1.246.2.29;

1.246.2.29
date	2001.07.24.19.10.16;	author brooks;	state Exp;
branches;
next	1.246.2.30;

1.246.2.30
date	2001.07.25.01.00.08;	author bsd;	state Exp;
branches;
next	1.246.2.31;

1.246.2.31
date	2001.07.25.01.05.33;	author bsd;	state Exp;
branches;
next	1.246.2.32;

1.246.2.32
date	2001.07.25.18.06.05;	author iedowse;	state Exp;
branches;
next	1.246.2.33;

1.246.2.33
date	2001.07.30.17.31.40;	author wpaul;	state Exp;
branches;
next	1.246.2.34;

1.246.2.34
date	2001.08.12.13.13.46;	author joerg;	state Exp;
branches;
next	1.246.2.35;

1.246.2.35
date	2001.09.27.17.43.06;	author alfred;	state Exp;
branches;
next	1.246.2.36;

1.246.2.36
date	2001.12.13.19.17.59;	author dillon;	state Exp;
branches;
next	1.246.2.37;

1.246.2.37
date	2001.12.19.18.34.45;	author iedowse;	state Exp;
branches;
next	1.246.2.38;

1.246.2.38
date	2002.01.25.17.41.40;	author murray;	state Exp;
branches;
next	1.246.2.39;

1.246.2.39
date	2002.03.24.13.19.10;	author wilko;	state Exp;
branches;
next	1.246.2.40;

1.246.2.40
date	2002.03.27.02.16.26;	author dd;	state Exp;
branches;
next	1.246.2.41;

1.246.2.41
date	2002.04.30.22.58.38;	author scottl;	state Exp;
branches;
next	1.246.2.42;

1.246.2.42
date	2002.05.04.06.47.24;	author msmith;	state Exp;
branches;
next	1.246.2.43;

1.246.2.43
date	2002.05.23.17.04.01;	author obrien;	state Exp;
branches;
next	1.246.2.44;

1.246.2.44
date	2002.07.24.07.50.38;	author kuriyama;	state Exp;
branches;
next	1.246.2.45;

1.246.2.45
date	2002.08.01.17.26.31;	author blackend;	state Exp;
branches;
next	1.246.2.46;

1.246.2.46
date	2002.08.23.07.01.51;	author mjacob;	state Exp;
branches;
next	1.246.2.47;

1.246.2.47
date	2002.08.31.07.26.59;	author gibbs;	state Exp;
branches;
next	1.246.2.48;

1.246.2.48
date	2002.08.31.20.28.26;	author obrien;	state Exp;
branches;
next	1.246.2.49;

1.246.2.49
date	2002.10.12.15.25.13;	author kuriyama;	state Exp;
branches;
next	1.246.2.50;

1.246.2.50
date	2002.12.30.19.04.31;	author rwatson;	state Exp;
branches;
next	1.246.2.51;

1.246.2.51
date	2003.02.28.15.53.37;	author scottl;	state Exp;
branches
	1.246.2.51.2.1;
next	1.246.2.52;

1.246.2.52
date	2003.03.25.19.45.14;	author mdodd;	state Exp;
branches;
next	1.246.2.53;

1.246.2.53
date	2003.03.25.23.33.44;	author jhb;	state Exp;
branches;
next	1.246.2.54;

1.246.2.54
date	2003.04.28.03.41.46;	author simokawa;	state Exp;
branches;
next	;

1.246.2.51.2.1
date	2003.03.25.19.43.27;	author mdodd;	state Exp;
branches;
next	1.246.2.51.2.2;

1.246.2.51.2.2
date	2003.03.25.23.35.15;	author jhb;	state Exp;
branches;
next	;

1.143.2.1
date	99.02.14.19.55.39;	author jkh;	state Exp;
branches;
next	1.143.2.2;

1.143.2.2
date	99.02.15.02.50.07;	author des;	state Exp;
branches;
next	1.143.2.3;

1.143.2.3
date	99.02.20.21.14.41;	author obrien;	state Exp;
branches;
next	1.143.2.4;

1.143.2.4
date	99.02.21.21.08.10;	author obrien;	state Exp;
branches;
next	1.143.2.5;

1.143.2.5
date	99.03.29.17.59.38;	author ken;	state Exp;
branches;
next	1.143.2.6;

1.143.2.6
date	99.04.16.16.30.24;	author n_hibma;	state Exp;
branches;
next	1.143.2.7;

1.143.2.7
date	99.04.16.18.27.48;	author jkh;	state Exp;
branches;
next	1.143.2.8;

1.143.2.8
date	99.04.18.23.37.02;	author obrien;	state Exp;
branches;
next	1.143.2.9;

1.143.2.9
date	99.04.19.20.11.32;	author n_hibma;	state Exp;
branches;
next	1.143.2.10;

1.143.2.10
date	99.04.24.02.30.18;	author obrien;	state Exp;
branches;
next	1.143.2.11;

1.143.2.11
date	99.05.04.00.15.55;	author msmith;	state Exp;
branches;
next	1.143.2.12;

1.143.2.12
date	99.05.14.15.12.26;	author jkh;	state Exp;
branches;
next	1.143.2.13;

1.143.2.13
date	99.05.15.18.13.58;	author obrien;	state Exp;
branches;
next	1.143.2.14;

1.143.2.14
date	99.05.17.05.49.45;	author obrien;	state Exp;
branches;
next	1.143.2.15;

1.143.2.15
date	99.06.19.21.37.44;	author wpaul;	state Exp;
branches;
next	1.143.2.16;

1.143.2.16
date	99.07.02.04.04.53;	author jkh;	state Exp;
branches;
next	1.143.2.17;

1.143.2.17
date	99.08.08.21.22.11;	author wpaul;	state Exp;
branches;
next	1.143.2.18;

1.143.2.18
date	99.08.18.21.35.37;	author obrien;	state Exp;
branches;
next	1.143.2.19;

1.143.2.19
date	99.08.29.16.05.18;	author peter;	state Exp;
branches;
next	1.143.2.20;

1.143.2.20
date	99.09.01.22.27.00;	author eivind;	state Exp;
branches;
next	1.143.2.21;

1.143.2.21
date	99.09.11.15.46.12;	author gibbs;	state Exp;
branches;
next	1.143.2.22;

1.143.2.22
date	99.09.14.22.53.30;	author jkh;	state Exp;
branches;
next	1.143.2.23;

1.143.2.23
date	99.10.10.23.04.56;	author wpaul;	state Exp;
branches;
next	1.143.2.24;

1.143.2.24
date	99.12.05.01.56.42;	author luoqi;	state Exp;
branches;
next	1.143.2.25;

1.143.2.25
date	2000.01.08.18.39.49;	author obrien;	state Exp;
branches;
next	1.143.2.26;

1.143.2.26
date	2000.01.31.21.30.31;	author archie;	state Exp;
branches;
next	1.143.2.27;

1.143.2.27
date	2000.03.01.10.51.37;	author nik;	state Exp;
branches;
next	;

1.77.2.1
date	96.12.21.02.10.50;	author se;	state Exp;
branches;
next	1.77.2.2;

1.77.2.2
date	97.02.03.22.53.24;	author gibbs;	state Exp;
branches;
next	1.77.2.3;

1.77.2.3
date	97.02.08.15.42.24;	author joerg;	state Exp;
branches;
next	1.77.2.4;

1.77.2.4
date	97.02.22.20.31.24;	author joerg;	state Exp;
branches;
next	1.77.2.5;

1.77.2.5
date	97.04.14.00.48.30;	author gibbs;	state Exp;
branches;
next	1.77.2.6;

1.77.2.6
date	97.04.15.17.37.23;	author jkh;	state Exp;
branches;
next	1.77.2.7;

1.77.2.7
date	97.04.15.18.05.59;	author jkh;	state Exp;
branches;
next	1.77.2.8;

1.77.2.8
date	97.04.18.14.06.20;	author nate;	state Exp;
branches;
next	1.77.2.9;

1.77.2.9
date	97.05.30.21.31.07;	author se;	state Exp;
branches;
next	1.77.2.10;

1.77.2.10
date	97.06.06.12.24.17;	author jkh;	state Exp;
branches;
next	1.77.2.11;

1.77.2.11
date	97.07.16.04.45.14;	author jkh;	state Exp;
branches;
next	1.77.2.12;

1.77.2.12
date	97.10.18.11.03.10;	author joerg;	state Exp;
branches;
next	1.77.2.13;

1.77.2.13
date	97.10.30.00.38.14;	author nate;	state Exp;
branches;
next	1.77.2.14;

1.77.2.14
date	98.01.14.15.25.12;	author jkh;	state Exp;
branches;
next	1.77.2.15;

1.77.2.15
date	98.01.16.22.28.38;	author pst;	state Exp;
branches;
next	1.77.2.16;

1.77.2.16
date	98.01.21.18.41.44;	author jkh;	state Exp;
branches;
next	1.77.2.17;

1.77.2.17
date	98.03.06.23.44.22;	author julian;	state Exp;
branches;
next	1.77.2.18;

1.77.2.18
date	98.03.07.14.53.21;	author jkh;	state Exp;
branches;
next	1.77.2.19;

1.77.2.19
date	98.03.08.11.06.51;	author julian;	state Exp;
branches;
next	1.77.2.20;

1.77.2.20
date	98.03.23.05.53.57;	author yokota;	state Exp;
branches;
next	1.77.2.21;

1.77.2.21
date	98.03.23.08.04.00;	author jkh;	state Exp;
branches;
next	1.77.2.22;

1.77.2.22
date	98.03.24.01.20.14;	author jkh;	state Exp;
branches;
next	1.77.2.23;

1.77.2.23
date	98.05.06.20.07.23;	author gibbs;	state Exp;
branches;
next	1.77.2.24;

1.77.2.24
date	98.07.17.06.46.12;	author joerg;	state Exp;
branches;
next	1.77.2.25;

1.77.2.25
date	98.07.20.20.11.04;	author msmith;	state Exp;
branches;
next	1.77.2.26;

1.77.2.26
date	98.08.24.18.17.50;	author wpaul;	state Exp;
branches;
next	1.77.2.27;

1.77.2.27
date	98.09.04.19.56.26;	author msmith;	state Exp;
branches;
next	1.77.2.28;

1.77.2.28
date	98.09.26.17.36.14;	author wpaul;	state Exp;
branches;
next	1.77.2.29;

1.77.2.29
date	99.07.03.00.47.51;	author mjacob;	state Exp;
branches;
next	1.77.2.30;

1.77.2.30
date	99.09.05.08.10.49;	author peter;	state Exp;
branches;
next	;

1.46.2.1
date	95.08.26.13.17.47;	author jkh;	state Exp;
branches;
next	1.46.2.2;

1.46.2.2
date	95.08.28.17.45.46;	author jkh;	state Exp;
branches;
next	1.46.2.3;

1.46.2.3
date	95.09.14.23.47.06;	author jkh;	state Exp;
branches;
next	1.46.2.4;

1.46.2.4
date	95.09.18.01.02.17;	author jkh;	state Exp;
branches;
next	1.46.2.5;

1.46.2.5
date	95.09.23.00.50.05;	author jkh;	state Exp;
branches;
next	1.46.2.6;

1.46.2.6
date	95.10.25.17.29.51;	author jkh;	state Exp;
branches;
next	1.46.2.7;

1.46.2.7
date	96.01.04.08.51.05;	author gibbs;	state Exp;
branches;
next	1.46.2.8;

1.46.2.8
date	96.01.20.06.13.20;	author nate;	state Exp;
branches;
next	1.46.2.9;

1.46.2.9
date	96.04.18.04.04.21;	author nate;	state Exp;
branches;
next	1.46.2.10;

1.46.2.10
date	96.04.22.19.49.45;	author nate;	state Exp;
branches;
next	1.46.2.11;

1.46.2.11
date	96.07.03.05.23.11;	author nate;	state Exp;
branches;
next	1.46.2.12;

1.46.2.12
date	96.07.08.23.01.41;	author jkh;	state Exp;
branches;
next	1.46.2.13;

1.46.2.13
date	96.07.10.03.41.12;	author jkh;	state Exp;
branches;
next	1.46.2.14;

1.46.2.14
date	96.07.11.01.09.47;	author jkh;	state Exp;
branches;
next	1.46.2.15;

1.46.2.15
date	96.07.16.08.44.57;	author davidg;	state Exp;
branches;
next	1.46.2.16;

1.46.2.16
date	96.07.16.08.45.50;	author davidg;	state Exp;
branches;
next	1.46.2.17;

1.46.2.17
date	96.07.16.08.47.09;	author davidg;	state Exp;
branches;
next	1.46.2.18;

1.46.2.18
date	96.07.16.08.53.04;	author davidg;	state Exp;
branches;
next	1.46.2.19;

1.46.2.19
date	96.10.16.02.20.56;	author jkh;	state Exp;
branches;
next	1.46.2.20;

1.46.2.20
date	99.09.05.08.29.01;	author peter;	state Exp;
branches;
next	;

1.45.2.1
date	95.06.01.04.57.15;	author rgrimes;	state Exp;
branches;
next	1.45.2.2;

1.45.2.2
date	95.06.05.17.15.42;	author davidg;	state Exp;
branches;
next	1.45.2.3;

1.45.2.3
date	95.06.05.21.50.41;	author jkh;	state Exp;
branches;
next	;


desc
@@


1.607
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252867
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#
# GENERIC -- Generic kernel configuration file for FreeBSD/amd64
#
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
#
#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
# device lines is also present in the ../../conf/NOTES and NOTES files.
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
# $FreeBSD: head/sys/amd64/conf/GENERIC 252867 2013-07-06 07:49:41Z delphij $

cpu		HAMMER
ident		GENERIC

makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support

options 	SCHED_ULE		# ULE scheduler
options 	PREEMPTION		# Enable kernel thread preemption
options 	INET			# InterNETworking
options 	INET6			# IPv6 communications protocols
options 	TCP_OFFLOAD		# TCP offload
options 	SCTP			# Stream Control Transmission Protocol
options 	FFS			# Berkeley Fast Filesystem
options 	SOFTUPDATES		# Enable FFS soft updates support
options 	UFS_ACL			# Support for access control lists
options 	UFS_DIRHASH		# Improve performance on big directories
options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
options 	QUOTA			# Enable disk quotas for UFS
options 	MD_ROOT			# MD is a potential root device
options 	NFSCL			# New Network Filesystem Client
options 	NFSD			# New Network Filesystem Server
options 	NFSLOCKD		# Network Lock Manager
options 	NFS_ROOT		# NFS usable as /, requires NFSCL
options 	MSDOSFS			# MSDOS Filesystem
options 	CD9660			# ISO 9660 Filesystem
options 	PROCFS			# Process filesystem (requires PSEUDOFS)
options 	PSEUDOFS		# Pseudo-filesystem framework
options 	GEOM_PART_GPT		# GUID Partition Tables.
options 	GEOM_RAID		# Soft RAID functionality.
options 	GEOM_LABEL		# Provides labelization
options 	COMPAT_FREEBSD32	# Compatible with i386 binaries
options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
options 	KTRACE			# ktrace(1) support
options 	STACK			# stack(9) support
options 	SYSVSHM			# SYSV-style shared memory
options 	SYSVMSG			# SYSV-style message queues
options 	SYSVSEM			# SYSV-style semaphores
options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
options 	AUDIT			# Security event auditing
options 	CAPABILITY_MODE		# Capsicum capability mode
options 	CAPABILITIES		# Capsicum capabilities
options 	MAC			# TrustedBSD MAC Framework
options 	KDTRACE_FRAME		# Ensure frames are compiled in
options 	KDTRACE_HOOKS		# Kernel DTrace hooks
options 	DDB_CTF			# Kernel ELF linker loads CTF data
options 	INCLUDE_CONFIG_FILE     # Include this file in kernel

# Debugging support.  Always need this:
options 	KDB			# Enable kernel debugger support.
# For minimum debugger support (stable branch) use:
#options 	KDB_TRACE		# Print a stack trace for a panic.
# For full debugger support use this instead:
options 	DDB			# Support DDB.
options 	GDB			# Support remote GDB.
options 	DEADLKRES		# Enable the deadlock resolver
options 	INVARIANTS		# Enable calls of extra sanity checking
options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
options 	WITNESS			# Enable checks to detect deadlocks and cycles
options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones

# Make an SMP-capable kernel by default
options 	SMP			# Symmetric MultiProcessor Kernel

# CPU frequency control
device		cpufreq

# Bus support.
device		acpi
device		pci

# Floppy drives
device		fdc

# ATA controllers
device		ahci		# AHCI-compatible SATA controllers
device		ata		# Legacy ATA/SATA controllers
options 	ATA_STATIC_ID	# Static device numbering
device		mvs		# Marvell 88SX50XX/88SX60XX/88SX70XX/SoC SATA
device		siis		# SiliconImage SiI3124/SiI3132/SiI3531 SATA

# SCSI Controllers
device		ahc		# AHA2940 and onboard AIC7xxx devices
options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~128k to driver.
device		ahd		# AHA39320/29320 and onboard AIC79xx devices
options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~215k to driver.
device		esp		# AMD Am53C974 (Tekram DC-390(T))
device		hptiop		# Highpoint RocketRaid 3xxx series
device		isp		# Qlogic family
#device		ispfw		# Firmware for QLogic HBAs- normally a module
device		mpt		# LSI-Logic MPT-Fusion
device		mps		# LSI-Logic MPT-Fusion 2
#device		ncr		# NCR/Symbios Logic
device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
device		trm		# Tekram DC395U/UW/F DC315U adapters

device		adv		# Advansys SCSI adapters
device		adw		# Advansys wide SCSI adapters
device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
device		isci		# Intel C600 SAS controller

# ATA/SCSI peripherals
device		scbus		# SCSI bus (required for ATA/SCSI)
device		ch		# SCSI media changers
device		da		# Direct Access (disks)
device		sa		# Sequential Access (tape etc)
device		cd		# CD
device		pass		# Passthrough device (direct ATA/SCSI access)
device		ses		# Enclosure Services (SES and SAF-TE)
#device		ctl		# CAM Target Layer

# RAID controllers interfaced to the SCSI subsystem
device		amr		# AMI MegaRAID
device		arcmsr		# Areca SATA II RAID
#XXX it is not 64-bit clean, -scottl
#device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
device		ciss		# Compaq Smart RAID 5*
device		dpt		# DPT Smartcache III, IV - See NOTES for options
device		hptmv		# Highpoint RocketRAID 182x
device		hptnr		# Highpoint DC7280, R750
device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
device		hpt27xx		# Highpoint RocketRAID 27xx
device		iir		# Intel Integrated RAID
device		ips		# IBM (Adaptec) ServeRAID
device		mly		# Mylex AcceleRAID/eXtremeRAID
device		twa		# 3ware 9000 series PATA/SATA RAID
device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller

# RAID controllers
device		aac		# Adaptec FSA RAID
device		aacp		# SCSI passthrough for aac (requires CAM)
device		aacraid		# Adaptec by PMC RAID
device		ida		# Compaq Smart RAID
device		mfi		# LSI MegaRAID SAS
device		mlx		# Mylex DAC960 family
#XXX pointer/int warnings
#device		pst		# Promise Supertrak SX6000
device		twe		# 3ware ATA RAID

# atkbdc0 controls both the keyboard and the PS/2 mouse
device		atkbdc		# AT keyboard controller
device		atkbd		# AT keyboard
device		psm		# PS/2 mouse

device		kbdmux		# keyboard multiplexer

device		vga		# VGA video card driver
options 	VESA		# Add support for VESA BIOS Extensions (VBE)

device		splash		# Splash screen and screen saver support

# syscons is the default console driver, resembling an SCO console
device		sc
options 	SC_PIXEL_MODE	# add support for the raster text mode

device		agp		# support several AGP chipsets

# PCCARD (PCMCIA) support
# PCMCIA and cardbus bridge support
device		cbb		# cardbus (yenta) bridge
device		pccard		# PC Card (16-bit) bus
device		cardbus		# CardBus (32-bit) bus

# Serial (COM) ports
device		uart		# Generic UART driver

# Parallel port
device		ppc
device		ppbus		# Parallel port bus (required)
device		lpt		# Printer
device		ppi		# Parallel port interface device
#device		vpo		# Requires scbus and da

device		puc		# Multi I/O cards and multi-channel UARTs

# PCI Ethernet NICs.
device		bxe		# Broadcom BCM57710/BCM57711/BCM57711E 10Gb Ethernet
device		de		# DEC/Intel DC21x4x (``Tulip'')
device		em		# Intel PRO/1000 Gigabit Ethernet Family
device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
device		txp		# 3Com 3cR990 (``Typhoon'')
device		vx		# 3Com 3c590, 3c595 (``Vortex'')

# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device		miibus		# MII bus support
device		ae		# Attansic/Atheros L2 FastEthernet
device		age		# Attansic/Atheros L1 Gigabit Ethernet
device		alc		# Atheros AR8131/AR8132 Ethernet
device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
device		bfe		# Broadcom BCM440x 10/100 Ethernet
device		bge		# Broadcom BCM570xx Gigabit Ethernet
device		cas		# Sun Cassini/Cassini+ and NS DP83065 Saturn
device		dc		# DEC/Intel 21143 and various workalikes
device		et		# Agere ET1310 10/100/Gigabit Ethernet
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
device		gem		# Sun GEM/Sun ERI/Apple GMAC
device		hme		# Sun HME (Happy Meal Ethernet)
device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device		lge		# Level 1 LXT1001 gigabit Ethernet
device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
device		nfe		# nVidia nForce MCP on-board Ethernet
device		nge		# NatSemi DP83820 gigabit Ethernet
#device		nve		# nVidia nForce MCP on-board Ethernet Networking
device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
device		re		# RealTek 8139C+/8169/8169S/8110S
device		rl		# RealTek 8129/8139
device		sf		# Adaptec AIC-6915 (``Starfire'')
device		sge		# Silicon Integrated Systems SiS190/191
device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
device		ste		# Sundance ST201 (D-Link DFE-550TX)
device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
device		tl		# Texas Instruments ThunderLAN
device		tx		# SMC EtherPower II (83c170 ``EPIC'')
device		vge		# VIA VT612x gigabit Ethernet
device		vr		# VIA Rhine, Rhine II
device		wb		# Winbond W89C840F
device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')

# ISA Ethernet NICs.  pccard NICs included.
device		cs		# Crystal Semiconductor CS89x0 NIC
# 'device ed' requires 'device miibus'
device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
device		ex		# Intel EtherExpress Pro/10 and Pro/10+
device		ep		# Etherlink III based cards
device		fe		# Fujitsu MB8696x based cards
device		sn		# SMC's 9000 series of Ethernet chips
device		xe		# Xircom pccard Ethernet

# Wireless NIC cards
device		wlan		# 802.11 support
options 	IEEE80211_DEBUG	# enable debug msgs
options 	IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
device		wlan_wep	# 802.11 WEP support
device		wlan_ccmp	# 802.11 CCMP support
device		wlan_tkip	# 802.11 TKIP support
device		wlan_amrr	# AMRR transmit rate control algorithm
device		an		# Aironet 4500/4800 802.11 wireless NICs.
device		ath		# Atheros NICs
device		ath_pci		# Atheros pci/cardbus glue
device		ath_hal		# pci/cardbus chip support
options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
options 	AH_AR5416_INTERRUPT_MITIGATION	# AR5416 interrupt mitigation
options 	ATH_ENABLE_11N	# Enable 802.11n support for AR5416 and later
device		ath_rate_sample	# SampleRate tx rate control for ath
#device		bwi		# Broadcom BCM430x/BCM431x wireless NICs.
#device		bwn		# Broadcom BCM43xx wireless NICs.
device		ipw		# Intel 2100 wireless NICs.
device		iwi		# Intel 2200BG/2225BG/2915ABG wireless NICs.
device		iwn		# Intel 4965/1000/5000/6000 wireless NICs.
device		malo		# Marvell Libertas wireless NICs.
device		mwl		# Marvell 88W8363 802.11n wireless NICs.
device		ral		# Ralink Technology RT2500 wireless NICs.
device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
device		wpi		# Intel 3945ABG wireless NICs.

# Pseudo devices.
device		loop		# Network loopback
device		random		# Entropy device
options 	PADLOCK_RNG	# VIA Padlock RNG
options 	RDRAND_RNG	# Intel Bull Mountain RNG
device		ether		# Ethernet support
device		vlan		# 802.1Q VLAN support
device		tun		# Packet tunnel.
device		md		# Memory "disks"
device		gif		# IPv6 and IPv4 tunneling
device		faith		# IPv6-to-IPv4 relaying (translation)
device		firmware	# firmware assist module

# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
# Note that 'bpf' is required for DHCP.
device		bpf		# Berkeley packet filter

# USB support
options 	USB_DEBUG	# enable debug msgs
device		uhci		# UHCI PCI->USB interface
device		ohci		# OHCI PCI->USB interface
device		ehci		# EHCI PCI->USB interface (USB 2.0)
device		xhci		# XHCI PCI->USB interface (USB 3.0)
device		usb		# USB Bus (required)
device		ukbd		# Keyboard
device		umass		# Disks/Mass storage - Requires scbus and da

# Sound support
device		sound		# Generic sound driver (required)
device		snd_cmi		# CMedia CMI8338/CMI8738
device		snd_csa		# Crystal Semiconductor CS461x/428x
device		snd_emu10kx	# Creative SoundBlaster Live! and Audigy
device		snd_es137x	# Ensoniq AudioPCI ES137x
device		snd_hda		# Intel High Definition Audio
device		snd_ich		# Intel, NVidia and other ICH AC'97 Audio
device		snd_via8233	# VIA VT8233x Audio

# MMC/SD
device		mmc		# MMC/SD bus
device		mmcsd		# MMC/SD memory card
device		sdhci		# Generic PCI SD Host Controller

# VirtIO support
device		virtio		# Generic VirtIO bus (required)
device		virtio_pci	# VirtIO PCI device
device		vtnet		# VirtIO Ethernet device
device		virtio_blk	# VirtIO Block device
device		virtio_scsi	# VirtIO SCSI device
device		virtio_balloon	# VirtIO Memory Balloon device
@


1.606
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/250963
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 250963 2013-05-24 09:22:43Z achim $
d150 1
@


1.605
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249410
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 249410 2013-04-12 16:25:03Z trasz $
d161 1
@


1.604
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249083
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 249083 2013-04-04 07:12:24Z mav $
d140 1
a140 4
device		ctl		# CAM Target Layer
options		CTL_DISABLE	# Disable CTL by default to save memory.
				# Re-enable with kern.cam.ctl.disable=0 in
				# /boot/loader.conf
@


1.603
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247814
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 247814 2013-03-04 21:18:45Z ken $
a104 1
options 	ATA_CAM		# Handle legacy controllers with CAM
@


1.603.2.1
log
@file GENERIC was added on branch RELENG_8_4 on 2013-03-28 13:03:56 +0000
@
text
@d1 344
@


1.603.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 341
#
# GENERIC -- Generic kernel configuration file for FreeBSD/amd64
#
# For more information on this file, please read the config(5) manual page,
# and/or the handbook section on Kernel Configuration Files:
#
#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
# device lines is also present in the ../../conf/NOTES and NOTES files.
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
# $FreeBSD: releng/8.4/sys/amd64/conf/GENERIC 247909 2013-03-07 07:28:05Z bryanv $

cpu		HAMMER
ident		GENERIC

# To statically compile in device wiring instead of /boot/device.hints
#hints		"GENERIC.hints"		# Default places to look for devices.

# Use the following to compile in values accessible to the kernel
# through getenv() (or kenv(1) in userland). The format of the file
# is 'variable=value', see kenv(1)
#
# env		"GENERIC.env"

makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols

options 	SCHED_ULE		# ULE scheduler
options 	PREEMPTION		# Enable kernel thread preemption
options 	INET			# InterNETworking
options 	INET6			# IPv6 communications protocols
options 	SCTP			# Stream Control Transmission Protocol
options 	FFS			# Berkeley Fast Filesystem
options 	SOFTUPDATES		# Enable FFS soft updates support
options 	UFS_ACL			# Support for access control lists
options 	UFS_DIRHASH		# Improve performance on big directories
options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling
options 	MD_ROOT			# MD is a potential root device
options 	NFSCLIENT		# Network Filesystem Client
options 	NFSSERVER		# Network Filesystem Server
options 	NFSLOCKD		# Network Lock Manager
options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
options 	MSDOSFS			# MSDOS Filesystem
options 	CD9660			# ISO 9660 Filesystem
options 	PROCFS			# Process filesystem (requires PSEUDOFS)
options 	PSEUDOFS		# Pseudo-filesystem framework
options 	GEOM_PART_GPT		# GUID Partition Tables.
options 	GEOM_LABEL		# Provides labelization
options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
options 	COMPAT_FREEBSD32	# Compatible with i386 binaries
options 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
options 	COMPAT_FREEBSD6		# Compatible with FreeBSD6
options 	COMPAT_FREEBSD7		# Compatible with FreeBSD7
options 	SCSI_DELAY=5000		# Delay (in ms) before probing SCSI
options 	KTRACE			# ktrace(1) support
options 	STACK			# stack(9) support
options 	SYSVSHM			# SYSV-style shared memory
options 	SYSVMSG			# SYSV-style message queues
options 	SYSVSEM			# SYSV-style semaphores
options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options 	PRINTF_BUFR_SIZE=128	# Prevent printf output being interspersed.
options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
options 	AUDIT			# Security event auditing
options 	MAC			# TrustedBSD MAC Framework
#options 	KDTRACE_FRAME		# Ensure frames are compiled in
#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
options 	INCLUDE_CONFIG_FILE     # Include this file in kernel

options 	KDB			# Kernel debugger related code
options 	KDB_TRACE		# Print a stack trace for a panic

# Make an SMP-capable kernel by default
options 	SMP			# Symmetric MultiProcessor Kernel

# CPU frequency control
device		cpufreq

# Bus support.
device		acpi
device		pci

# Floppy drives
device		fdc

# ATA and ATAPI devices
device		ata
device		atadisk		# ATA disk drives
device		ataraid		# ATA RAID drives
device		atapicd		# ATAPI CDROM drives
device		atapifd		# ATAPI floppy drives
device		atapist		# ATAPI tape drives
options 	ATA_STATIC_ID	# Static device numbering

# SCSI Controllers
device		ahc		# AHA2940 and onboard AIC7xxx devices
options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~128k to driver.
device		ahd		# AHA39320/29320 and onboard AIC79xx devices
options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~215k to driver.
device		esp		# AMD Am53C974 (Tekram DC-390(T))
device		hptiop		# Highpoint RocketRaid 3xxx series
device		isp		# Qlogic family
#device		ispfw		# Firmware for QLogic HBAs- normally a module
device		mpt		# LSI-Logic MPT-Fusion
device		mps		# LSI-Logic MPT-Fusion 2
#device		ncr		# NCR/Symbios Logic
device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
device		trm		# Tekram DC395U/UW/F DC315U adapters

device		adv		# Advansys SCSI adapters
device		adw		# Advansys wide SCSI adapters
device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device		bt		# Buslogic/Mylex MultiMaster SCSI adapters
device		isci		# Intel C600 SAS controller

# SCSI peripherals
device		scbus		# SCSI bus (required for SCSI)
device		ch		# SCSI media changers
device		da		# Direct Access (disks)
device		sa		# Sequential Access (tape etc)
device		cd		# CD
device		pass		# Passthrough device (direct SCSI access)
device		ses		# SCSI Environmental Services (and SAF-TE)

# RAID controllers interfaced to the SCSI subsystem
device		amr		# AMI MegaRAID
device		arcmsr		# Areca SATA II RAID
#XXX it is not 64-bit clean, -scottl
#device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
device		ciss		# Compaq Smart RAID 5*
device		dpt		# DPT Smartcache III, IV - See NOTES for options
device		hptmv		# Highpoint RocketRAID 182x
device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
device		hpt27xx		# Highpoint RocketRAID 27xx
device		iir		# Intel Integrated RAID
device		ips		# IBM (Adaptec) ServeRAID
device		mly		# Mylex AcceleRAID/eXtremeRAID
device		twa		# 3ware 9000 series PATA/SATA RAID

# RAID controllers
device		aac		# Adaptec FSA RAID
device		aacp		# SCSI passthrough for aac (requires CAM)
device		ida		# Compaq Smart RAID
device		mfi		# LSI MegaRAID SAS
device		mlx		# Mylex DAC960 family
#XXX pointer/int warnings
#device		pst		# Promise Supertrak SX6000
device		twe		# 3ware ATA RAID
device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller

# atkbdc0 controls both the keyboard and the PS/2 mouse
device		atkbdc		# AT keyboard controller
device		atkbd		# AT keyboard
device		psm		# PS/2 mouse

device		kbdmux		# keyboard multiplexer

device		vga		# VGA video card driver

device		splash		# Splash screen and screen saver support

# syscons is the default console driver, resembling an SCO console
device		sc

device		agp		# support several AGP chipsets

# PCCARD (PCMCIA) support
# PCMCIA and cardbus bridge support
device		cbb		# cardbus (yenta) bridge
device		pccard		# PC Card (16-bit) bus
device		cardbus		# CardBus (32-bit) bus

# Serial (COM) ports
device		uart		# Generic UART driver

# Parallel port
device		ppc
device		ppbus		# Parallel port bus (required)
device		lpt		# Printer
device		plip		# TCP/IP over parallel
device		ppi		# Parallel port interface device
#device		vpo		# Requires scbus and da

device		puc		# Multi I/O cards and multi-channel UARTs

# PCI Ethernet NICs.
device		de		# DEC/Intel DC21x4x (``Tulip'')
device		em		# Intel PRO/1000 Gigabit Ethernet Family
device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
device		txp		# 3Com 3cR990 (``Typhoon'')
device		vx		# 3Com 3c590, 3c595 (``Vortex'')

# PCI Ethernet NICs that use the common MII bus controller code.
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
device		miibus		# MII bus support
device		ae		# Attansic/Atheros L2 FastEthernet
device		age		# Attansic/Atheros L1 Gigabit Ethernet
device		alc		# Atheros AR8131/AR8132 Ethernet
device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
device		bfe		# Broadcom BCM440x 10/100 Ethernet
device		bge		# Broadcom BCM570xx Gigabit Ethernet
device		cas		# Sun Cassini/Cassini+ and NS DP83065 Saturn
device		dc		# DEC/Intel 21143 and various workalikes
device		et		# Agere ET1310 10/100/Gigabit Ethernet
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
device		gem		# Sun GEM/Sun ERI/Apple GMAC
device		hme		# Sun HME (Happy Meal Ethernet)
device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
device		lge		# Level 1 LXT1001 gigabit Ethernet
device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
device		nfe		# nVidia nForce MCP on-board Ethernet
device		nge		# NatSemi DP83820 gigabit Ethernet
#device		nve		# nVidia nForce MCP on-board Ethernet Networking
device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
device		re		# RealTek 8139C+/8169/8169S/8110S
device		rl		# RealTek 8129/8139
device		sf		# Adaptec AIC-6915 (``Starfire'')
device		sge		# Silicon Integrated Systems SiS190/191
device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
device		sk		# SysKonnect SK-984x & SK-982x gigabit Ethernet
device		ste		# Sundance ST201 (D-Link DFE-550TX)
device		stge		# Sundance/Tamarack TC9021 gigabit Ethernet
device		tl		# Texas Instruments ThunderLAN
device		tx		# SMC EtherPower II (83c170 ``EPIC'')
device		vge		# VIA VT612x gigabit Ethernet
device		vr		# VIA Rhine, Rhine II
device		wb		# Winbond W89C840F
device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')

# ISA Ethernet NICs.  pccard NICs included.
device		cs		# Crystal Semiconductor CS89x0 NIC
# 'device ed' requires 'device miibus'
device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
device		ex		# Intel EtherExpress Pro/10 and Pro/10+
device		ep		# Etherlink III based cards
device		fe		# Fujitsu MB8696x based cards
device		sn		# SMC's 9000 series of Ethernet chips
device		xe		# Xircom pccard Ethernet

# Wireless NIC cards
device		wlan		# 802.11 support
options 	IEEE80211_DEBUG	# enable debug msgs
options 	IEEE80211_AMPDU_AGE # age frames in AMPDU reorder q's
options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
device		wlan_wep	# 802.11 WEP support
device		wlan_ccmp	# 802.11 CCMP support
device		wlan_tkip	# 802.11 TKIP support
device		wlan_amrr	# AMRR transmit rate control algorithm
device		an		# Aironet 4500/4800 802.11 wireless NICs.
device		ath		# Atheros pci/cardbus NIC's
device		ath_hal		# pci/cardbus chip support
options 	AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
device		ath_rate_sample	# SampleRate tx rate control for ath
device		ral		# Ralink Technology RT2500 wireless NICs.
device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.

# Pseudo devices.
device		loop		# Network loopback
device		random		# Entropy device
options 	PADLOCK_RNG	# VIA Padlock RNG
options 	RDRAND_RNG	# Intel Bull Mountain RNG
device		ether		# Ethernet support
device		vlan		# 802.1Q VLAN support
device		tun		# Packet tunnel.
device		pty		# BSD-style compatibility pseudo ttys
device		md		# Memory "disks"
device		gif		# IPv6 and IPv4 tunneling
device		faith		# IPv6-to-IPv4 relaying (translation)
device		firmware	# firmware assist module

# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
# Note that 'bpf' is required for DHCP.
device		bpf		# Berkeley packet filter

# USB support
options 	USB_DEBUG	# enable debug msgs
device		uhci		# UHCI PCI->USB interface
device		ohci		# OHCI PCI->USB interface
device		ehci		# EHCI PCI->USB interface (USB 2.0)
device		usb		# USB Bus (required)
#device		udbp		# USB Double Bulk Pipe devices
device		uhid		# "Human Interface Devices"
device		ukbd		# Keyboard
device		ulpt		# Printer
device		umass		# Disks/Mass storage - Requires scbus and da
device		ums		# Mouse
device		urio		# Diamond Rio 500 MP3 player
# USB Serial devices
device		uark		# Technologies ARK3116 based serial adapters
device		ubsa		# Belkin F5U103 and compatible serial adapters
device		uftdi		# For FTDI usb serial adapters
device		uipaq		# Some WinCE based devices
device		uplcom		# Prolific PL-2303 serial adapters
device		uslcom		# SI Labs CP2101/CP2102 serial adapters
device		uvisor		# Visor and Palm devices
device		uvscom		# USB serial support for DDI pocket's PHS
# USB Ethernet, requires miibus
device		aue		# ADMtek USB Ethernet
device		axe		# ASIX Electronics USB Ethernet
device		cdce		# Generic USB over Ethernet
device		cue		# CATC USB Ethernet
device		kue		# Kawasaki LSI USB Ethernet
device		rue		# RealTek RTL8150 USB Ethernet
device		udav		# Davicom DM9601E USB
# USB Wireless
device		rum		# Ralink Technology RT2501USB wireless NICs
device		uath		# Atheros AR5523 wireless NICs
device		ural		# Ralink Technology RT2500USB wireless NICs
device		zyd		# ZyDAS zd1211/zd1211b wireless NICs

# FireWire support
device		firewire	# FireWire bus code
#device		sbp		# SCSI over FireWire (Requires scbus and da)
device		fwe		# Ethernet over FireWire (non-standard!)
device		fwip		# IP over FireWire (RFC 2734,3146)
device		dcons		# Dumb console driver
device		dcons_crom	# Configuration ROM for dcons

# VirtIO support
device		virtio		# Generic VirtIO bus (required)
device		virtio_pci	# VirtIO PCI device
device		vtnet		# VirtIO Ethernet device
device		virtio_blk	# VirtIO Block device
device		virtio_scsi	# VirtIO SCSI device
device		virtio_balloon	# VirtIO Memory Balloon device
@


1.602
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247615
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 247615 2013-03-02 08:12:41Z adrian $
d141 4
a144 1
#device		ctl		# CAM Target Layer
@


1.601
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/246222
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 246222 2013-02-01 20:17:11Z eadler $
d141 1
a141 1
device		ctl		# CAM Target Layer
@


1.600
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245362
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 245362 2013-01-13 07:14:16Z bryanv $
a199 1
device		plip		# TCP/IP over parallel
@


1.599
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245003
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 245003 2013-01-03 19:03:41Z kib $
d335 8
@


1.598
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/244992
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 244992 2013-01-03 14:30:24Z des $
d38 1
@


1.597
log
@Switching exporter and resync
@
text
@d19 1
a19 1
# $FreeBSD: head/sys/amd64/conf/GENERIC 240455 2012-09-13 10:12:16Z kib $
a319 9
# FireWire support
device		firewire	# FireWire bus code
# sbp(4) works for some systems but causes boot failure on others
#device		sbp		# SCSI over FireWire (Requires scbus and da)
device		fwe		# Ethernet over FireWire (non-standard!)
device		fwip		# IP over FireWire (RFC 2734,3146)
device		dcons		# Dumb console driver
device		dcons_crom	# Configuration ROM for dcons

@


1.596
log
@SVN rev 240455 on 2012-09-13 10:12:16Z by kib

Rename the IVY_RNG option to RDRAND_RNG.

Based on submission by:	Arthur Mesh <arthurmesh@@gmail.com>
MFC after:	2 weeks
@
text
@d19 1
a19 1
# $FreeBSD$
@


1.595
log
@SVN rev 240135 on 2012-09-05 13:18:51Z by kib

Add support for new Intel on-CPU Bull Mountain random number
generator, found on IvyBridge and supposedly later CPUs, accessible
with RDRAND instruction.

From the Intel whitepapers and articles about Bull Mountain, it seems
that we do not need to perform post-processing of RDRAND results, like
AES-encryption of the data with random IV and keys, which was done for
Padlock. Intel claims that sanitization is performed in hardware.

Make both Padlock and Bull Mountain random generators support code
covered by kernel config options, for the benefit of people who prefer
minimal kernels. Also add the tunables to disable hardware generator
even if detected.

Reviewed by:	markm, secteam (simon)
Tested by:	bapt, Michael Moll <kvedulv@@kvedulv.de>
MFC after:	3 weeks
@
text
@d296 1
a296 1
options 	IVY_RNG		# Intel Bull Mountain RNG
@


1.594
log
@SVN rev 240104 on 2012-09-04 21:02:57Z by delphij

Add hpt27xx to GENERIC kernel for amd64 and i386 systems.

MFC after:	2 weeks
@
text
@d295 2
@


1.593
log
@SVN rev 239699 on 2012-08-26 01:21:02Z by gjb

Grammar fix: s/NIC's/NICs/

MFC after:	3 days
@
text
@d151 1
@


1.592
log
@SVN rev 237901 on 2012-07-01 08:10:49Z by delphij

tws(4) is interfaced with CAM so move it to the same section.

Reported by:	joel
MFC after:	3 days
@
text
@d273 1
a273 1
device		ath		# Atheros NIC's
@


1.591
log
@SVN rev 237263 on 2012-06-19 07:34:13Z by np

- Updated TOE support in the kernel.

- Stateful TCP offload drivers for Terminator 3 and 4 (T3 and T4) ASICs.
  These are available as t3_tom and t4_tom modules that augment cxgb(4)
  and cxgbe(4) respectively.  The cxgb/cxgbe drivers continue to work as
  usual with or without these extra features.

- iWARP driver for Terminator 3 ASIC (kernel verbs).  T4 iWARP in the
  works and will follow soon.

Build-tested with make universe.

30s overview
============
What interfaces support TCP offload?  Look for TOE4 and/or TOE6 in the
capabilities of an interface:
# ifconfig -m | grep TOE

Enable/disable TCP offload on an interface (just like any other ifnet
capability):
# ifconfig cxgbe0 toe
# ifconfig cxgbe0 -toe

Which connections are offloaded?  Look for toe4 and/or toe6 in the
output of netstat and sockstat:
# netstat -np tcp | grep toe
# sockstat -46c | grep toe

Reviewed by:	bz, gnn
Sponsored by:	Chelsio communications.
MFC after:	~3 months (after 9.1, and after ensuring MFC is feasible)
@
text
@d155 1
a165 1
device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller
@


1.590
log
@SVN rev 237136 on 2012-06-15 15:32:16Z by adrian

Oops - use the actual 11n enable option.
@
text
@d31 1
@


1.589
log
@SVN rev 237109 on 2012-06-15 02:16:29Z by adrian

Ok, ok. 802.11n can be on by default in GENERIC in -HEAD.

God help me.
@
text
@d277 1
a277 1
options 	ATH_SUPPORT_11N	# Enable 802.11n support for AR5416 and later
@


1.588
log
@SVN rev 235226 on 2012-05-10 12:37:32Z by mav

Add `options GEOM_RAID` into i386 and amd64 GENERIC kernels.

ataraid(4) previously was present there and having GEOM RAID is convinient.
Unlike other classes GEOM RAID can be set up from BIOS before install and
users are expecting it to be detected automatically.
@
text
@d276 2
@


1.587
log
@SVN rev 235150 on 2012-05-09 01:37:48Z by brooks

The DDB_CTF has little or nothing to do with the debugger so move it
next KDTRACE_HOOKS.
@
text
@d47 1
@


1.586
log
@SVN rev 234504 on 2012-04-20 21:37:42Z by brooks

Enable DTrace hooks in GENERIC.

Reviewed by:	gnn
Approved by:	core (jhb, imp)
Requested by:	a cast of thousands
MFC after:	3 days
@
text
@d69 1
a78 1
options 	DDB_CTF			# kernel ELF linker loads CTF data
@


1.585
log
@SVN rev 233427 on 2012-03-24 18:08:28Z by marius

Add cas(4), gem(4) and hme(4) to x86 GENERICs as suggested by netchild@@ in
<20120222095239.Horde.0hpYHJjmRSRPRKzXsoFRbYk@@webmail.leidinger.net>.
According to some private emails received, it apparently is not unpopular
to use at least Quad GigaSwift cards driven by cas(4) in x86 machines.

MFC after:	1 week
@
text
@d25 1
d67 2
a68 2
#options 	KDTRACE_FRAME		# Ensure frames are compiled in
#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
d78 1
@


1.584
log
@SVN rev 233310 on 2012-03-22 16:19:04Z by joel

Add snd_cmi, snd_csa and snd_emu10kx to GENERIC on i386 and amd64.

The GPL infected parts which were blocking the inclusion of snd_csa
and snd_emu10kx in GENERIC have recently been removed from the tree.
I'm also adding snd_cmi to GENERIC, which I originally intended to
add when we enabled sound support by default.

Discussed with:	jhb, pfg, Yuriy Tsibizov <yuriy.tsibizov@@gfk.ru>
Approved by:	jhb
@
text
@d221 1
d225 2
@


1.583
log
@SVN rev 233271 on 2012-03-21 08:38:42Z by ed

Remove pty(4) from our kernel configurations.

As of FreeBSD 8, this driver should not be used. Applications that use
posix_openpt(2) and openpty(3) use the pts(4) that is built into the
kernel unconditionally. If it turns out high profile depend on the
pty(4) module anyway, I'd rather get those fixed. So please report any
issues to me.

The pty(4) module is still available as a kernel module of course, so a
simple `kldload pty' can be used to run old-style pseudo-terminals.
@
text
@d319 3
@


1.582
log
@SVN rev 232561 on 2012-03-05 18:47:42Z by jkim

Fix few style nits.
@
text
@a287 1
device		pty		# BSD-style compatibility pseudo ttys
@


1.581
log
@SVN rev 232521 on 2012-03-04 21:31:13Z by rmh

Exclude USB drivers (except umass and ukbd) from main kernel image on i386
and amd64.

Reviewed by:	hselasky, arch, usb
Approved by:	kib (mentor)
@
text
@d171 1
a171 1
options		VESA		# add support for VESA BIOS Extensions
@


1.580
log
@SVN rev 232416 on 2012-03-03 00:11:46Z by jkim

Add VESA option to GENERIC for amd64 and i386.

MFC after:	1 month
@
text
@a305 2
#device		udbp		# USB Double Bulk Pipe devices (needs netgraph)
device		uhid		# "Human Interface Devices"
a306 1
device		ulpt		# Printer
a307 28
device		ums		# Mouse
device		urio		# Diamond Rio 500 MP3 player
# USB Serial devices
device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
device		uark		# Technologies ARK3116 based serial adapters
device		ubsa		# Belkin F5U103 and compatible serial adapters
device		uftdi		# For FTDI usb serial adapters
device		uipaq		# Some WinCE based devices
device		uplcom		# Prolific PL-2303 serial adapters
device		uslcom		# SI Labs CP2101/CP2102 serial adapters
device		uvisor		# Visor and Palm devices
device		uvscom		# USB serial support for DDI pocket's PHS
# USB Ethernet, requires miibus
device		aue		# ADMtek USB Ethernet
device		axe		# ASIX Electronics USB Ethernet
device		cdce		# Generic USB over Ethernet
device		cue		# CATC USB Ethernet
device		kue		# Kawasaki LSI USB Ethernet
device		rue		# RealTek RTL8150 USB Ethernet
device		udav		# Davicom DM9601E USB
# USB Wireless
device		rum		# Ralink Technology RT2501USB wireless NICs
device		run		# Ralink Technology RT2700/RT2800/RT3000 NICs.
device		uath		# Atheros AR5523 wireless NICs
device		upgt		# Conexant/Intersil PrismGT wireless NICs.
device		ural		# Ralink Technology RT2500USB wireless NICs
device		urtw		# Realtek RTL8187B/L wireless NICs
device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
a322 1
device		snd_uaudio	# USB Audio
@


1.579
log
@SVN rev 230843 on 2012-01-31 19:38:18Z by jimharris

Add isci(4) driver for amd64 and i386 targets.

The isci driver is for the integrated SAS controller in the Intel C600
(Patsburg) chipset.  Source files in sys/dev/isci directory are
FreeBSD-specific, and sys/dev/isci/scil subdirectory contains
an OS-agnostic library (SCIL) published by Intel to control the SAS
controller.  This library is used primarily as-is in this driver, with
some post-processing to better integrate into the kernel build
environment.

isci.4 and a README in the sys/dev/isci directory contain a few
additional details.

This driver is only built for amd64 and i386 targets.

Sponsored by: Intel
Reviewed by: scottl
Approved by: scottl
@
text
@d171 1
@


1.578
log
@SVN rev 229997 on 2012-01-12 00:34:33Z by ken

Add the CAM Target Layer (CTL).

CTL is a disk and processor device emulation subsystem originally written
for Copan Systems under Linux starting in 2003.  It has been shipping in
Copan (now SGI) products since 2005.

It was ported to FreeBSD in 2008, and thanks to an agreement between SGI
(who acquired Copan's assets in 2010) and Spectra Logic in 2010, CTL is
available under a BSD-style license.  The intent behind the agreement was
that Spectra would work to get CTL into the FreeBSD tree.

Some CTL features:

 - Disk and processor device emulation.
 - Tagged queueing
 - SCSI task attribute support (ordered, head of queue, simple tags)
 - SCSI implicit command ordering support.  (e.g. if a read follows a mode
   select, the read will be blocked until the mode select completes.)
 - Full task management support (abort, LUN reset, target reset, etc.)
 - Support for multiple ports
 - Support for multiple simultaneous initiators
 - Support for multiple simultaneous backing stores
 - Persistent reservation support
 - Mode sense/select support
 - Error injection support
 - High Availability support (1)
 - All I/O handled in-kernel, no userland context switch overhead.

(1) HA Support is just an API stub, and needs much more to be fully
    functional.

ctl.c:			The core of CTL.  Command handlers and processing,
			character driver, and HA support are here.

ctl.h:			Basic function declarations and data structures.

ctl_backend.c,
ctl_backend.h:		The basic CTL backend API.

ctl_backend_block.c,
ctl_backend_block.h:	The block and file backend.  This allows for using
			a disk or a file as the backing store for a LUN.
			Multiple threads are started to do I/O to the
			backing device, primarily because the VFS API
			requires that to get any concurrency.

ctl_backend_ramdisk.c:	A "fake" ramdisk backend.  It only allocates a
			small amount of memory to act as a source and sink
			for reads and writes from an initiator.  Therefore
			it cannot be used for any real data, but it can be
			used to test for throughput.  It can also be used
			to test initiators' support for extremely large LUNs.

ctl_cmd_table.c:	This is a table with all 256 possible SCSI opcodes,
			and command handler functions defined for supported
			opcodes.

ctl_debug.h:		Debugging support.

ctl_error.c,
ctl_error.h:		CTL-specific wrappers around the CAM sense building
			functions.

ctl_frontend.c,
ctl_frontend.h:		These files define the basic CTL frontend port API.

ctl_frontend_cam_sim.c:	This is a CTL frontend port that is also a CAM SIM.
			This frontend allows for using CTL without any
			target-capable hardware.  So any LUNs you create in
			CTL are visible in CAM via this port.

ctl_frontend_internal.c,
ctl_frontend_internal.h:
			This is a frontend port written for Copan to do
			some system-specific tasks that required sending
			commands into CTL from inside the kernel.  This
			isn't entirely relevant to FreeBSD in general,
			but can perhaps be repurposed.

ctl_ha.h:		This is a stubbed-out High Availability API.  Much
			more is needed for full HA support.  See the
			comments in the header and the description of what
			is needed in the README.ctl.txt file for more
			details.

ctl_io.h:		This defines most of the core CTL I/O structures.
			union ctl_io is conceptually very similar to CAM's
			union ccb.

ctl_ioctl.h:		This defines all ioctls available through the CTL
			character device, and the data structures needed
			for those ioctls.

ctl_mem_pool.c,
ctl_mem_pool.h:		Generic memory pool implementation used by the
			internal frontend.

ctl_private.h:		Private data structres (e.g. CTL softc) and
			function prototypes.  This also includes the SCSI
			vendor and product names used by CTL.

ctl_scsi_all.c,
ctl_scsi_all.h:		CTL wrappers around CAM sense printing functions.

ctl_ser_table.c:	Command serialization table.  This defines what
			happens when one type of command is followed by
			another type of command.

ctl_util.c,
ctl_util.h:		CTL utility functions, primarily designed to be
			used from userland.  See ctladm for the primary
			consumer of these functions.  These include CDB
			building functions.

scsi_ctl.c:		CAM target peripheral driver and CTL frontend port.
			This is the path into CTL for commands from
			target-capable hardware/SIMs.

README.ctl.txt:		CTL code features, roadmap, to-do list.

usr.sbin/Makefile:	Add ctladm.

ctladm/Makefile,
ctladm/ctladm.8,
ctladm/ctladm.c,
ctladm/ctladm.h,
ctladm/util.c:		ctladm(8) is the CTL management utility.
			It fills a role similar to camcontrol(8).
			It allow configuring LUNs, issuing commands,
			injecting errors and various other control
			functions.

usr.bin/Makefile:	Add ctlstat.

ctlstat/Makefile
ctlstat/ctlstat.8,
ctlstat/ctlstat.c:	ctlstat(8) fills a role similar to iostat(8).
			It reports I/O statistics for CTL.

sys/conf/files:		Add CTL files.

sys/conf/NOTES:		Add device ctl.

sys/cam/scsi_all.h:	To conform to more recent specs, the inquiry CDB
			length field is now 2 bytes long.

			Add several mode page definitions for CTL.

sys/cam/scsi_all.c:	Handle the new 2 byte inquiry length.

sys/dev/ciss/ciss.c,
sys/dev/ata/atapi-cam.c,
sys/cam/scsi/scsi_targ_bh.c,
scsi_target/scsi_cmds.c,
mlxcontrol/interface.c:	Update for 2 byte inquiry length field.

scsi_da.h:		Add versions of the format and rigid disk pages
			that are in a more reasonable format for CTL.

amd64/conf/GENERIC,
i386/conf/GENERIC,
ia64/conf/GENERIC,
sparc64/conf/GENERIC:	Add device ctl.

i386/conf/PAE:		The CTL frontend SIM at least does not compile
			cleanly on PAE.

Sponsored by:	Copan Systems, SGI and Spectra Logic
MFC after:	1 month
@
text
@d126 1
@


1.577
log
@SVN rev 228973 on 2011-12-29 22:48:36Z by rwatson

Add "options CAPABILITY_MODE" and "options CAPABILITIES" to GENERIC kernel
configurations for various architectures in FreeBSD 10.x.  This allows
basic Capsicum functionality to be used in the default FreeBSD
configuration on non-embedded architectures; process descriptors are not
yet enabled by default.

MFC after:	3 months
Sponsored by:	Google, Inc
@
text
@d134 2
a135 1
device		ses		# SCSI Environmental Services (and SAF-TE)
@


1.576
log
@SVN rev 227759 on 2011-11-20 16:36:02Z by attilio

Revert part of the r227758 which crept in.

Pointy hat:	attilio
X-MFC:		r227758
@
text
@d63 2
@


1.575
log
@SVN rev 227758 on 2011-11-20 16:33:09Z by attilio

Introduce macro stubs in the mutex implementation that will be always
defined and will allow consumers, willing to provide options, file and
line to locking requests, to not worry about options redefining the
interfaces.
This is typically useful when there is the need to build another
locking interface on top of the mutex one.

The introduced functions that consumers can use are:
- mtx_lock_flags_
- mtx_unlock_flags_
- mtx_lock_spin_flags_
- mtx_unlock_spin_flags_
- mtx_assert_
- thread_lock_flags_

Spare notes:
- Likely we can get rid of all the 'INVARIANTS' specification in the
  ppbus code by using the same macro as done in this patch (but this is
  left to the ppbus maintainer)
- all the other locking interfaces may require a similar cleanup, where
  the most notable case is sx which will allow a further cleanup of
  vm_map locking facilities
- The patch should be fully compatible with older branches, thus a MFC
  is previewed (infact it uses all the underlying mechanisms already
  present).

Comments review by:	eadler, Ben Kaduk
Discussed with:		kib, jhb
MFC after:	1 month
@
text
@d76 1
a76 1
#options 	INVARIANTS		# Enable calls of extra sanity checking
d78 3
a80 3
#options 	WITNESS			# Enable checks to detect deadlocks and cycles
#options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
#options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
@


1.574
log
@SVN rev 227332 on 2011-11-08 08:29:05Z by kevlo

Enable PCI MMC/SD support by default on i386 and amd64
@
text
@d76 1
a76 1
options 	INVARIANTS		# Enable calls of extra sanity checking
d78 3
a80 3
options 	WITNESS			# Enable checks to detect deadlocks and cycles
options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) zones
@


1.573
log
@SVN rev 227006 on 2011-11-01 21:26:57Z by marius

Add a PCI front-end to esp(4) allowing it to support AMD Am53C974 and
replace amd(4) with the former in the amd64, i386 and pc98 GENERIC kernel
configuration files. Besides duplicating functionality, amd(4), which
previously also supported the AMD Am53C974, unlike esp(4) is no longer
maintained and has accumulated enough bit rot over time to always cause
a panic during boot as long as at least one target is attached to it
(see PR 124667).

PR:		124667
Obtained from:	NetBSD (based on)
MFC after:	3 days
@
text
@d351 5
@


1.572
log
@SVN rev 226835 on 2011-10-27 13:07:49Z by kensmith

Adjust the debugger options slightly.  This should help me do the right
thing when changing the debugging options as part of head becoming a new
stable branch.  It may also help people who for one reason or another want
to run head but don't want it slowed down by the debugging support.

Reviewed by:	kib
@
text
@d110 1
a110 1
device		amd		# AMD 53C974 (Tekram DC-390(T))
@


1.571
log
@SVN rev 226547 on 2011-10-19 21:55:20Z by kensmith

Add a warning about why sbp(4) is commented out so that curious folks
are forewarned they might wind up with a hole in their foot if they
decide to give it a try.

Suggested by:	dougb
@
text
@d68 1
a68 1
# Debugging for use in -current
d70 3
@


1.570
log
@SVN rev 226510 on 2011-10-18 13:45:16Z by kensmith

Comment out the sbp(4) driver for architectures that support it.

As part of the 8.0-RELEASE cycle this was done in stable/8 (r199112)
but was left alone in head so people could work on fixing an issue that
caused boot failure on some motherboards.  Apparently nobody has worked
on it and we are getting reports of boot failure with the 9.0 test builds.
So this time I'll comment out the driver in head (still hoping someone
will work on it) and MFC to stable/9.

Submitted by:	Alberto Villa <avilla at FreeBSD dot org>
@
text
@d334 1
@


1.569
log
@SVN rev 226026 on 2011-10-04 21:40:25Z by delphij

Add the 9750 SATA+SAS 6Gb/s RAID controller card driver, tws(4).  Many
thanks for their contiued support to FreeBSD.

This is version 10.80.00.003 from codeset 10.2.1 [1]

Obtained from:	LSI http://kb.lsi.com/Download16574.aspx [1]
@
text
@d334 1
a334 1
device		sbp		# SCSI over FireWire (Requires scbus and da)
@


1.568
log
@SVN rev 225482 on 2011-09-11 17:39:51Z by brueffer

Fix a zyd(4) comment typo that was copy+pasted into most kernel config files.

PR:		160276
Submitted by:	MATSUMIYA Ryo <matsumiya@@mma.club.uec.ac.jp>
Approved by:	re (kib)
MFC after:	1 week
@
text
@d154 1
@


1.568.2.1
log
@SVN rev 225736 on 2011-09-23 00:51:37Z by kensmith

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.568.2.2
log
@SVN rev 226115 on 2011-10-07 20:40:45Z by delphij

MFC r226026:

Add the 9750 SATA+SAS 6Gb/s RAID controller card driver, tws(4).  Many
thanks for their contiued support to FreeBSD.

This is version 10.80.00.003 from codeset 10.2.1 [1]

Obtained from:	LSI http://kb.lsi.com/Download16574.aspx [1]
Approved by:	re (kib)
@
text
@a153 1
device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller
@


1.568.2.3
log
@SVN rev 226405 on 2011-10-15 21:23:04Z by kensmith

Remove extra debuggin gsupport that is turned on for head but turned off
for stable branches:

	- shift to MALLOC_PRODUCTION
	- turn off automatic crash dumps
	- remove kernel debuggers, INVARIANT*[1], WITNESS* from GENERIC
	  kernel config files

[1] INVARIANT* left on for ia64 at least temporarily, marcel@@ will test
    to see if they are still required as they had been for stable/8.

Approved by:	re (implicit)
@
text
@d68 11
@


1.568.2.4
log
@SVN rev 226809 on 2011-10-26 19:45:20Z by kensmith

MFC r226510,r226547:
Comment out sbp(4) because it appears to cause boot failure on some
systems.  Add comment explaining why sbp(4) is commented out.

It was a mistake on my part to omit powerpc's GENERIC for r226510.
But when I noticed the mistake I checked with the powerpc maintainer
to see if I should correct the mistake Marcel said he'd prefer it be
left as-is.

Approved by:	re (kib)
@
text
@d323 1
a323 2
# sbp(4) works for some systems but causes boot failure on others
#device		sbp		# SCSI over FireWire (Requires scbus and da)
@


1.568.2.5
log
@SVN rev 226810 on 2011-10-26 19:59:06Z by kensmith

I forgot we now leave KDB and KDB_TRACE options in stable kernel config
files to help provide stack traces during a panic.

Submitted by:	Sergey Kandaurov <pluknet at freebsd dot org>
Approved by:	re (implicit)
@
text
@a66 2
options		KDB			# Kernel debugger related code
options		KDB_TRACE		# Print a stack trace for a panic
@


1.568.2.6
log
@SVN rev 226819 on 2011-10-26 23:05:59Z by kensmith

Fix whitespace nit.  "options<space><tab>", not "options<tab><tab>".

Submitted by:	Matthew Fleming <mdf at freebsd dot org>
Pointy hat:	me
Approved by:	re (implicit)
@
text
@d67 2
a68 2
options 	KDB			# Kernel debugger related code
options 	KDB_TRACE		# Print a stack trace for a panic
@


1.568.2.7
log
@SVN rev 227305 on 2011-11-07 13:40:54Z by marius

MFC: r227006, r227281, r227282

Add a PCI front-end to esp(4) allowing it to support AMD Am53C974 and
replace amd(4) with the former in the amd64, i386 and pc98 GENERIC kernel
configuration files. Besides duplicating functionality, amd(4), which
previously also supported the AMD Am53C974, unlike esp(4) is no longer
maintained and has accumulated enough bit rot over time to always cause
a panic during boot as long as at least one target is attached to it
(see PR 124667).

PR:		124667
Approved by:	re (kib)
Obtained from:	NetBSD (based on)
@
text
@d98 1
a98 1
device		esp		# AMD Am53C974 (Tekram DC-390(T))
@


1.568.2.8
log
@SVN rev 231689 on 2012-02-14 15:58:49Z by jimharris

MFC r230843, r231134, r231136, r231137, r231296

Add isci(4) driver for amd64 and i386 targets.

The isci driver is for the integrated SAS controller in the Intel C600
(Patsburg) chipset.  Source files in sys/dev/isci directory are
FreeBSD-specific, and sys/dev/isci/scil subdirectory contains
an OS-agnostic library (SCIL) published by Intel to control the SAS
controller.  This library is used primarily as-is in this driver, with
some post-processing to better integrate into the kernel build
environment.

isci.4 and a README in the sys/dev/isci directory contain a few
additional details.

This driver is only built for amd64 and i386 targets.

Sponsored by: Intel
Reviewed by: scottl
Approved by: scottl
@
text
@a111 1
device		isci		# Intel C600 SAS controller
@


1.568.2.9
log
@SVN rev 231772 on 2012-02-15 17:28:09Z by ken

MFC r229997, r230033, and r230334

Bring the CAM Target Layer into stable/9.

  r230334 | ken | 2012-01-19 11:42:03 -0700 (Thu, 19 Jan 2012) | 19 lines

  Quiet some clang warnings when compiling CTL.

  ctl_error.c,
  ctl_error.h:	Take out the ctl_sense_format enumeration, and use
  		scsi_sense_data_type instead.

  		Remove ctl_get_sense_format() and switch ctl_build_ua()
  		over to using scsi_sense_data_type.

  ctl_backend_ramdisk.c,
  ctl_backend_block.c:
  		Use C99 structure initializers instead of GNU initializers.

  ctl.c:		Switch over to using the SCSI sense format enumeration
  		instead of the CTL-specific enumeration.

  Submitted by:	dim (partially)
  MFC after:	1 month

  r230033 | ken | 2012-01-12 15:08:33 -0700 (Thu, 12 Jan 2012) | 5 lines

  Silence some unnecessary verbosity.

  Reported by:	mav
  MFC after:	1 month

  r229997 | ken | 2012-01-11 17:34:33 -0700 (Wed, 11 Jan 2012) | 170 lines

  Add the CAM Target Layer (CTL).

  CTL is a disk and processor device emulation subsystem originally written
  for Copan Systems under Linux starting in 2003.  It has been shipping in
  Copan (now SGI) products since 2005.

  It was ported to FreeBSD in 2008, and thanks to an agreement between SGI
  (who acquired Copan's assets in 2010) and Spectra Logic in 2010, CTL is
  available under a BSD-style license.  The intent behind the agreement was
  that Spectra would work to get CTL into the FreeBSD tree.

  Some CTL features:

   - Disk and processor device emulation.
   - Tagged queueing
   - SCSI task attribute support (ordered, head of queue, simple tags)
   - SCSI implicit command ordering support.  (e.g. if a read follows a mode
     select, the read will be blocked until the mode select completes.)
   - Full task management support (abort, LUN reset, target reset, etc.)
   - Support for multiple ports
   - Support for multiple simultaneous initiators
   - Support for multiple simultaneous backing stores
   - Persistent reservation support
   - Mode sense/select support
   - Error injection support
   - High Availability support (1)
   - All I/O handled in-kernel, no userland context switch overhead.

  (1) HA Support is just an API stub, and needs much more to be fully
      functional.

  ctl.c:			The core of CTL.  Command handlers and processing,
  			character driver, and HA support are here.

  ctl.h:			Basic function declarations and data structures.

  ctl_backend.c,
  ctl_backend.h:		The basic CTL backend API.

  ctl_backend_block.c,
  ctl_backend_block.h:	The block and file backend.  This allows for using
  			a disk or a file as the backing store for a LUN.
  			Multiple threads are started to do I/O to the
  			backing device, primarily because the VFS API
  			requires that to get any concurrency.

  ctl_backend_ramdisk.c:	A "fake" ramdisk backend.  It only allocates a
  			small amount of memory to act as a source and sink
  			for reads and writes from an initiator.  Therefore
  			it cannot be used for any real data, but it can be
  			used to test for throughput.  It can also be used
  			to test initiators' support for extremely large LUNs.

  ctl_cmd_table.c:	This is a table with all 256 possible SCSI opcodes,
  			and command handler functions defined for supported
  			opcodes.

  ctl_debug.h:		Debugging support.

  ctl_error.c,
  ctl_error.h:		CTL-specific wrappers around the CAM sense building
  			functions.

  ctl_frontend.c,
  ctl_frontend.h:		These files define the basic CTL frontend port API.

  ctl_frontend_cam_sim.c:	This is a CTL frontend port that is also a CAM SIM.
  			This frontend allows for using CTL without any
  			target-capable hardware.  So any LUNs you create in
  			CTL are visible in CAM via this port.

  ctl_frontend_internal.c,
  ctl_frontend_internal.h:
  			This is a frontend port written for Copan to do
  			some system-specific tasks that required sending
  			commands into CTL from inside the kernel.  This
  			isn't entirely relevant to FreeBSD in general,
  			but can perhaps be repurposed.

  ctl_ha.h:		This is a stubbed-out High Availability API.  Much
  			more is needed for full HA support.  See the
  			comments in the header and the description of what
  			is needed in the README.ctl.txt file for more
  			details.

  ctl_io.h:		This defines most of the core CTL I/O structures.
  			union ctl_io is conceptually very similar to CAM's
  			union ccb.

  ctl_ioctl.h:		This defines all ioctls available through the CTL
  			character device, and the data structures needed
  			for those ioctls.

  ctl_mem_pool.c,
  ctl_mem_pool.h:		Generic memory pool implementation used by the
  			internal frontend.

  ctl_private.h:		Private data structres (e.g. CTL softc) and
  			function prototypes.  This also includes the SCSI
  			vendor and product names used by CTL.

  ctl_scsi_all.c,
  ctl_scsi_all.h:		CTL wrappers around CAM sense printing functions.

  ctl_ser_table.c:	Command serialization table.  This defines what
  			happens when one type of command is followed by
  			another type of command.

  ctl_util.c,
  ctl_util.h:		CTL utility functions, primarily designed to be
  			used from userland.  See ctladm for the primary
  			consumer of these functions.  These include CDB
  			building functions.

  scsi_ctl.c:		CAM target peripheral driver and CTL frontend port.
  			This is the path into CTL for commands from
  			target-capable hardware/SIMs.

  README.ctl.txt:		CTL code features, roadmap, to-do list.

  usr.sbin/Makefile:	Add ctladm.

  ctladm/Makefile,
  ctladm/ctladm.8,
  ctladm/ctladm.c,
  ctladm/ctladm.h,
  ctladm/util.c:		ctladm(8) is the CTL management utility.
  			It fills a role similar to camcontrol(8).
  			It allow configuring LUNs, issuing commands,
  			injecting errors and various other control
  			functions.

  usr.bin/Makefile:	Add ctlstat.

  ctlstat/Makefile
  ctlstat/ctlstat.8,
  ctlstat/ctlstat.c:	ctlstat(8) fills a role similar to iostat(8).
  			It reports I/O statistics for CTL.

  sys/conf/files:		Add CTL files.

  sys/conf/NOTES:		Add device ctl.

  sys/cam/scsi_all.h:	To conform to more recent specs, the inquiry CDB
  			length field is now 2 bytes long.

  			Add several mode page definitions for CTL.

  sys/cam/scsi_all.c:	Handle the new 2 byte inquiry length.

  sys/dev/ciss/ciss.c,
  sys/dev/ata/atapi-cam.c,
  sys/cam/scsi/scsi_targ_bh.c,
  scsi_target/scsi_cmds.c,
  mlxcontrol/interface.c:	Update for 2 byte inquiry length field.

  scsi_da.h:		Add versions of the format and rigid disk pages
  			that are in a more reasonable format for CTL.

  amd64/conf/GENERIC,
  i386/conf/GENERIC,
  ia64/conf/GENERIC,
  sparc64/conf/GENERIC:	Add device ctl.

  i386/conf/PAE:		The CTL frontend SIM at least does not compile
  			cleanly on PAE.

  Sponsored by:	Copan Systems, SGI and Spectra Logic
  MFC after:	1 month
@
text
@d121 1
a121 2
device		ses		# Enclosure Services (SES and SAF-TE)
device		ctl		# CAM Target Layer
@


1.568.2.10
log
@SVN rev 233743 on 2012-03-31 10:47:34Z by marius

MFC: r233427

Add cas(4), gem(4) and hme(4) to x86 GENERICs as suggested by netchild@@ in
<20120222095239.Horde.0hpYHJjmRSRPRKzXsoFRbYk@@webmail.leidinger.net>.
According to some private emails received, it apparently is not unpopular
to use at least Quad GigaSwift cards driven by cas(4) in x86 machines.
@
text
@a205 1
device		cas		# Sun Cassini/Cassini+ and NS DP83065 Saturn
a208 2
device		gem		# Sun GEM/Sun ERI/Apple GMAC
device		hme		# Sun HME (Happy Meal Ethernet)
@


1.568.2.11
log
@SVN rev 233797 on 2012-04-02 18:13:29Z by jkim

MFC:	r232416, r232561

Add VESA option to GENERIC for amd64 and i386.
@
text
@a156 1
options 	VESA		# Add support for VESA BIOS Extensions (VBE)
@


1.568.2.12
log
@SVN rev 235769 on 2012-05-22 02:24:52Z by pfg

MFC:	r233310

Add snd_cmi, snd_csa and snd_emu10kx to GENERIC on i386 and amd64.

The GPL infected parts which were blocking the inclusion of snd_csa
and snd_emu10kx in GENERIC have recently been removed from the tree.

Requested by:	joel
Discussed with:	jhb, joel, Yuriy Tsibizov <yuriy.tsibizov@@gfk.ru>
Approved by:	jhb (mentor)
@
text
@a339 3
device		snd_cmi		# CMedia CMI8338/CMI8738
device		snd_csa		# Crystal Semiconductor CS461x/428x
device		snd_emu10kx	# Creative SoundBlaster Live! and Audigy
@


1.568.2.13
log
@SVN rev 235877 on 2012-05-24 03:45:13Z by mav

MFC r235226:
Add `options GEOM_RAID` into i386 and amd64 GENERIC kernels.

ataraid(4) previously was present there and having GEOM RAID is convinient.
Unlike other classes GEOM RAID can be set up from BIOS before install and
users are expecting it to be detected automatically.
@
text
@a45 1
options 	GEOM_RAID		# Soft RAID functionality.
@


1.568.2.14
log
@SVN rev 238090 on 2012-07-04 00:54:16Z by delphij

MFC r237901:

tws(4) is interfaced with CAM so move it to the same section.

Reported by:	joel
Approved by:	re (kib)
@
text
@a137 1
device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller
d148 1
@


1.568.2.14.2.1
log
@SVN rev 239080 on 2012-08-05 23:54:33Z by kensmith

Copy stable/9 to releng/9.1 as part of the 9.1-RELEASE release process.

Approved by:	re (implicit)
@
text
@@


1.568.2.14.2.2
log
@Switch importer
@
text
@d19 1
a19 1
# $FreeBSD: releng/9.1/sys/amd64/conf/GENERIC 238090 2012-07-04 00:54:16Z delphij $
@


1.568.2.15
log
@SVN rev 239841 on 2012-08-29 15:38:18Z by gjb

MFC r239699:

 - Grammar fix: s/NIC's/NICs/
@
text
@d256 1
a256 1
device		ath		# Atheros NICs
@


1.568.2.16
log
@SVN rev 240950 on 2012-09-26 09:22:28Z by kib

MFC r240135:
Add support for new Intel on-CPU Bull Mountain random number generator.

MFC r240455:
Rename the IVY_RNG option to RDRAND_RNG.
@
text
@a274 2
options 	PADLOCK_RNG	# VIA Padlock RNG
options 	RDRAND_RNG	# Intel Bull Mountain RNG
@


1.568.2.17
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242902
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242902 | dteske | 2012-11-11 23:29:45 +0000 (Sun, 11 Nov 2012) | 10 lines
## SVN ##
## SVN ## Fix a regression introduced by SVN r211417 that saw the breakage of a feature
## SVN ## documented in usr.sbin/sysinstall/help/shortcuts.hlp (reproduced below):
## SVN ##
## SVN ## If /usr/sbin/sysinstall is linked to another filename, say
## SVN ## `/usr/local/bin/configPackages', then the basename will be used
## SVN ## as an implicit command name.
## SVN ##
## SVN ## Reviewed by:	adrian (co-mentor)
## SVN ## Approved by:	adrian (co-mentor)
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 240950 2012-09-26 09:22:28Z kib $
@


1.568.2.18
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245587
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 245587 2013-01-18 04:23:54Z kib $
a35 1
options 	QUOTA			# Enable disk quotas for UFS
@


1.568.2.19
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245939
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 245939 2013-01-26 05:23:17Z delphij $
a134 1
device		hpt27xx		# Highpoint RocketRAID 27xx
@


1.568.2.20
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/246321
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 246321 2013-02-04 15:51:27Z des $
d334 9
@


1.568.2.21
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247306
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 247306 2013-02-26 05:27:02Z bryanv $
a343 8

# VirtIO support
device		virtio		# Generic VirtIO bus (required)
device		virtio_pci	# VirtIO PCI Interface
device		vtnet		# VirtIO Ethernet device
device		virtio_blk	# VirtIO Block device
device		virtio_scsi	# VirtIO SCSI device
device		virtio_balloon	# VirtIO Memory Balloon device
@


1.568.2.22
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249549
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 249549 2013-04-16 16:09:27Z brooks $
a24 1
makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
d66 2
a67 2
options 	KDTRACE_FRAME		# Ensure frames are compiled in
options 	KDTRACE_HOOKS		# Kernel DTrace hooks
a70 1
options 	DDB_CTF			# kernel ELF linker loads CTF data
@


1.568.2.23
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252555
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 252555 2013-07-03 09:25:29Z np $
a30 1
options 	TCP_OFFLOAD		# TCP offload
@


1.568.2.24
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252778
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 252778 2013-07-05 09:36:09Z achim $
a147 1
device		aacraid		# Adaptec by PMC RAID
@


1.568.2.25
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/252903
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 252903 2013-07-06 23:26:36Z delphij $
a136 1
device		hptnr		# Highpoint DC7280, R750
@


1.568.2.26
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/253860
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 253860 2013-08-01 13:18:47Z marius $
d127 1
a127 1
#device		ctl		# CAM Target Layer
@


1.568.2.27
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/260252
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 260252 2014-01-04 04:48:58Z edavis $
d195 1
a195 1
device		bxe		# Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
@


1.568.2.28
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/263509
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 263509 2014-03-21 17:56:32Z dim $
d24 1
a24 1
makeoptions	DEBUG=-gdwarf-2		# Build kernel with gdb(1) debug symbols
@


1.568.2.29
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/265729
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/9/sys/amd64/conf/GENERIC 265729 2014-05-09 03:52:10Z ken $
a108 1
device		mpr		# LSI-Logic MPT-Fusion 3
@


1.568.2.7.2.1
log
@SVN rev 227445 on 2011-11-11 04:20:22Z by kensmith

Copy stable/9 to releng/9.0 as part of the FreeBSD 9.0-RELEASE release
cycle.

Approved by:	re (implicit)
@
text
@@


1.568.2.7.2.2
log
@Switch importer
@
text
@d19 1
a19 1
# $FreeBSD: releng/9.0/sys/amd64/conf/GENERIC 227305 2011-11-07 13:40:54Z marius $
@


1.567
log
@SVN rev 225201 on 2011-08-26 21:22:34Z by jhb

Enable the puc(4) driver on amd64 and i386 in GENERIC.  This allows
devices supported by puc(4) to work "out of the box" since puc.ko does
not work "out of the box".

Reviewed by:	marcel
Approved by:	re (kib)
MFC after:	1 week
@
text
@d329 1
a329 1
device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
@


1.566
log
@SVN rev 224699 on 2011-08-07 20:16:46Z by rmacklem

Change all the sample kernel configurations to use
NFSCL, NFSD instead of NFSCLIENT, NFSSERVER since
NFSCL and NFSD are now the defaults. The client change is
needed for diskless configurations, so that the root
mount works for fstype nfs.
Reported by seanbru at yahoo-inc.com for i386/XEN.

Approved by:	re (hrs)
@
text
@d189 1
a189 4
# If you've got a "dumb" serial or parallel PCI card that is
# supported by the puc(4) glue driver, uncomment the following
# line to enable it (connects to sio, uart and/or ppc drivers):
#device		puc
@


1.565
log
@SVN rev 223098 on 2011-06-14 20:30:49Z by hselasky

Enable USB 3.0 support by default in i386 and amd64 GENERIC kernels.

Discussed with:	joel @@ and thompsa @@
MFC after:	7 days
@
text
@d40 1
a40 1
options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
@


1.564
log
@SVN rev 222980 on 2011-06-11 09:08:46Z by joel

Enable sound support by default on i386 and amd64.

The generic sound driver has been added, along with enough
device-specific drivers to support the most common audio
chipsets.

We've discussed enabling it from time to time over the years
and we've received numerous requests from users, so we decided
that shipping 9.0 with working audio by default would be the
best thing to do.

Bug reports should be sent to the multimedia@@ mailing list, as
usual.

Approved by:    mav
No objection:   re
@
text
@d298 1
@


1.563
log
@SVN rev 222282 on 2011-05-25 10:04:13Z by kevlo

Bring back r222275. runfw(4) will statically link in rt2870.fw.uu
to the kernel, though I have MODULES_OVERRIDE="" in GENERIC.

Spotted by:	thompsa
@
text
@d340 8
@


1.562
log
@SVN rev 222275 on 2011-05-25 04:46:48Z by kevlo

run(4) needs firmware loaded to work
@
text
@a326 1
device		runfw		# Ralink Technology RT2700/RT2800/RT3000 NICs firmware
@


1.561
log
@SVN rev 221743 on 2011-05-10 16:44:16Z by jkim

Add SC_PIXEL_MODE to GENERIC for amd64 and i386.

Requested by:	many
@
text
@d327 1
@


1.560
log
@SVN rev 221296 on 2011-05-01 13:26:34Z by bschmidt

Add the remaining wireless drivers.

Discussed with:	joel
@
text
@d168 1
@


1.559
log
@SVN rev 221200 on 2011-04-29 06:36:39Z by kevlo

Add urtw(4)
@
text
@d264 7
d273 1
d325 1
d327 1
@


1.558
log
@SVN rev 221124 on 2011-04-27 17:51:51Z by rmacklem

This patch changes head so that the default NFS client is now the new
NFS client (which I guess is no longer experimental). The fstype "newnfs"
is now "nfs" and the regular/old NFS client is now fstype "oldnfs".
Although mounts via fstype "nfs" will usually work without userland
changes, an updated mount_nfs(8) binary is needed for kernels built with
"options NFSCL" but not "options NFSCLIENT". Updated mount_nfs(8) and
mount(8) binaries are needed to do mounts for fstype "oldnfs".
The GENERIC kernel configs have been changed to use options
NFSCL and NFSD (the new client and server) instead of NFSCLIENT and NFSSERVER.
For kernels being used on diskless NFS root systems, "options NFSCL"
must be in the kernel config.
Discussed on freebsd-fs@@.
@
text
@d319 1
@


1.557
log
@SVN rev 221071 on 2011-04-26 17:01:49Z by mav

 - Add shim to simplify migration to the CAM-based ATA. For each new adaX
device in /dev/ create symbolic link with adY name, trying to mimic old ATA
numbering. Imitation is not complete, but should be enough in most cases to
mount file systems without touching /etc/fstab.
 - To know what behavior to mimic, restore ATA_STATIC_ID option in cases
where it was present before.
 - Add some more details to UPDATING.
@
text
@d37 2
a38 2
options 	NFSCLIENT		# Network Filesystem Client
options 	NFSSERVER		# Network Filesystem Server
@


1.556
log
@SVN rev 220982 on 2011-04-24 08:58:58Z by mav

Switch the GENERIC kernels for all architectures to the new CAM-based ATA
stack. It means that all legacy ATA drivers are disabled and replaced by
respective CAM drivers. If you are using ATA device names in /etc/fstab or
other places, make sure to update them respectively (adX -> adaY,
acdX -> cdY, afdX -> daY, astX -> saY, where 'Y's are the sequential
numbers for each type in order of detection, unless configured otherwise
with tunables, see cam(4)).

ataraid(4) functionality is now supported by the RAID GEOM class.
To use it you can load geom_raid kernel module and use graid(8) tool
for management. Instead of /dev/arX device names, use /dev/raid/rX.
@
text
@d96 1
@


1.555
log
@SVN rev 220185 on 2011-03-31 08:07:13Z by adrian

Break out the ath PCI logic into a separate device/module.

Introduce the AHB glue for Atheros embedded systems. Right now it's
hard-coded for the AR9130 chip whose support isn't yet in this HAL;
it'll be added in a subsequent commit.

Kernel configuration files now need both 'ath' and 'ath_pci' devices; both
modules need to be loaded for the ath device to work.
@
text
@d92 6
a97 8
# ATA and ATAPI devices
device		ata
device		atadisk		# ATA disk drives
device		ataraid		# ATA RAID drives
device		atapicd		# ATAPI CDROM drives
device		atapifd		# ATAPI floppy drives
device		atapist		# ATAPI tape drives
options 	ATA_STATIC_ID	# Static device numbering
d121 2
a122 2
# SCSI peripherals
device		scbus		# SCSI bus (required for SCSI)
d127 1
a127 1
device		pass		# Passthrough device (direct SCSI access)
@


1.554
log
@SVN rev 220143 on 2011-03-29 18:16:49Z by trasz

Revert part of r220137, committed by mistake - RACCT is _not_ supposed
to be enabled in GENERIC.
@
text
@d260 2
a261 1
device		ath		# Atheros pci/cardbus NIC's
@


1.553
log
@SVN rev 220137 on 2011-03-29 17:47:25Z by trasz

Add racct.  It's an API to keep per-process, per-jail, per-loginclass
and per-loginclass resource accounting information, to be used by the new
resource limits code.  It's connected to the build, but the code that
actually calls the new functions will come later.

Sponsored by:	The FreeBSD Foundation
Reviewed by:	kib (earlier version)
@
text
@a67 2
options		RACCT

@


1.552
log
@SVN rev 219775 on 2011-03-19 15:50:34Z by bz

For now remove options FLOWTABLE from the remaining GENERIC kernel
configurations and make it opt-in for those who want it.  LINT will
still build it.

While it may be a perfect win in some scenarios, it still troubles users
(see PRs) in general cases.  In addition we are still allocating resources
even if disabled by sysctl and still leak arp/nd6 entries in case of
interface destruction.

Discussed with:	qingli (2010-11-24, just never executed)
Discussed with: juli (OCTEON1)
PR:		kern/148018, kern/155604, kern/144917, kern/146792
MFC after:	2 weeks
@
text
@d68 2
@


1.551
log
@SVN rev 219647 on 2011-03-14 22:42:41Z by davidch

- Initial release of bxe(4) to support Broadcom NetXtreme II 10GbE.
  (BCM57710, BCM57711, BCM57711E)

MFC after:	One month
@
text
@a63 1
options 	FLOWTABLE		# per-cpu routing cache
@


1.550
log
@SVN rev 219435 on 2011-03-09 17:15:11Z by julian

Add a small change to the comment in the GENRIC config files that include udbp

Submitted by:	Chris Forgron, cforgeron at acsi dot ca
MFC after:	1 week
@
text
@d196 1
@


1.549
log
@SVN rev 213098 on 2010-09-24 09:04:16Z by davidxu

Now userland POSIX semaphore is based on umtx. The kernel module
is only used to support binary compatible, if want to run old
binary, you need to kldload the module.
@
text
@d290 1
a290 1
#device		udbp		# USB Double Bulk Pipe devices
@


1.548
log
@SVN rev 212420 on 2010-09-10 15:03:56Z by ken

MFp4 (//depot/projects/mps/...)

Bring in a driver for the LSI Logic MPT2 6Gb SAS controllers.

This driver supports basic I/O, and works with SAS and SATA drives and
expanders.

Basic error recovery works (i.e. timeouts and aborts) as well.

Integrated RAID isn't supported yet, and there are some known bugs.

So this isn't ready for production use, but is certainly ready for
testing and additional development.  For the moment, new commits to this
driver should go into the FreeBSD Perforce repository first
(//depot/projects/mps/...) and then get merged into -current once
they've been vetted.

This has only been added to the amd64 GENERIC, since that is the only
architecture I have tested this driver with.

Submitted by:	scottl
Discussed with:	imp, gibbs, will
Sponsored by:	Yahoo, Spectra Logic Corporation
@
text
@a57 1
options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
@


1.547
log
@SVN rev 210947 on 2010-08-06 18:46:27Z by bschmidt

Fix whitespace nits.

PR:		conf/148989
Submitted by:	pluknet <pluknet at gmail.com>
MFC after:	3 days
@
text
@d115 1
@


1.546
log
@SVN rev 210564 on 2010-07-28 15:36:12Z by mdf

Add MALLOC_DEBUG_MAXZONES debug malloc(9) option to use multiple uma
zones for each malloc bucket size.  The purpose is to isolate
different malloc types into hash classes, so that any buffer overruns
or use-after-free will usually only affect memory from malloc types in
that hash class.  This is purely a debugging tool; by varying the hash
function and tracking which hash class was corrupted, the intersection
of the hash classes from each instance will point to a single malloc
type that is being misused.  At this point inspection or memguard(9)
can be used to catch the offending code.

Add MALLOC_DEBUG_MAXZONES=8 to -current GENERIC configuration files.
The suggestion to have this on by default came from Kostik Belousov on
-arch.

This code is based on work by Ron Steinke at Isilon Systems.

Reviewed by:    -arch (mostly silence)
Reviewed by:    zml
Approved by:    zml (mentor)
@
text
@d65 1
a65 1
options		FLOWTABLE		# per-cpu routing cache
@


1.545
log
@SVN rev 209758 on 2010-07-07 09:23:46Z by kevlo

Add the u3g(4) driver. I can't find any reason why it's not here.
@
text
@d79 1
@


1.544
log
@SVN rev 207207 on 2010-04-25 22:01:32Z by thompsa

Set USB_DEBUG like the other platforms, I had turned it off to test the build
before committing r207077.

Spotted by:	marius
@
text
@d297 1
@


1.543
log
@SVN rev 207077 on 2010-04-22 21:31:34Z by thompsa

Change USB_DEBUG to #ifdef and allow it to be turned off. Previously this had
the illusion of a tunable setting but was always turned on regardless.

MFC after:	1 week
@
text
@d284 1
a284 1
#options 	USB_DEBUG	# enable debug msgs
@


1.542
log
@SVN rev 206625 on 2010-04-14 20:45:33Z by yongari

Add driver for Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet.
This driver was written by Alexander Pohoyda and greatly enhanced
by Nikolay Denev. I don't have these hardwares but this driver was
tested by Nikolay Denev and xclin.

Because SiS didn't release data sheet for this controller, programming
information came from Linux driver and OpenSolaris. Unlike other open
source driver for SiS190/191, sge(4) takes full advantage of TX/RX
checksum offloading and does not require additional copy operation in
RX handler.
The controller seems to have advanced offloading features like VLAN
hardware tag insertion/stripping, TCP segmentation offload(TSO) as
well as jumbo frame support but these features are not available
yet. Special thanks to xclin <xclin<> cs dot nctu dot edu dot tw>
who sent fix for receiving VLAN oversized frames.
@
text
@d284 1
@


1.541
log
@SVN rev 205116 on 2010-03-13 09:21:00Z by ed

Remove COMPAT_43TTY from stock kernel configuration files.

COMPAT_43TTY enables the sgtty interface. Even though its exposure has
only been removed in FreeBSD 8.0, it wasn't used by anything in the base
system in FreeBSD 5.x (possibly even 4.x?). On those releases, if your
ports/packages are less than two years old, they will prefer termios
over sgtty.
@
text
@d227 1
@


1.540
log
@SVN rev 205014 on 2010-03-11 14:49:06Z by nwhitehorn

Provide groundwork for 32-bit binary compatibility on non-x86 platforms,
for upcoming 64-bit PowerPC and MIPS support. This renames the COMPAT_IA32
option to COMPAT_FREEBSD32, removes some IA32-specific code from MI parts
of the kernel and enhances the freebsd32 compatibility code to support
big-endian platforms.

Reviewed by:	kib, jhb
@
text
@a46 1
options 	COMPAT_43TTY		# BSD 4.3 TTY compat (sgtty)
@


1.539
log
@SVN rev 203938 on 2010-02-15 23:44:48Z by attilio

Adjust style (following the already existing rules) for the newly
introduced option DEADLKRES.

Reported by:	danfe, julian, avg
@
text
@d48 1
a48 1
options 	COMPAT_IA32		# Compatible with i386 binaries
@


1.538
log
@SVN rev 203758 on 2010-02-10 16:30:04Z by attilio

Add the options DEADLKRES (introducing the deadlock resolver thread) in
the 'debugging' section of any HEAD kernel and enable for the mainstream
ones, excluding the embedded architectures.
It may, of course, enabled on a case-by-case basis.

Sponsored by:	Sandvine Incorporated
Requested by:	emaste
Discussed with:	kib
@
text
@d75 1
a75 1
options		DEADLKRES		# Enable the deadlock resolver
@


1.537
log
@SVN rev 202634 on 2010-01-19 17:20:34Z by jhb

Move the examples for the 'hints' and 'env' keywords from various GENERIC
kernel configs into NOTES.

Reviewed by:	imp
@
text
@d75 1
@


1.536
log
@SVN rev 202019 on 2010-01-10 17:44:22Z by imp

Add INCLUDE_CONFIG_FILE in GENERIC on all non-embedded platforms.

# This is the resolution of removing it from DEFAULTS...

MFC after:	5 days
@
text
@a23 9
# To statically compile in device wiring instead of /boot/device.hints
#hints		"GENERIC.hints"		# Default places to look for devices.

# Use the following to compile in values accessible to the kernel
# through getenv() (or kenv(1) in userland). The format of the file
# is 'variable=value', see kenv(1)
#
# env		"GENERIC.env"

@


1.535
log
@SVN rev 201443 on 2010-01-03 20:40:54Z by brooks

Add vlan(4) to all GENERIC kernels.

MFC after:	1 week
@
text
@d78 1
@


1.534
log
@SVN rev 198043 on 2009-10-13 19:02:03Z by jhb

Move the USB wireless drivers down into their own section next to the USB
ethernet drivers.

Submitted by:	Glen Barber  glen.j.barber @@ gmail
MFC after:	1 month
@
text
@d277 1
@


1.533
log
@SVN rev 197653 on 2009-10-01 02:08:42Z by rpaulo

Improve 802.11s comment.

Spotted by:	dougb
MFC after:	1 day
@
text
@a299 4
device		rum		# Ralink Technology RT2501USB wireless NICs
device		uath		# Atheros AR5523 wireless NICs
device		ural		# Ralink Technology RT2500USB wireless NICs
device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
d318 5
@


1.532
log
@SVN rev 196196 on 2009-08-13 17:09:45Z by attilio

* Completely Remove the option STOP_NMI from the kernel.  This option
has proven to have a good effect when entering KDB by using a NMI,
but it completely violates all the good rules about interrupts
disabled while holding a spinlock in other occasions.  This can be the
cause of deadlocks on events where a normal IPI_STOP is expected.
* Adds an new IPI called IPI_STOP_HARD on all the supported architectures.
This IPI is responsible for sending a stop message among CPUs using a
privileged channel when disponible. In other cases it just does match a
normal IPI_STOP.
Right now the IPI_STOP_HARD functionality uses a NMI on ia32 and amd64
architectures, while on the other has a normal IPI_STOP effect. It is
responsibility of maintainers to eventually implement an hard stop
when necessary and possible.
* Use the new IPI facility in order to implement a new userend SMP kernel
function called stop_cpus_hard(). That is specular to stop_cpu() but
it does use the privileged channel for the stopping facility.
* Let KDB use the newly introduced function stop_cpus_hard() and leave
stop_cpus() for all the other cases
* Disable interrupts on CPU0 when starting the process of APs suspension.
* Style cleanup and comments adding

This patch should fix the reboot/shutdown deadlocks many users are
constantly reporting on mailing lists.

Please don't forget to update your config file with the STOP_NMI
option removal

Reviewed by:	jhb
Tested by:	pho, bz, rink
Approved by:	re (kib)
@
text
@d260 1
a260 1
options 	IEEE80211_SUPPORT_MESH	# enable 802.11s D3.0 support
@


1.531
log
@SVN rev 195618 on 2009-07-11 15:02:45Z by rpaulo

Implementation of the upcoming Wireless Mesh standard, 802.11s, on the
net80211 wireless stack. This work is based on the March 2009 D3.0 draft
standard. This standard is expected to become final next year.
This includes two main net80211 modules, ieee80211_mesh.c
which deals with peer link management, link metric calculation,
routing table control and mesh configuration and ieee80211_hwmp.c
which deals with the actually routing process on the mesh network.
HWMP is the mandatory routing protocol on by the mesh standard, but
others, such as RA-OLSR, can be implemented.

Authentication and encryption are not implemented.

There are several scripts under tools/tools/net80211/scripts that can be
used to test different mesh network topologies and they also teach you
how to setup a mesh vap (for the impatient: ifconfig wlan0 create
wlandev ... wlanmode mesh).

A new build option is available: IEEE80211_SUPPORT_MESH and it's enabled
by default on GENERIC kernels for i386, amd64, sparc64 and pc98.

Drivers that support mesh networks right now are: ath, ral and mwl.

More information at: http://wiki.freebsd.org/WifiMesh

Please note that this work is experimental. Also, please note that
bridging a mesh vap with another network interface is not yet supported.

Many thanks to the FreeBSD Foundation for sponsoring this project and to
Sam Leffler for his support.
Also, I would like to thank Gateworks Corporation for sending me a
Cambria board which was used during the development of this project.

Reviewed by:	sam
Approved by:	re (kensmith)
Obtained from:	projects/mesh11s
@
text
@a71 1
options 	STOP_NMI		# Stop CPUS using NMI instead of IPI
@


1.531.2.1
log
@SVN rev 196045 on 2009-08-03 08:13:06Z by kensmith

Copy head to stable/8 as part of 8.0 Release cycle.

Approved by:	re (Implicit)
@
text
@@


1.531.2.2
log
@SVN rev 196198 on 2009-08-13 17:54:11Z by attilio

MFC r196196:

* Completely remove the option STOP_NMI from the kernel.  This option
  has proven to have a good effect when entering KDB by using a NMI,
  but it completely violates all the good rules about interrupts
  disabled while holding a spinlock in other occasions.  This can be the
  cause of deadlocks on events where a normal IPI_STOP is expected.
* Add an new IPI called IPI_STOP_HARD on all the supported architectures.
  This IPI is responsible for sending a stop message among CPUs using a
  privileged channel when disponible. In other cases it just does match a
  normal IPI_STOP.
  Right now the IPI_STOP_HARD functionality uses a NMI on ia32 and amd64
  architectures, while on the other has a normal IPI_STOP effect. It is
  responsibility of maintainers to eventually implement an hard stop
  when necessary and possible.
* Use the new IPI facility in order to implement a new userend SMP kernel
  function called stop_cpus_hard(). That is specular to stop_cpu() but
  it does use the privileged channel for the stopping facility.
* Let KDB use the newly introduced function stop_cpus_hard() and leave
  stop_cpus() for all the other cases
* Disable interrupts on CPU0 when starting the process of APs suspension.
* Style cleanup and comments adding

This patch should fix the reboot/shutdown deadlocks many users are
constantly reporting on mailing lists.

Please don't forget to update your config file with the STOP_NMI
option removal

Reviewed by:  jhb
Tested by:    pho, bz, rink
Approved by:  re (kib)
@
text
@d72 1
@


1.531.2.3
log
@SVN rev 197065 on 2009-09-10 14:04:00Z by kensmith

Remove extra debugging support that is turned on for head but turned off
for stable branches:

	- shift to MALLOC_PRODUCTION
	- turn off automatic crash dumps
	- Remove kernel debuggers, INVARIANTS*[1], WITNESS* from
	  GENERIC kernel config files[2]

[1] INVARIANTS* left on for ia64 by request marcel
[2] sun4v was left as-is

Reviewed by:	marcel, kib
Approved by:	re (implicit)
@
text
@d79 9
@


1.531.2.4
log
@SVN rev 197656 on 2009-10-01 10:06:09Z by rpaulo

MFC r197653:
  Improve 802.11s comment.

Approved by:	re (kib)
@
text
@d251 1
a251 1
options 	IEEE80211_SUPPORT_MESH	# enable 802.11s draft support
@


1.531.2.5
log
@SVN rev 199112 on 2009-11-09 21:39:42Z by kensmith

Comment out the sbp(4) entry for GENERIC config files that contain it.
There are known issues with this driver that are beyond what can be
fixed for 8.0-RELEASE and the bugs can cause boot failure on some systems.
It's not clear if it impacts all systems and there is interest in getting
the problem fixed so for now just comment it out instead of remove it.

Commit straight to stable/8, this is an 8.0-RELEASE issue.  Head was left
alone so work on it can continue there.

Reviewed by:	Primary misc. architecture maintainers (marcel, marius)
@
text
@d316 1
a316 1
#device		sbp		# SCSI over FireWire (Requires scbus and da)
@


1.531.2.6
log
@SVN rev 199396 on 2009-11-17 15:56:45Z by jhb

MFC 198043:
Move the USB wireless drivers down into their own section next to the USB
ethernet drivers.
@
text
@d291 4
a312 5
# USB Wireless
device		rum		# Ralink Technology RT2501USB wireless NICs
device		uath		# Atheros AR5523 wireless NICs
device		ural		# Ralink Technology RT2500USB wireless NICs
device		zyd		# ZyDAS zb1211/zb1211b wireless NICs
@


1.531.2.7
log
@SVN rev 202134 on 2010-01-12 06:00:56Z by brooks

MFC r201443:
  Add vlan(4) to all GENERIC kernels.
@
text
@a267 1
device		vlan		# 802.1Q VLAN support
@


1.531.2.8
log
@SVN rev 202536 on 2010-01-18 00:53:21Z by imp

MFC r202019:
  Add INCLUDE_CONFIG_FILE in GENERIC on all non-embedded platforms.
  # This is the resolution of removing it from DEFAULTS...
@
text
@a77 1
options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
@


1.531.2.9
log
@SVN rev 206336 on 2010-04-07 02:24:41Z by nwhitehorn

MFC r205014,205015:

Provide groundwork for 32-bit binary compatibility on non-x86 platforms,
for upcoming 64-bit PowerPC and MIPS support. This renames the COMPAT_IA32
option to COMPAT_FREEBSD32, removes some IA32-specific code from MI parts
of the kernel and enhances the freebsd32 compatibility code to support
big-endian platforms.

This MFC is required for MFCs of later changes to the freebsd32
compatibility from HEAD.

Requested by:	kib
@
text
@d57 1
a57 1
options 	COMPAT_FREEBSD32	# Compatible with i386 binaries
@


1.531.2.10
log
@SVN rev 207227 on 2010-04-26 17:03:56Z by yongari

MFC r206625:
  Add driver for Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet.
  This driver was written by Alexander Pohoyda and greatly enhanced
  by Nikolay Denev. I don't have these hardwares but this driver was
  tested by Nikolay Denev and xclin.

  Because SiS didn't release data sheet for this controller, programming
  information came from Linux driver and OpenSolaris. Unlike other open
  source driver for SiS190/191, sge(4) takes full advantage of TX/RX
  checksum offloading and does not require additional copy operation in
  RX handler.
  The controller seems to have advanced offloading features like VLAN
  hardware tag insertion/stripping, TCP segmentation offload(TSO) as
  well as jumbo frame support but these features are not available
  yet. Special thanks to xclin <xclin<> cs dot nctu dot edu dot tw>
  who sent fix for receiving VLAN oversized frames.
@
text
@a226 1
device		sge		# Silicon Integrated Systems SiS190/191
@


1.531.2.11
log
@SVN rev 207399 on 2010-04-29 22:44:04Z by thompsa

MFC r207077

 Change USB_DEBUG to #ifdef and allow it to be turned off. Previously this had
 the illusion of a tunable setting but was always turned on regardless.
@
text
@a283 1
options 	USB_DEBUG	# enable debug msgs
@


1.531.2.12
log
@SVN rev 207494 on 2010-05-02 06:20:42Z by imp

Move to the new way of specifying compat options.  The backs out the
FOO = BAR form, in favor of listing the mapping in a separate file
for more compatibility with older versions of config.
@
text
@d57 1
a57 2
#options 	COMPAT_FREEBSD32	# Compatible with i386 binaries
options 	COMPAT_IA32	# Compatible with i386 binaries
@


1.531.2.13
log
@SVN rev 207496 on 2010-05-02 06:24:17Z by imp

Revert 207494: it was only for testing purposes.
@
text
@d57 2
a58 1
options 	COMPAT_FREEBSD32	# Compatible with i386 binaries
@


1.531.2.14
log
@SVN rev 211171 on 2010-08-11 07:11:20Z by bschmidt

MFC r210947:
Fix whitespace nits.

PR:		conf/148989
Submitted by:	pluknet <pluknet at gmail.com>
@
text
@d75 1
a75 1
options 	FLOWTABLE		# per-cpu routing cache
@


1.531.2.15
log
@SVN rev 214326 on 2010-10-25 07:58:37Z by avg

stable/8: add options KDB and KDB_TRACE to GENERIC kernels

Now that we have code for printing a stack trace on panic using stack(9)
facility without any debugger backend configured, use this ability
in GENERIC kernels to slightly increase amount of debugging information
available in default installations.

This change should not break anything for those who include GENERIC into
a custom kernel config file and have the above options already enabled.
They should only get a warning about duplicate options.

This commit should not change behavior of GENERIC kernels for panics and
traps with respect to core dumping and automatic reset.
As no debugger backend is configured, enter-to-debugger key combination
should still be ignored.

With this commit the sizes of GENERIC kernels increase by one to two KB.

This is a direct commit to the branch.

Approved by:	re
No objections:	core, secteam
@
text
@a79 3
options 	KDB			# Kernel debugger related code
options 	KDB_TRACE		# Print a stack trace for a panic

@


1.531.2.16
log
@SVN rev 218810 on 2011-02-18 16:29:38Z by ken

MFC: 212420, 212616, 212772, 212802, 213535, 213702, 213704, 213707, 213708,
     213743, 213839, 213840, 213882, 213898, 216088, 216227, 216363, 216368:

Merge the mps(4) driver into stable/8.  This is currently only included in
GENERIC on amd64, since that is the only architecture it has been tested
on.
@
text
@a116 1
device		mps		# LSI-Logic MPT-Fusion 2
@


1.531.2.17
log
@SVN rev 220486 on 2011-04-09 12:04:35Z by bz

MFC r219775:

  For now remove options FLOWTABLE from the remaining GENERIC kernel
  configurations and make it opt-in for those who want it.  LINT will
  still build it.

  While it may be a perfect win in some scenarios, it still troubles users
  (see PRs) in general cases.  In addition we are still allocating resources
  even if disabled by sysctl and still leak arp/nd6 entries in case of
  interface destruction.

  Discussed with:	qingli (2010-11-24, just never executed)
  Discussed with:	juli (OCTEON1)
PR:			kern/148018, kern/155604, kern/144917, kern/146792
@
text
@d75 1
@


1.531.2.18
log
@SVN rev 225627 on 2011-09-16 18:41:19Z by jhb

MFC 225201:
Enable the puc(4) driver on amd64 and i386 in GENERIC.  This allows
devices supported by puc(4) to work "out of the box" since puc.ko does
not work "out of the box".
@
text
@d192 4
a195 1
device		puc		# Multi I/O cards and multi-channel UARTs
@


1.531.2.19
log
@SVN rev 226243 on 2011-10-11 04:40:06Z by delphij

MFC r226026:

Add the 9750 SATA+SAS 6Gb/s RAID controller card driver, tws(4).
Many thanks for their contiued support to FreeBSD.

This is version 10.80.00.003 from codeset 10.2.1 [1]

Obtained from:	LSI http://kb.lsi.com/Download16574.aspx [1]
@
text
@a157 1
device		tws		# LSI 3ware 9750 SATA+SAS 6Gb/s RAID controller
@


1.531.2.20
log
@SVN rev 227306 on 2011-11-07 13:45:18Z by marius

MFC: r227006, r227281, r227282

Add a PCI front-end to esp(4) allowing it to support AMD Am53C974 and
replace amd(4) with the former in the amd64, i386 and pc98 GENERIC kernel
configuration files. Besides duplicating functionality, amd(4), which
previously also supported the AMD Am53C974, unlike esp(4) is no longer
maintained and has accumulated enough bit rot over time to always cause
a panic during boot as long as at least one target is attached to it
(see PR 124667).

PR:		124667
Obtained from:	NetBSD (based on)
@
text
@d111 1
a111 1
device		esp		# AMD Am53C974 (Tekram DC-390(T))
@


1.531.2.21
log
@SVN rev 231688 on 2012-02-14 15:56:01Z by jimharris

MFC r230843, r231134, r231136, r231137, r231296

Add isci(4) driver for amd64 and i386 targets.

The isci driver is for the integrated SAS controller in the Intel C600
(Patsburg) chipset.  Source files in sys/dev/isci directory are
FreeBSD-specific, and sys/dev/isci/scil subdirectory contains
an OS-agnostic library (SCIL) published by Intel to control the SAS
controller.  This library is used primarily as-is in this driver, with
some post-processing to better integrate into the kernel build
environment.

isci.4 and a README in the sys/dev/isci directory contain a few
additional details.

This driver is only built for amd64 and i386 targets.

Sponsored by: Intel
Reviewed by: scottl
Approved by: scottl
@
text
@a124 1
device		isci		# Intel C600 SAS controller
@


1.531.2.22
log
@SVN rev 233744 on 2012-03-31 10:47:40Z by marius

MFC: r233427

Add cas(4), gem(4) and hme(4) to x86 GENERICs as suggested by netchild@@ in
<20120222095239.Horde.0hpYHJjmRSRPRKzXsoFRbYk@@webmail.leidinger.net>.
According to some private emails received, it apparently is not unpopular
to use at least Quad GigaSwift cards driven by cas(4) in x86 machines.
@
text
@a215 1
device		cas		# Sun Cassini/Cassini+ and NS DP83065 Saturn
a218 2
device		gem		# Sun GEM/Sun ERI/Apple GMAC
device		hme		# Sun HME (Happy Meal Ethernet)
@


1.531.2.23
log
@SVN rev 237562 on 2012-06-25 12:30:51Z by brueffer

MFC: r225482

Fix a zyd(4) comment typo that was copy+pasted into most kernel config files.
@
text
@d322 1
a322 1
device		zyd		# ZyDAS zd1211/zd1211b wireless NICs
@


1.531.2.24
log
@SVN rev 240994 on 2012-09-27 10:56:25Z by kib

MFC r240135:
Add support for new Intel on-CPU Bull Mountain random number generator.

MFC r240455:
Rename the IVY_RNG option to RDRAND_RNG.
@
text
@a273 2
options 	PADLOCK_RNG	# VIA Padlock RNG
options 	RDRAND_RNG	# Intel Bull Mountain RNG
@


1.531.2.25
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 242909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r242909 | dim | 2012-11-12 07:47:19 +0000 (Mon, 12 Nov 2012) | 20 lines
## SVN ##
## SVN ## MFC r242625:
## SVN ##
## SVN ## Remove duplicate const specifiers in many drivers (I hope I got all of
## SVN ## them, please let me know if not).  Most of these are of the form:
## SVN ##
## SVN ## static const struct bzzt_type {
## SVN ##       [...list of members...]
## SVN ## } const bzzt_devs[] = {
## SVN ##       [...list of initializers...]
## SVN ## };
## SVN ##
## SVN ## The second const is unnecessary, as arrays cannot be modified anyway,
## SVN ## and if the elements are const, the whole thing is const automatically
## SVN ## (e.g. it is placed in .rodata).
## SVN ##
## SVN ## I have verified this does not change the binary output of a full kernel
## SVN ## build (except for build timestamps embedded in the object files).
## SVN ##
## SVN ## Reviewed by:	yongari, marius
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@d19 1
a19 1
# $FreeBSD: stable/8/sys/amd64/conf/GENERIC 240994 2012-09-27 10:56:25Z kib $
@


1.531.2.26
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/245941
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/8/sys/amd64/conf/GENERIC 245941 2013-01-26 05:27:00Z delphij $
a144 1
device		hpt27xx		# Highpoint RocketRAID 27xx
@


1.531.2.27
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/247909
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/8/sys/amd64/conf/GENERIC 247909 2013-03-07 07:28:05Z bryanv $
a333 8

# VirtIO support
device		virtio		# Generic VirtIO bus (required)
device		virtio_pci	# VirtIO PCI device
device		vtnet		# VirtIO Ethernet device
device		virtio_blk	# VirtIO Block device
device		virtio_scsi	# VirtIO SCSI device
device		virtio_balloon	# VirtIO Memory Balloon device
@


1.531.2.28
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/253033
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/8/sys/amd64/conf/GENERIC 253033 2013-07-08 12:17:06Z achim $
a153 1
device		aacraid		# Adaptec by PMC RAID
@


1.531.2.29
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/260271
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@d19 1
a19 1
# $FreeBSD: stable/8/sys/amd64/conf/GENERIC 260271 2014-01-04 18:10:15Z edavis $
a198 1
device		bxe		# Broadcom NetXtreme II BCM5771X/BCM578XX 10GbE
@


1.531.2.21.2.1
log
@SVN rev 232438 on 2012-03-03 06:15:13Z by kensmith

Copy stable/8 to releng/8.3 as part of 8.3-RELEASE release cycle.

Approved by:	re (implicit)
@
text
@@


1.531.2.21.2.2
log
@Switch importer
@
text
@d19 1
a19 1
# $FreeBSD: releng/8.3/sys/amd64/conf/GENERIC 231688 2012-02-14 15:56:01Z jimharris $
@


1.531.2.15.2.1
log
@SVN rev 216617 on 2010-12-21 17:09:25Z by kensmith

Copy stable/8 to releng/8.2 in preparation for FreeBSD-8.2 release.

Approved by:	re (implicit)
@
text
@@


1.531.2.13.2.1
log
@SVN rev 209145 on 2010-06-14 02:09:06Z by kensmith

Copy stable/8 to releng/8.1 in preparation for 8.1-RC1.

Approved by:	re (implicit)
@
text
@@


1.531.2.4.2.1
log
@SVN rev 198460 on 2009-10-25 01:10:29Z by kensmith

Copy stable/8 to releng/8.0 as part of 8.0-RELEASE release procedure.

Approved by:	re (implicit)
@
text
@@


1.531.2.4.2.2
log
@SVN rev 199117 on 2009-11-09 23:48:01Z by kensmith

MFC r199112:
> Comment out the sbp(4) entry for GENERIC config files that contain it.
> There are known issues with this driver that are beyond what can be
> fixed for 8.0-RELEASE and the bugs can cause boot failure on some systems.
> It's not clear if it impacts all systems and there is interest in getting
> the problem fixed so for now just comment it out instead of remove it.

Reviewed by:	Primary misc. architecture maintainers (marcel, marius)
Approved by:	re (kib)
@
text
@d316 1
a316 1
#device		sbp		# SCSI over FireWire (Requires scbus and da)
@


1.530
log
@SVN rev 195295 on 2009-07-02 18:24:37Z by ed

Enable POSIX semaphores on all non-embedded architectures by default.

More applications (including Firefox) seem to depend on this nowadays,
so not having this enabled by default is a bad idea.

Proposed by:	miwi
Patch by:	Florian Smeets <flo kasimir com>
Approved by:	re (kib)
@
text
@d261 1
@


1.529
log
@SVN rev 194204 on 2009-06-14 18:01:35Z by ed

Enable PRINTF_BUFR_SIZE on i386 and amd64 by default.

In the past there have been some reports of PRINTF_BUFR_SIZE not
functioning correctly. Instead of having garbled console messages, we
should just see whether the issues are still there and analyze them.

Approved by:	re
@
text
@d68 1
@


1.528
log
@SVN rev 193880 on 2009-06-10 02:07:58Z by yongari

Add alc(4), a driver for Atheros AR8131/AR8132 PCIe ethernet
controller. These controllers are also known as L1C(AR8131) and
L2C(AR8132) respectively. These controllers resembles the first
generation controller L1 but usage of different descriptor format
and new register mappings over L1 register space requires a new
driver. There are a couple of registers I still don't understand
but the driver seems to have no critical issues for performance and
stability. Currently alc(4) supports the following hardware
features.
  o MSI
  o TCP Segmentation offload
  o Hardware VLAN tag insertion/stripping
  o Tx/Rx interrupt moderation
  o Hardware statistics counters(dev.alc.%d.stats)
  o Jumbo frame
  o WOL
AR8131/AR8132 also supports Tx checksum offloading but I disabled
it due to stability issues. I'm not sure this comes from broken
sample boards or hardware bugs. If you know your controller works
without problems you can still enable it. The controller has a
silicon bug for Rx checksum offloading, so the feature was not
implemented.
I'd like to say big thanks to Atheros. Atheros kindly sent sample
boards to me and answered several questions I had.

HW donated by:	Atheros Communications, Inc.
@
text
@d69 1
@


1.527
log
@SVN rev 193864 on 2009-06-09 21:58:14Z by kmacy

opt in to flowtable on i386/amd64
@
text
@d216 1
@


1.526
log
@SVN rev 193334 on 2009-06-02 18:31:08Z by rwatson

Remove MAC kernel config files and add "options MAC" to GENERIC, with the
goal of shipping 8.0 with MAC support in the default kernel.  No policies
will be compiled in or enabled by default, but it will now be possible to
load them at boot or runtime without a kernel recompile.

While the framework is not believed to impose measurable overhead when no
policies are loaded (a result of optimization over the past few months in
HEAD), we'll continue to benchmark and optimize as the release approaches.
Please keep an eye out for performance or functionality regressions that
could be a result of this change.

Approved by:	re (kensmith)
Obtained from:	TrustedBSD Project
@
text
@d74 1
@


1.525
log
@SVN rev 191954 on 2009-05-10 00:00:25Z by kuriyama

- Use "device\t" and "options \t" for consistency.
@
text
@d73 1
@


1.524
log
@SVN rev 191726 on 2009-05-01 17:20:16Z by sam

o add uath
o sort usb wireless drivers
@
text
@d71 1
a71 1
options  	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
d117 1
a117 1
#device 	ispfw		# Firmware for QLogic HBAs- normally a module
d263 1
a263 1
options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
@


1.523
log
@SVN rev 190876 on 2009-04-10 00:40:48Z by jfv

Add ixgbe to the GENERIC amd64 kernel in place of the
older ixgb driver. I will add to other architectures
after this one proves trouble free.

MFC after:	2 weeks
@
text
@d295 2
d298 1
a298 1
device		rum		# Ralink Technology RT2501USB wireless NICs
@


1.522
log
@SVN rev 190100 on 2009-03-19 20:33:26Z by thompsa

Remove the uscanner(4) driver, this follows the removal of the kernel scanner
driver in Linux 2.6. uscanner was just a simple wrapper around a fifo and
contained no logic, the default interface is now libusb (supported by sane).

Reviewed by:	HPS
@
text
@d203 1
a203 1
device		ixgb		# Intel PRO/10GbE Ethernet Card
@


1.521
log
@SVN rev 188944 on 2009-02-23 18:34:56Z by thompsa

Change over the usb kernel options to the new stack (retaining existing
naming). The old usb stack can be compiled in my prefixing the name with 'o'.
@
text
@a297 1
device		uscanner	# Scanners
@


1.520
log
@SVN rev 188665 on 2009-02-15 23:40:37Z by svn

Add uslcom to the build too.

Reminded by:	Michael Butler
@
text
@d284 5
a288 62
# USB core support
device          usb2_core
# USB controller support
device		usb2_controller
device		usb2_controller_ehci
device		usb2_controller_ohci
device		usb2_controller_uhci
# USB mass storage support
device		usb2_storage
device		usb2_storage_mass
# USB ethernet support, requires miibus
device		usb2_ethernet
device		usb2_ethernet_aue
device		usb2_ethernet_axe
device		usb2_ethernet_cdce
device		usb2_ethernet_cue
device		usb2_ethernet_kue
device		usb2_ethernet_rue
device		usb2_ethernet_dav
# USB wireless LAN support
device		usb2_wlan
device		usb2_wlan_rum
device		usb2_wlan_ral
device		usb2_wlan_zyd
# USB serial device support
device		usb2_serial
device		usb2_serial_ark
device		usb2_serial_bsa
device		usb2_serial_bser
device		usb2_serial_chcom
device		usb2_serial_cycom
device		usb2_serial_foma
device		usb2_serial_ftdi
device		usb2_serial_gensa
device		usb2_serial_ipaq
device		usb2_serial_lpt
device		usb2_serial_mct
device		usb2_serial_modem
device		usb2_serial_moscom
device		usb2_serial_plcom
device		usb2_serial_slcom
device		usb2_serial_visor
device		usb2_serial_vscom
# USB bluetooth support
#device		usb2_bluetooth
#device		usb2_bluetooth_ng
# USB input device support
device		usb2_input
device		usb2_input_hid
device		usb2_input_kbd
device		usb2_input_ms
# USB sound and MIDI device support
#device		usb2_sound
# USB scanner support
device		usb2_image
device		usb2_scanner

# USB support (deprecated)
#device		uhci		# UHCI PCI->USB interface
#device		ohci		# OHCI PCI->USB interface
#device		ehci		# EHCI PCI->USB interface (USB 2.0)
#device		usb		# USB Bus (required)
d290 9
a298 10
#device		ugen		# Generic
#device		uhid		# "Human Interface Devices"
#device		ukbd		# Keyboard
#device		ulpt		# Printer
#device		umass		# Disks/Mass storage - Requires scbus and da
#device		ums		# Mouse
#device		ural		# Ralink Technology RT2500USB wireless NICs
#device		rum		# Ralink Technology RT2501USB wireless NICs
#device		urio		# Diamond Rio 500 MP3 player
#device		uscanner	# Scanners
d300 8
a307 9
#device		ucom		# Generic com ttys
#device		uark		# Technologies ARK3116 based serial adapters
#device		ubsa		# Belkin F5U103 and compatible serial adapters
#device		uftdi		# For FTDI usb serial adapters
#device		uipaq		# Some WinCE based devices
#device		uplcom		# Prolific PL-2303 serial adapters
#device		uslcom		# SI Labs CP2101/CP2102 serial adapters
#device		uvisor		# Visor and Palm devices
#device		uvscom		# USB serial support for DDI pocket's PHS
d309 7
a315 7
#device		aue		# ADMtek USB Ethernet
#device		axe		# ASIX Electronics USB Ethernet
#device		cdce		# Generic USB over Ethernet
#device		cue		# CATC USB Ethernet
#device		kue		# Kawasaki LSI USB Ethernet
#device		rue		# RealTek RTL8150 USB Ethernet
#device		udav		# Davicom DM9601E USB
@


1.519
log
@SVN rev 188660 on 2009-02-15 22:33:44Z by thompsa

Switch over GENERIC kernels to USB2 by default.

Tested by:	make universe
@
text
@d324 1
@


1.518
log
@SVN rev 187433 on 2009-01-19 15:33:06Z by sobomax

Take NTFS option out to match i386 GENERIC.

Suggested by:	phk, luigi
@
text
@d284 61
a344 5
# USB support
device		uhci		# UHCI PCI->USB interface
device		ohci		# OHCI PCI->USB interface
device		ehci		# EHCI PCI->USB interface (USB 2.0)
device		usb		# USB Bus (required)
d346 10
a355 10
device		ugen		# Generic
device		uhid		# "Human Interface Devices"
device		ukbd		# Keyboard
device		ulpt		# Printer
device		umass		# Disks/Mass storage - Requires scbus and da
device		ums		# Mouse
device		ural		# Ralink Technology RT2500USB wireless NICs
device		rum		# Ralink Technology RT2501USB wireless NICs
device		urio		# Diamond Rio 500 MP3 player
device		uscanner	# Scanners
d357 9
a365 9
device		ucom		# Generic com ttys
device		uark		# Technologies ARK3116 based serial adapters
device		ubsa		# Belkin F5U103 and compatible serial adapters
device		uftdi		# For FTDI usb serial adapters
device		uipaq		# Some WinCE based devices
device		uplcom		# Prolific PL-2303 serial adapters
device		uslcom		# SI Labs CP2101/CP2102 serial adapters
device		uvisor		# Visor and Palm devices
device		uvscom		# USB serial support for DDI pocket's PHS
d367 7
a373 7
device		aue		# ADMtek USB Ethernet
device		axe		# ASIX Electronics USB Ethernet
device		cdce		# Generic USB over Ethernet
device		cue		# CATC USB Ethernet
device		kue		# Kawasaki LSI USB Ethernet
device		rue		# RealTek RTL8150 USB Ethernet
device		udav		# Davicom DM9601E USB
@


1.517
log
@SVN rev 187430 on 2009-01-19 08:51:20Z by sobomax

asr(4) is not amd64-clean, not amr(4).

Pointy hat to:	myself
Submitted by:	scottl
@
text
@a49 1
options 	NTFS			# NT File System
@


1.516
log
@SVN rev 187429 on 2009-01-19 08:25:41Z by sobomax

Comment amr(4) out - according to scottl it's not 64-bit clean.
@
text
@d139 2
d142 1
a142 3
#device		amr		# AMI MegaRAID
device		arcmsr		# Areca SATA II RAID
device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
@


1.515
log
@SVN rev 187427 on 2009-01-19 07:18:32Z by sobomax

Whitespace-only: reduce diff to the i386 GENERIC.
@
text
@d139 2
a140 1
device		amr		# AMI MegaRAID
@


1.514
log
@SVN rev 187426 on 2009-01-19 07:10:11Z by sobomax

Add asr(4) and stge(4) from i386 GENERIC. Both drivers compile on amd64 and
there is no particular reason for them to be i386-only.

MFC after:	2 weeks
@
text
@d31 1
a31 1
# env          "GENERIC.env"
d72 1
a73 1
options 	HWPMC_HOOKS		# Necessary kernel hooks for hwpmc(4)
d254 2
a255 2
options		IEEE80211_DEBUG	# enable debug msgs
options		IEEE80211_AMPDU_AGE	# age frames in AMPDU reorder q's
@


1.513
log
@SVN rev 187144 on 2009-01-13 12:35:33Z by luigi

Documentation-only change:

- add a reference to the config(5) manpage;
- hopefully clarify the format of the 'env FILENAME' directive.

I am putting these notes in sys/${arch}/conf/GENERIC and not
in sys/conf/NOTES because:

1. i386/GENERIC already had reference to a similar option (hints..)
   and to documentation (handbook)

2. GENERIC is what most users look at when they have to modify or
   create a new kernel config, so having the suggestion there is
   more effective.

I am only touching i386 and amd64 because the other GENERIC files
are already out of sync, and I am not sure what is the overall plan.

MFC after:	3 days
@
text
@d141 1
d234 1
@


1.512
log
@SVN rev 186776 on 2009-01-05 14:21:49Z by rwatson

Add commented out options KDTRACE_HOOKS and, for amd64, KDRACE_FRAME,
to GENERIC configuration files.  This brings what's in 8.x in sync
with what is in 7.x, but does not change any current defaults.

Possibly they should now be enabled in head by default?
@
text
@d4 2
a5 2
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
d27 6
@


1.511
log
@SVN rev 185567 on 2008-12-02 19:09:08Z by ed

Remove "[KEEP THIS!]" from COMPAT_43TTY. It's not really that important.

Sgtty is a programming interface that has been replaced by termios over
the years. In June we already removed <sgtty.h>, which exposes the
ioctl()'s that are implemented by this interface. The importance of this
flag is overrated right now.
@
text
@d68 2
@


1.510
log
@SVN rev 185522 on 2008-12-01 16:53:01Z by sam

Switch to ath hal source code. Note this removes the ath_hal
module; the ath module now brings in the hal support.  Kernel
config files are almost backwards compatible; supplying

device ath_hal

gives you the same chip support that the binary hal did but you
must also include

options AH_SUPPORT_AR5416

to enable the extended format descriptors used by 11n parts.
It is now possible to control the chip support included in a
build by specifying exactly which chips are to be supported
in the config file; consult ath_hal(4) for information.
@
text
@d51 1
a51 1
options 	COMPAT_43TTY		# BSD 4.3 TTY compat [KEEP THIS!]
@


1.509
log
@SVN rev 184870 on 2008-11-12 09:52:06Z by yongari

Add ale(4), a driver for Atheros AR8121/AR8113/AR8114 PCIe ethernet
controller. The controller is also known as L1E(AR8121) and
L2E(AR8113/AR8114). Unlike its predecessor Attansic L1,
AR8121/AR8113/AR8114 uses completely different Rx logic such that
it requires separate driver. Datasheet for AR81xx is not available
to open source driver writers but it shares large part of Tx and
PHY logic of L1. I still don't understand some part of register
meaning and some MAC statistics counters but the driver seems to
have no critical issues for performance and stability.

The AR81xx requires copy operation to pass received frames to upper
stack such that ale(4) consumes a lot of CPU cycles than that of
other controller. A couple of silicon bugs also adds more CPU
cycles to address the known hardware bug. However, if you have fast
CPU you can still saturate the link.
Currently ale(4) supports the following hardware features.
  - MSI.
  - TCP Segmentation offload.
  - Hardware VLAN tag insertion/stripping with checksum offload.
  - Tx TCP/UDP checksum offload and Rx IP/TCP/UDP checksum offload.
  - Tx/Rx interrupt moderation.
  - Hardware statistics counters.
  - Jumbo frame.
  - WOL.

AR81xx PCIe ethernet controllers are mainly found on ASUS EeePC or
P5Q series of ASUS motherboards. Special thanks to Jeremy Chadwick
who sent the hardware to me. Without his donation writing a driver
for AR81xx would never have been possible. Big thanks to all people
who reported feedback or tested patches.

HW donated by:	koitsu
Tested by:	bsam, Joao Barros <joao.barros <> gmail DOT com >
		Jan Henrik Sylvester <me <> janh DOT de >
		Ivan Brawley < ivan <> brawley DOT id DOT au >,
		CURRENT ML
@
text
@d252 2
a253 1
device		ath_hal		# Atheros HAL (Hardware Access Layer)
@


1.508
log
@SVN rev 183567 on 2008-10-03 10:31:31Z by stas

- Add driver for Attansic L2 FastEthernet controller found on
  Asus EeePC and some Asus mainboards.

Reviewed by:	yongari, rpaulo, jhb
Tested by:	many
Approved by:	kib (mentor)
MFC after:	1 week
@
text
@d205 1
@


1.507
log
@SVN rev 181905 on 2008-08-20 08:31:58Z by ed

Integrate the new MPSAFE TTY layer to the FreeBSD operating system.

The last half year I've been working on a replacement TTY layer for the
FreeBSD kernel. The new TTY layer was designed to improve the following:

- Improved driver model:

  The old TTY layer has a driver model that is not abstract enough to
  make it friendly to use. A good example is the output path, where the
  device drivers directly access the output buffers. This means that an
  in-kernel PPP implementation must always convert network buffers into
  TTY buffers.

  If a PPP implementation would be built on top of the new TTY layer
  (still needs a hooks layer, though), it would allow the PPP
  implementation to directly hand the data to the TTY driver.

- Improved hotplugging:

  With the old TTY layer, it isn't entirely safe to destroy TTY's from
  the system. This implementation has a two-step destructing design,
  where the driver first abandons the TTY. After all threads have left
  the TTY, the TTY layer calls a routine in the driver, which can be
  used to free resources (unit numbers, etc).

  The pts(4) driver also implements this feature, which means
  posix_openpt() will now return PTY's that are created on the fly.

- Improved performance:

  One of the major improvements is the per-TTY mutex, which is expected
  to improve scalability when compared to the old Giant locking.
  Another change is the unbuffered copying to userspace, which is both
  used on TTY device nodes and PTY masters.

Upgrading should be quite straightforward. Unlike previous versions,
existing kernel configuration files do not need to be changed, except
when they reference device drivers that are listed in UPDATING.

Obtained from:		//depot/projects/mpsafetty/...
Approved by:		philip (ex-mentor)
Discussed:		on the lists, at BSDCan, at the DevSummit
Sponsored by:		Snow B.V., the Netherlands
dcons(4) fixed by:	kan
@
text
@d203 1
@


1.506
log
@SVN rev 181233 on 2008-08-03 10:32:17Z by ed

Disconnect drivers that haven't been ported to MPSAFE TTY yet.

As clearly mentioned on the mailing lists, there is a list of drivers
that have not been ported to the MPSAFE TTY layer yet. Remove them from
the kernel configuration files. This means people can now still use
these drivers if they explicitly put them in their kernel configuration
file, which is good.

People should keep in mind that after August 10, these drivers will not
work anymore. Even though owners of the hardware are capable of getting
these drivers working again, I will see if I can at least get them to a
compilable state (if time permits).
@
text
@d260 1
a260 1
device		pty		# Pseudo-ttys (telnet etc)
@


1.505
log
@SVN rev 181031 on 2008-07-30 22:27:38Z by jfv

Add igb to the default kernel

MFC after:ASAP
@
text
@a258 2
device		sl		# Kernel SLIP
device		ppp		# Kernel PPP
a290 1
device		ubser		# BWCT console serial adapters
@


1.504
log
@SVN rev 180487 on 2008-07-13 07:20:14Z by ed

Make uart(4) the default serial port driver on i386 and amd64.

The uart(4) driver has the advantage of supporting a wider variety of
hardware on a greater amount of platforms. This driver has already been
the standard on platforms such as ia64, powerpc and sparc64.

I've decided not to change anything on pc98. I'd rather let people from
the pc98 team look at this.

Approved by:	philip (mentor), marcel
@
text
@d192 2
a193 1
device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
@


1.503
log
@SVN rev 180359 on 2008-07-07 22:55:11Z by delphij

Add HWPMC_HOOKS to GENERIC kernels, this makes hwpmc.ko work out
of the box.
@
text
@a174 1
device		sio		# 8250, 16[45]50 based serial ports
@


1.502
log
@SVN rev 179895 on 2008-06-20 19:28:33Z by delphij

Add et(4), a port of DragonFly's Agere ET1310 10/100/Gigabit
Ethernet device driver, written by sephe@@

Obtained from:	DragonFly
Sponsored by:	iXsystems
MFC after:	2 weeks
@
text
@d67 1
@


1.501
log
@Add jme(4) to the list of drivers supported by GENERIC kernel.
@
text
@d207 1
@


1.500
log
@Add age(4) to the list of drivers supported by GENERIC kernel.
@
text
@d208 1
@


1.499
log
@Resort the if_ti driver to match the PCI Network cards instead of placing
it under the mii devices list.

PR:		kern/123147
Submitted by:	gavin
Approved by:	imp (mentor, implicit)
MFC after:	3 days
@
text
@d202 1
@


1.498
log
@enable IEEE80211_DEBUG and IEEE80211_AMPDU_AGE by default
@
text
@d195 1
a218 1
device		ti		# Alteon Networks Tigon I/II gigabit Ethernet
@


1.497
log
@Multi-bss (aka vap) support for 802.11 devices.

Note this includes changes to all drivers and moves some device firmware
loading to use firmware(9) and a separate module (e.g. ral).  Also there
no longer are separate wlan_scan* modules; this functionality is now
bundled into the wlan module.

Supported by:	Hobnob and Marvell
Reviewed by:	many
Obtained from:	Atheros (some bits)
@
text
@d238 2
@


1.496
log
@move awi to the Attic; it will not make the jump to the new world order

Reviewed by:	imp
@
text
@a241 2
device		wlan_scan_ap	# 802.11 AP mode scanning
device		wlan_scan_sta	# 802.11 STA mode scanning
@


1.495
log
@Add kernel module support for nfslockd and krpc. Use the module system
to detect (or load) kernel NLM support in rpc.lockd. Remove the '-k'
option to rpc.lockd and make kernel NLM the default. A user can still
force the use of the old user NLM by building a kernel without NFSLOCKD
and/or removing the nfslockd.ko module.
@
text
@a247 1
device		awi		# BayStack 660 and others
@


1.494
log
@Import uslcom(4) from OpenBSD - this is a driver for Silicon Laboratories
CP2101/CP2102 based USB serial adapters.

Reviewed by:		imp, emaste
Obtained from:		OpenBSD
MFC after:		2 weeks
@
text
@d42 1
@


1.493
log
@Eliminate whitespace diffs to the i386 version.
@
text
@d293 1
@


1.492
log
@Remove the rr232x driver.  It has been superceded by the hptrr driver.
@
text
@d33 1
a33 1
options 	SCTP			# Stream Control Transmission Protocol 
a118 1

@


1.491
log
@Add COMPAT_FREEBSD7 and enable it in configs that have COMPAT_FREEBSD6.
@
text
@a135 1
device		rr232x		# Highpoint RocketRAID 232x
@


1.490
log
@Add the 'hptrr' driver for supporting the following Highpoint RocketRAID
cards:

     o   RocketRAID 172x series
     o   RocketRAID 174x series
     o   RocketRAID 2210
     o   RocketRAID 222x series
     o   RocketRAID 2240
     o   RocketRAID 230x series
     o   RocketRAID 231x series
     o   RocketRAID 232x series
     o   RocketRAID 2340
     o   RocketRAID 2522

Many thanks to Highpoint for their continued support of FreeBSD.

Submitted by: Highpoint
@
text
@d55 1
@


1.489
log
@Break out stack(9) from ddb(4):

- Introduce per-architecture stack_machdep.c to hold stack_save(9).
- Introduce per-architecture machine/stack.h to capture any common
  definitions required between db_trace.c and stack_machdep.c.
- Add new kernel option "options STACK"; we will build in stack(9) if it is
  defined, or also if "options DDB" is defined to provide compatibility
  with existing users of stack(9).

Add new stack_save_td(9) function, which allows the capture of a stacktrace
of another thread rather than the current thread, which the existing
stack_save(9) was limited to.  It requires that the thread be neither
swapped out nor running, which is the responsibility of the consumer to
enforce.

Update stack(9) man page.

Build tested:	amd64, arm, i386, ia64, powerpc, sparc64, sun4v
Runtime tested:	amd64 (rwatson), arm (cognet), i386 (rwatson)
@
text
@d134 1
@


1.488
log
@Make ADAPTIVE_GIANT as the default in the kernel and remove the option.
Currently, Giant is not too much contented so that it is ok to treact it
like any other mutexes.

Please don't forget to update your own custom config kernel files.

Approved by:	cognet, marcel (maintainers of arches where option is
		not enabled at the moment)
@
text
@d57 1
@


1.487
log
@Ooops.  Put back Invariants and witness

Submitted by: csjp
@
text
@a61 1
options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
@


1.486
log
@Add usb serial devices by default.  I'm tired of telling people how to
do this that should know better :-).
@
text
@d70 4
a73 4
# options 	INVARIANTS		# Enable calls of extra sanity checking
# options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
# options 	WITNESS			# Enable checks to detect deadlocks and cycles
# options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
@


1.485
log
@Switch over to ULE as the default scheduler for amd64 and i386
architectures.
@
text
@d70 4
a73 4
options 	INVARIANTS		# Enable calls of extra sanity checking
options 	INVARIANT_SUPPORT	# Extra sanity checks of internal structures, required by INVARIANTS
options 	WITNESS			# Enable checks to detect deadlocks and cycles
options 	WITNESS_SKIPSPIN	# Don't run witness on spinlocks for speed
d282 1
d285 10
d302 1
@


1.484
log
@Use the correct expanded name for SCTP.

PR:		116496
Submitted by:	koitsu
Reviewed by:	rrs
Approved by:	re (kensmith)
@
text
@d29 1
a29 1
options 	SCHED_4BSD		# 4BSD scheduler
@


1.484.2.1
log
@Remove debugging support from GENERIC kernels, remove warning in
UPDATING that says debugging support makes FreeBSD slower, and note
RELENG_7 creation.

Approved by:	re (implicit)
@
text
@d66 9
@


1.484.2.2
log
@Add the hptrr driver.

Submitted by: Highpoint
Approved by: re
@
text
@a124 1
device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
@


1.484.2.2.2.1
log
@Remove the rr232x driver.  It has been superseced by the hptrr driver.

Approved by: re
@
text
@d126 1
@


1.484.2.3
log
@Remove the rr232x driver.  It has been superseced by the hptrr driver.
@
text
@d126 1
@


1.484.2.4
log
@MFC: Switch to use ULE as default scheduler on amd64, i386 and powerpc
architectures.
@
text
@d29 1
a29 1
options 	SCHED_ULE		# ULE scheduler
@


1.484.2.5
log
@Add USB->RS232 devices to the GENERIC kernel.

imp@@ has already done this in HEAD, refer to revision 1.476 of
i386/conf/GENERIC and revision 1.486 of amd64/conf/GENERIC. It seems only fair
to do the same in RELENG_7.

Discussed with:		imp
Approved by:		re (bmah, kensmith)
@
text
@a274 11
# USB Serial devices
device		ucom		# Generic com ttys
device		uark		# Technologies ARK3116 based serial adapters
device		ubsa		# Belkin F5U103 and compatible serial adapters
device		ubser		# BWCT console serial adapters
device		uftdi		# For FTDI usb serial adapters
device		uipaq		# Some WinCE based devices
device		uplcom		# Prolific PL-2303 serial adapters
device		uslcom		# SI Labs CP2101/CP2102 serial adapters
device		uvisor		# Visor and Palm devices
device		uvscom		# USB serial support for DDI pocket's PHS
@


1.484.2.6
log
@MFC: Kernel mode Network Lock Manager.
@
text
@a41 1
options 	NFSLOCKD		# Network Lock Manager
@


1.484.2.7
log
@Merge stack.9:1.5, amd64/db_trace.c:1.82, amd64/stack_machdep.c:1.1,
amd64/conf/GENERIC:1.489, amd64/include/stack.h:1.1, arm/db_trace.c:1.14,
arm/stack_machdep.c:1.1, arm/include/stack.h:1.1, NOTES:1.1457,
files:1.1254, files.amd64:1.115, files.arm:1.19, files.i386:1.588,
files.ia64:1.94, files.powerpc:1.67, files.sparc64:1.93, files.sun4v:1.13,
options:1.610, i386/conf/GENERIC:1.478, i386/db_trace.c:1.80,
i386/stack_machdep.c:1.1, i386/include/stack.h:1.1, ia64/conf/GENERIC:1.93,
ia64/db_machdep.c:1.6, ia64/stack_machdep.c:1.1, kern/subr_stack.c:1.5,
pc98/conf/GENERIC:1.299, powerpc/conf/GENERIC:1.73,
powerpc/include/stack.h:1.1, powerpc/db_trace.c:1.14,
powerpc/stack_machdep.c:1.1, sparc64/conf/GENERIC:1.129,
sparc64/include/stack.h:1.1, sparc64/db_trace.c:1.27,
sparc64/stack_machdep.c:1.1, sun4v/conf/GENERIC:1.16,
sun4v/include/stack.h:1.1, sun4v/db_trace.c:1.2, sun4v/stack_machdep.c:1.1,
sys/stack.h:1.4 from HEAD to RELENG_7:

  Break out stack(9) from ddb(4):

  - Introduce per-architecture stack_machdep.c to hold stack_save(9).
  - Introduce per-architecture machine/stack.h to capture any common
    definitions required between db_trace.c and stack_machdep.c.
  - Add new kernel option "options STACK"; we will build in stack(9) if it
    is defined, or also if "options DDB" is defined to provide
    compatibility with existing users of stack(9).

  Add new stack_save_td(9) function, which allows the capture of a
  stacktrace of another thread rather than the current thread, which the
  existing stack_save(9) was limited to.  It requires that the thread be
  neither swapped out nor running, which is the responsibility of the
  consumer to enforce.

  Update stack(9) man page.

  Build tested:   amd64, arm, i386, ia64, powerpc, sparc64, sun4v
  Runtime tested: amd64 (rwatson), arm (cognet), i386 (rwatson)

Merge i386/stack_machdep.c:1.2 from HEAD to RELENG_7:

  Remove duplicate $FreeBSD$ tag.

Merge files.pc98:1.359, pc98/include/stack.h:1.1 from HEAD to RELENG_7:

  Catch up pc98 for i386 stack(9) changes:

    Add stub stack.h for pc98 that includes i386 pc98.

    Add i386 stack_machdep.c to files.pc98.

  Spotted by:     tinderbox
@
text
@a57 1
options 	STACK			# stack(9) support
@


1.484.2.8
log
@SVN rev 180240 on 2008-07-04 01:29:12Z by delphij

MFC revision 179895 and 179896:

Add et(4), a port of DragonFly's Agere ET1310 10/100/Gigabit
Ethernet device driver, written by sephe@@

Obtained from:	DragonFly
Sponsored by:	iXsystems
MFC after:	2 weeks
@
text
@a196 1
device		et		# Agere ET1310 10/100/Gigabit Ethernet
@


1.484.2.9
log
@SVN rev 180415 on 2008-07-10 03:20:34Z by yongari

MFC r179109
  Add age(4) to the list of drivers supported by GENERIC kernel.
@
text
@a192 1
device		age		# Attansic/Atheros L1 Gigabit Ethernet
@


1.484.2.10
log
@SVN rev 180550 on 2008-07-16 02:05:40Z by yongari

MFC r179347.
  Add jme(4) to the list of drivers supported by GENERIC kernel.
@
text
@a199 1
device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
@


1.484.2.11
log
@SVN rev 181611 on 2008-08-11 20:31:14Z by jfv

MFC of the e1000 driver reorg - add igb driver to GENERIC
@
text
@d184 1
a184 2
device		em		# Intel PRO/1000 Gigabit Ethernet Family
device		igb		# Intel PRO/1000 PCIE Server Gigabit Family
@


1.484.2.12
log
@SVN rev 182231 on 2008-08-27 04:41:15Z by jb

MFC

DTrace support.

Note that this defaults the 'make buildkernel' to build with CTF data so
that the release kernel and modules are DTrace-able.
@
text
@a66 3
options 	PRINTF_BUFR_SIZE=128    # Prevent printf output being interspersed.
options 	KDTRACE_FRAME		# Ensure frames are compiled in
options 	KDTRACE_HOOKS		# Kernel DTrace hooks
@


1.484.2.13
log
@SVN rev 182282 on 2008-08-27 17:02:11Z by jhb

Don't enable PRINTF_BUFR_SIZE or DDB_CTF by default as these are not
enabled by default in HEAD, and kernels on stable branches do not
include DDB by default either.
@
text
@d67 1
@


1.484.2.14
log
@SVN rev 182453 on 2008-08-29 18:54:35Z by jhb

Disable the KDTRACE options in GENERIC for now.  They have not yet been
enabled in HEAD, and they really need to be enabled in HEAD first and
have some soak time there before they are turned on by default in 7.
@
text
@d67 2
a68 2
#options 	KDTRACE_FRAME		# Ensure frames are compiled in
#options 	KDTRACE_HOOKS		# Kernel DTrace hooks
@


1.484.2.15
log
@SVN rev 185238 on 2008-11-24 00:52:26Z by yongari

MFC r184870:
  Add ale(4), a driver for Atheros AR8121/AR8113/AR8114 PCIe ethernet
  controller. The controller is also known as L1E(AR8121) and
  L2E(AR8113/AR8114). Unlike its predecessor Attansic L1,
  AR8121/AR8113/AR8114 uses completely different Rx logic such that
  it requires separate driver. Datasheet for AR81xx is not available
  to open source driver writers but it shares large part of Tx and
  PHY logic of L1. I still don't understand some part of register
  meaning and some MAC statistics counters but the driver seems to
  have no critical issues for performance and stability.

  The AR81xx requires copy operation to pass received frames to upper
  stack such that ale(4) consumes a lot of CPU cycles than that of
  other controller. A couple of silicon bugs also adds more CPU
  cycles to address the known hardware bug. However, if you have fast
  CPU you can still saturate the link.
  Currently ale(4) supports the following hardware features.
    - MSI.
    - TCP Segmentation offload.
    - Hardware VLAN tag insertion/stripping with checksum offload.
    - Tx TCP/UDP checksum offload and Rx IP/TCP/UDP checksum offload.
    - Tx/Rx interrupt moderation.
    - Hardware statistics counters.
    - Jumbo frame.
    - WOL.

  AR81xx PCIe ethernet controllers are mainly found on ASUS EeePC or
  P5Q series of ASUS motherboards. Special thanks to Jeremy Chadwick
  who sent the hardware to me. Without his donation writing a driver
  for AR81xx would never have been possible. Big thanks to all people
  who reported feedback or tested patches.

  HW donated by:	koitsu
  Tested by:	bsam, Joao Barros <joao.barros <> gmail DOT com >
		Jan Henrik Sylvester <me <> janh DOT de >
		Ivan Brawley < ivan <> brawley DOT id DOT au >,
		CURRENT ML
  Approved by:	re (kib)

  Note, GENERIC kernel does NOT include ale(4) but users can still
  kldload it. It was requested by re.
@
text
@a196 1
#device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@


1.484.2.16
log
@SVN rev 187434 on 2009-01-19 15:36:25Z by sobomax

MFC: take NTFS option out to match i386 GENERIC.
@
text
@d44 1
@


1.484.2.17
log
@SVN rev 189334 on 2009-03-04 01:50:00Z by yongari

Enable ale(4) in GENERIC.
@
text
@d196 1
a196 1
device		ale		# Atheros AR8121/AR8113/AR8114 Ethernet
@


1.484.2.18
log
@SVN rev 189720 on 2009-03-12 03:09:11Z by bms

Merge the open source Atheros HAL from HEAD to STABLE.

This adds support for the AH_SUPPORT_AR5416 kernel
configuration option, and removes the ath_rate*
and ath_hal modules. Their kernel options are not
however removed -- please see UPDATING.

Tested on an IBM/Lenovo T43 and ASUS EeePC 701 in both
STA and HostAP modes.

Submitted by:	sam
@
text
@a244 1
options		AH_SUPPORT_AR5416	# enable AR5416 tx/rx descriptors
@


1.484.2.19
log
@SVN rev 191034 on 2009-04-14 00:35:56Z by jfv

Add ixgbe and remove ixgb driver support from GENERIC
in the amd64 architecture.

Approved by: re
@
text
@d187 1
a187 1
device		ixgbe		# Intel PRO/10GbE PCIE Ethernet Family
@


1.484.2.20
log
@SVN rev 194426 on 2009-06-18 06:03:58Z by yongari

MFC 193880,193887:
r193880:
  Add alc(4), a driver for Atheros AR8131/AR8132 PCIe ethernet
  controller. These controllers are also known as L1C(AR8131) and
  L2C(AR8132) respectively. These controllers resembles the first
  generation controller L1 but usage of different descriptor format
  and new register mappings over L1 register space requires a new
  driver. There are a couple of registers I still don't understand
  but the driver seems to have no critical issues for performance and
  stability. Currently alc(4) supports the following hardware
  features.
    o MSI
    o TCP Segmentation offload
    o Hardware VLAN tag insertion/stripping
    o Tx/Rx interrupt moderation
    o Hardware statistics counters(dev.alc.%d.stats)
    o Jumbo frame
    o WOL
  AR8131/AR8132 also supports Tx checksum offloading but I disabled
  it due to stability issues. I'm not sure this comes from broken
  sample boards or hardware bugs. If you know your controller works
  without problems you can still enable it. The controller has a
  silicon bug for Rx checksum offloading, so the feature was not
  implemented.
  I'd like to say big thanks to Atheros. Atheros kindly sent sample
  boards to me and answered several questions I had.

  HW donated by:	Atheros Communications, Inc.

r193887:
  fix directory name.
@
text
@a195 1
device		alc		# Atheros AR8131/AR8132 Ethernet
@


1.484.2.21
log
@SVN rev 195706 on 2009-07-15 08:32:19Z by ed

MFC r195295:

  Enable POSIX semaphores on all non-embedded architectures by default.

  More applications (including Firefox) seem to depend on this nowadays,
  so not having this enabled by default is a bad idea.

  Proposed by:  miwi
  Patch by:     Florian Smeets <flo kasimir com>
  Approved by:  re (kib)
@
text
@a60 1
options 	P1003_1B_SEMAPHORES	# POSIX-style semaphores
@


1.484.2.22
log
@SVN rev 199397 on 2009-11-17 15:59:26Z by jhb

MFC 198043:
Move the USB wireless drivers down into their own section next to the USB
ethernet drivers.
@
text
@d283 1
a303 3
# USB Wireless
device		rum		# Ralink Technology RT2501USB wireless NICs
device		ural		# Ralink Technology RT2500USB wireless NICs
@


1.484.2.23
log
@SVN rev 202135 on 2010-01-12 06:04:32Z by brooks

MFC r201443:
  Add vlan(4) to all GENERIC kernels.
@
text
@a256 1
device		vlan		# 802.1Q VLAN support
@


1.484.2.24
log
@SVN rev 202547 on 2010-01-18 04:08:43Z by imp

MFC 202019:
  Add INCLUDE_CONFIG_FILE in GENERIC on all non-embedded platforms.
  # This is the resolution of removing it from DEFAULTS...
@
text
@a68 1
options 	INCLUDE_CONFIG_FILE     # Include this file in kernel
@


1.484.2.25
log
@SVN rev 207228 on 2010-04-26 17:22:02Z by yongari

MFC r206625:
  Add driver for Silicon Integrated Systems SiS190/191 Fast/Gigabit Ethernet.
  This driver was written by Alexander Pohoyda and greatly enhanced
  by Nikolay Denev. I don't have these hardwares but this driver was
  tested by Nikolay Denev and xclin.

  Because SiS didn't release data sheet for this controller, programming
  information came from Linux driver and OpenSolaris. Unlike other open
  source driver for SiS190/191, sge(4) takes full advantage of TX/RX
  checksum offloading and does not require additional copy operation in
  RX handler.
  The controller seems to have advanced offloading features like VLAN
  hardware tag insertion/stripping, TCP segmentation offload(TSO) as
  well as jumbo frame support but these features are not available
  yet. Special thanks to xclin <xclin<> cs dot nctu dot edu dot tw>
  who sent fix for receiving VLAN oversized frames.
@
text
@a215 1
device		sge		# Silicon Integrated Systems SiS190/191
@


1.484.2.26
log
@SVN rev 227307 on 2011-11-07 13:46:16Z by marius

MFC: r227006, r227281, r227282

Add a PCI front-end to esp(4) allowing it to support AMD Am53C974 and
replace amd(4) with the former in the amd64, i386 and pc98 GENERIC kernel
configuration files. Besides duplicating functionality, amd(4), which
previously also supported the AMD Am53C974, unlike esp(4) is no longer
maintained and has accumulated enough bit rot over time to always cause
a panic during boot as long as at least one target is attached to it
(see PR 124667).

PR:		124667
Obtained from:	NetBSD (based on)
@
text
@d100 1
a100 1
device		esp		# AMD Am53C974 (Tekram DC-390(T))
@


1.484.2.27
log
@SVN rev 231861 on 2012-02-17 06:58:40Z by sbruno

MFC isci(4) SAS driver

r230843, 231134, 231136, 231296, 231615, 231693, 231860

Obtained from:	Intel (Jim Harris jimharris@@)
@
text
@a112 1
device		isci		# Intel C600 SAS controller
@


1.484.2.28
log
@Switch importer
@
text
@d19 1
a19 1
# $FreeBSD: stable/7/sys/amd64/conf/GENERIC 231861 2012-02-17 06:58:40Z sbruno $
@


1.484.2.25.2.1
log
@SVN rev 216618 on 2010-12-21 17:10:29Z by kensmith

Copy stable/7 to releng/7.4 in preparation for FreeBSD-7.4 release.

Approved by:	re (implicit)
@
text
@@


1.484.2.25.2.2
log
@Switch importer
@
text
@d19 1
a19 1
# $FreeBSD: releng/7.4/sys/amd64/conf/GENERIC 207228 2010-04-26 17:22:02Z yongari $
@


1.484.2.24.2.1
log
@SVN rev 203736 on 2010-02-10 00:26:20Z by kensmith

Copy stable/7 to releng/7.3 as part of the 7.3-RELEASE process.

Approved by:	re (implicit)
@
text
@@


1.484.2.19.2.1
log
@SVN rev 191087 on 2009-04-15 03:14:26Z by kensmith

Create releng/7.2 from stable/7 in preparation for 7.2-RELEASE.

Approved by:	re (implicit)
@
text
@@


1.484.2.15.2.1
log
@SVN rev 185281 on 2008-11-25 02:59:29Z by kensmith

Create releng/7.1 in preparation for moving into RC phase of 7.1 release
cycle.

Approved by:	re (implicit)
@
text
@@


1.483
log
@Add cpufreq(4) to GENERIC.  It does not change the frequency by default,
so systems should be relatively unaffected.  Users can then simply enable
powerd(8) in rc.conf to take advantage of it.

Approved by:	re
@
text
@d33 1
a33 1
options 	SCTP			# Stream Transmission Control Protocol 
@


1.482
log
@Enable SCTP by default for GENERIC kernels in order to give it
more exposure.  The current state of SCTP implementation is
considered to be ready for 32-bit platforms, but still need some
work/testing on 64-bit platforms.

Approved by:	re (kensmith)
Discussed with:	rrs
@
text
@d78 3
@


1.481
log
@Add nfe(4) to the list of drivers supported by GENERIC kernel.
While I'm here comment out nve(4) as nfe(4) will take over.

Approved by:	re
@
text
@d33 1
@


1.480
log
@Add wlan_scan_ap and wlan_scan_sta to platforms that include wlan.
@
text
@d203 1
d205 1
a205 1
device		nve		# nVidia nForce MCP on-board Ethernet Networking
@


1.479
log
@Enable AUDIT by default in the GENERIC kernel, allowing security event
auditing to be turned on without a kernel recompile, just an rc.conf
option.

Approved by:	re (kensmith)
Obtained from:	TrustedBSD Project
@
text
@d236 2
@


1.478
log
@Enable fwip and dcons in GENERIC. They seem fairly stable.

Note on dcons:
To enable dcons in kernel, put the following lines in /boot/loader.conf.
You may also want to enable dcons in /etc/ttys.

boot_multicons="YES"
#Force dcons to be the high-level console if a firewire bus presents.
#hw.firewire.dcons_crom.force_console=1

FireWire/dcons support in loader will come shortly.
(i386/amd64 only)
@
text
@d63 1
@


1.477
log
@Add wlan_amrr. ural(4) uses amrr as transmit rate control.
@
text
@d288 3
@


1.476
log
@Introduce a driver for the Highpoint RocketRAID 3xxx series of controllers.
The driver relies on CAM.

Many thanks to Highpoint for providing this driver.
@
text
@d234 1
@


1.475
log
@Remove trailing '.' for consistency!
@
text
@d100 1
@


1.474
log
@Add UFS_GJOURNAL options to the GENERIC kernel.

Approved by:	re (kensmith)
@
text
@d37 1
a37 1
options 	UFS_GJOURNAL		# Enable gjournal-based UFS journaling.
@


1.473
log
@Include GEOM_LABEL in GENERIC.  It's very useful and not well publicized
enough.

Approved by:	pjd
@
text
@d37 1
@


1.472
log
@Evolve the ctlreq interface added to geom_gpt into a generic
partitioning class that supports multiple schemes. Current
schemes supported are APM (Apple Partition Map) and GPT.
Change all GEOM_APPLE anf GEOM_GPT options into GEOM_PART_APM
and GEOM_PART_GPT (resp).

The ctlreq interface supports verbs to create and destroy
partitioning schemes on a disk; to add, delete and modify
partitions; and to commit or undo changes made.
@
text
@d47 1
@


1.471
log
@Add msk(4) to the list of drivers supported by GENERIC kernel.
@
text
@d46 1
a46 1
options 	GEOM_GPT		# GUID Partition Tables.
@


1.470
log
@Sync with i386 (remove the LINUX stuff) now that the module is usable.
@
text
@d198 1
@


1.469
log
@It's been possible to build linprocfs as a module for some time now.

Submitted by:	rdivacky
@
text
@a73 5
# Linux 32-bit ABI support
options 	COMPAT_LINUX32		# Compatible with i386 linux binaries 
options 	LINPROCFS
options		LINSYSFS

@


1.468
log
@Remove the KSE option now that it's in DEFAULTS on these arches/machines.

The 'nooption' kernel config entry has to be used to turn KSE off now.
This isn't my preferred way of dealing with this, but I'll defer to
scottl's experience with the io/mem kernel option change and the grief
experienced over that.

Submitted by:	scottl@@
@
text
@d76 1
a76 1
options 	LINPROCFS		# Cannot be a module yet.
@


1.467
log
@Make KSE a kernel option, turned on by default in all GENERIC
kernel configs except sun4v (which doesn't process signals properly
with KSE).

Reviewed by:	davidxu@@
@
text
@a60 1
options 	KSE			# KSE support
@


1.466
log
@- Remove SCHED_ULE from GENERIC to better avoid foot-shooting by
  unsuspecting users.
- Add a comment in NOTES about experimental status of SCHED_ULE.
- Make warning about experimental status in sched_ule(4) a bit
  stronger.

Suggested and reviewed by:	dougb
Discussed on:			developers
MFC after:			3 days
@
text
@d61 1
@


1.465
log
@Added COMPAT_FREEBSD6 option.
@
text
@a28 1
#options 	SCHED_ULE		# ULE scheduler
@


1.464
log
@Make the firmware assist driver resident in
preparation for isp using it.
@
text
@d52 1
@


1.463
log
@Temporarily remove SCHED_CORE, it seems I have so many works can do now,
one example is POSIX priority mutex for libthr.
@
text
@d254 1
@


1.462
log
@Backed out the change by request from rwatson.

PR:		kern/14584
@
text
@a30 1
#options 	SCHED_CORE		# CORE scheduler
@


1.461
log
@The common UID/GID space implementation. It has been discussed on -arch
in 1999, and there are changes to the sysctl names compared to PR,
according to that discussion. The description is in sys/conf/NOTES.
Lines in the GENERIC files are added in commented-out form.
I'll attach the test script I've used to PR.

PR:		kern/14584
Submitted by:	babkin
@
text
@a61 1
#options 	COMMONID		# Enable support for common UID/GID space
@


1.460
log
@Remove COMPAT_43 from GENERIC (and other kernel configs). For amd64 there's
an explicit comment that it's needed for the linuxolator. This is not the
case anymore. For all other architectures there was only a "KEEP THIS".
I'm (and other people too) running a COMPAT_43-less kernel since it's not
necessary anymore for the linuxolator. Roman is running such a kernel for a
for longer time. No problems so far. And I doubt other (newer than ia32
or alpha) architectures really depend on it.

This may result in a small performance increase for some workloads.

If the removal of COMPAT_43 results in a not working program, please
recompile it and all dependencies and try again before reporting a
problem.

The only place where COMPAT_43 is needed (as in: does not compile without
it) is in the (outdated/not usable since too old) svr4 code.

Note: this does not remove the COMPAT_43TTY option.

Nagging by:	rdivacky
@
text
@d62 1
@


1.459
log
@Add scheduler CORE, the work I have done half a year ago, recent,
I picked it up again. The scheduler is forked from ULE, but the
algorithm to detect an interactive process is almost completely
different with ULE, it comes from Linux paper "Understanding the
Linux 2.6.8.1 CPU Scheduler", although I still use same word
"score" as a priority boost in ULE scheduler.

Briefly, the scheduler has following characteristic:
1. Timesharing process's nice value is seriously respected,
   timeslice and interaction detecting algorithm are based
   on nice value.
2. per-cpu scheduling queue and load balancing.
3. O(1) scheduling.
4. Some cpu affinity code in wakeup path.
5. Support POSIX SCHED_FIFO and SCHED_RR.
Unlike scheduler 4BSD and ULE which using fuzzy RQ_PPQ, the scheduler
uses 256 priority queues. Unlike ULE which using pull and push, the
scheduelr uses pull method, the main reason is to let relative idle
cpu do the work, but current the whole scheduler is protected by the
big sched_lock, so the benefit is not visible, it really can be worse
than nothing because all other cpu are locked out when we are doing
balancing work, which the 4BSD scheduelr does not have this problem.
The scheduler does not support hyperthreading very well, in fact,
the scheduler does not make the difference between physical CPU and
logical CPU, this should be improved in feature. The scheduler has
priority inversion problem on MP machine, it is not good for
realtime scheduling, it can cause realtime process starving.
As a result, it seems the MySQL super-smack runs better on my
Pentium-D machine when using libthr, despite on UP or SMP kernel.
@
text
@a48 1
options 	COMPAT_43		# Needed by COMPAT_LINUX32
@


1.458
log
@Add le(4). I could actually only test it on alpha, i386 and sparc64 but
given that this includes the more problematic platforms I see no reason
why it shouldn't also work on amd64 and ia64.
@
text
@d31 1
@


1.457
log
@Kill more references to lnc(4).

Submitted by:	grep(1)
@
text
@d191 1
d206 1
a206 1
device		pcn		# AMD Am79C97x PCI 10/100
@


1.456
log
@Add in linsysfs.  A linux 2.6 like sys filesystem to pacify the Linux
LSI MegaRAID SAS utility.

Sponsored by:		IronPort Systems
Man page help from:	brueffer
@
text
@d205 1
a205 1
device		pcn		# AMD Am79C97x PCI 10/100(precedence over 'lnc')
a226 2
# XXX kvtop brokenness, pointer/int warnings
#device		lnc		# NE2100, NE32-VL Lance Ethernet cards
@


1.455
log
@add ath and wlan crypto support

MFC after:	1 month
@
text
@d78 1
@


1.454
log
@Enable the rr232x driver for amd64.
@
text
@d233 3
d237 3
@


1.453
log
@Move AHC_REG_PRETTY_PRINT and AHD_REG_PRETTY_PRINT below
their corresponding devices.
@
text
@d131 1
@


1.452
log
@Hook bce up to the build
@
text
@a59 4
options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~128k to driver.
options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~215k to driver.
d97 2
d100 2
@


1.451
log
@Add kbdmux(4) to GENERIC on amd64

Requested by:	scottl
Tested by:	scottl
@
text
@d195 1
@


1.450
log
@Hook the MFI driver up to the build.
@
text
@d151 2
@


1.449
log
@Move linux support to the linux section.
@
text
@d140 1
@


1.448
log
@Move the old BSD4.3 tty compatibility from (!BURN_BRIDGES && COMPAT_43)
to COMPAT_43TTY.

Add COMPAT_43TTY to NOTES and */conf/GENERIC

Compile tty_compat.c only under the new option.

Spit out
	#warning "Old BSD tty API used, please upgrade."
if ioctl_compat.h gets #included from userland.
@
text
@a52 1
options 	COMPAT_LINUX32		# Compatible with i386 linux binaries 
d80 1
@


1.447
log
@- Allow duplicate "machine" directives with the same arguments.
- Move existing "machine" directives to DEFAULTS.
@
text
@d49 1
@


1.446
log
@Add uart(4). When both sio(4) and uart(4) can handle a serial port,
sio(4) will claim it. This change therefore only affects how ports
are handled when they are not claimed by sio(4), and in principle
will improve hardware support.

MFC after: 2 months
@
text
@a20 1
machine		amd64
@


1.445
log
@Throw the switch and turn on STOP_NMI on in GENERIC for amd64 and i386.

Requested by:	kris
Ok'd by:	scottl
@
text
@d167 1
d179 1
a179 1
# line to enable it (connects to the sio and/or ppc drivers):
@


1.444
log
@MFi386: bring over DEFAULTS (repocopy) and adapt.  While there isn't a
4.x->6.x amd64 upgrade path, the config files are kept in approximate sync.
@
text
@d66 1
@


1.443
log
@Remove atpic as we've changed to using the lapic timer vs. using irq0
@
text
@d82 1
a82 1
# Bus support.  Do not remove isa, even if you have no isa slots
a83 1
device		isa
a232 2
device		mem		# Memory and kernel memory devices
device		io		# I/O device
@


1.442
log
@Hook up the hptmv driver for amd64.

MFC After: 3 days
@
text
@a78 3
# Workarounds for some known-to-be-broken chipsets (nVidia nForce3-Pro150)
device		atpic			# 8259A compatability

@


1.441
log
@Add back ed(4) in amd64 GENERIC.  It now works nicely and since those
chips are commonly found, it makes sense to have it in GENERIC.  This
is a candidate for a RELENG_6 MFC.

Approved by;	peter
Requested by:	pav
Tested by:	pav
@
text
@d133 1
@


1.440
log
@Add recently invented COMPAT_FREEBSD5 option.

MFC after:	3 days
@
text
@d218 1
a218 2
# XXX kvtop brokenness, pointer/int warnings
#device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
@


1.439
log
@Add new ral(4) and ural(4) drivers.

Approved by:	silby (mentor)
@
text
@d52 1
@


1.439.2.1
log
@MFC addition of the COMPAT_FREEBSD5 option.  Specific versions
being MFCed:

> Path                          Revision
> src/sys/alpha/conf/GENERIC    1.187
> src/sys/amd64/conf/GENERIC    1.440
> src/sys/i386/conf/GENERIC     1.430
> src/sys/ia64/conf/GENERIC     1.73
> src/sys/pc98/conf/GENERIC     1.270
> src/sys/powerpc/conf/GENERIC  1.49
> src/sys/sparc64/conf/GENERIC  1.97

Approved by:    re (scottl)
@
text
@a51 1
options		COMPAT_FREEBSD5		# Compatible with FreeBSD5
@


1.439.2.2
log
@MFC r1.441:
  date: 2005/07/24 17:55:57;  author: mux;  state: Exp;  lines: +1 -2
  Add back ed(4) in amd64 GENERIC.  It now works nicely and since those
  chips are commonly found, it makes sense to have it in GENERIC.  This
  is a candidate for a RELENG_6 MFC.

  Approved by;    peter
  Requested by:   pav
  Tested by:      pav

Approved by:	re@@ (kensmith)
@
text
@d218 2
a219 1
device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
@


1.439.2.3
log
@Now that our showstopper list has shrunk, take another step closer to the
release and turn off kernel debugging.  Also turn off SMP on i386 and amd64
and add an SMP kernel config.

Approved by: re (implicit)
@
text
@d67 12
@


1.439.2.4
log
@Fix a whitespace screw-up I made when doing the MFC of COMPAT_FREEBSD5.
It's supposed to be "option", "space", "tab"; not "option", "tab", "tab".

Approved by:	re (scottl)
Pointed out by:	rwatson
Pointy hat:	kensmith
@
text
@d52 1
a52 1
options 	COMPAT_FREEBSD5		# Compatible with FreeBSD5
@


1.439.2.5
log
@MFC Import of the new version of the HPTMV driver from Highpoint.
The major change here is the support for amd64, as well as possible
support for PAE.  Many thanks to Highpoint for continuing to support
FreeBSD.

Obtained from:  Steve Chang @@ Highpoint

Merged revisions:

| 1.3      dev/hptmv/access601.h
| 1.1      dev/hptmv/amd64-elf.raid.o.uu
| 1.3      dev/hptmv/array.h
| 1.3      dev/hptmv/atapi.h
| 1.3      dev/hptmv/command.h
| 1.9+1.10 dev/hptmv/entry.c
| 1.4      dev/hptmv/global.h
| 1.5      dev/hptmv/gui_lib.c
| 1.3      dev/hptmv/hptintf.h
| 1.6      dev/hptmv/hptproc.c
| 1.5      dev/hptmv/i386-elf.raid.o.uu
| 1.5      dev/hptmv/ioctl.c
| 1.3      dev/hptmv/mv.c
| 1.4      dev/hptmv/mvOs.h
| 1.3      dev/hptmv/mvSata.h
| 1.4      dev/hptmv/mvStorageDev.h
| 1.5      dev/hptmv/osbsd.h
| 1.3      dev/hptmv/raid5n.h
| 1.3      dev/hptmv/readme.txt
| 1.3      dev/hptmv/vdevice.h
| 1.4      modules/hptmv/Makefile

Approved by:	re (scottl)
@
text
@a120 1
device		hptmv		# Highpoint RocketRAID 182x
@


1.439.2.6
log
@Forced commit to note that the previous commit was to:

MFC: Hook up the hptmv driver for amd64.

| Revision  Changes    Path
| 1.442     +1 -0      src/sys/amd64/conf/GENERIC
| 1.42      +1 -1      src/sys/amd64/conf/NOTES
| 1.76      +10 -0     src/sys/conf/files.amd64
| 1.454     +1 -0      src/sys/modules/Makefile

Approved by:    re (scottl, implicitly)
@
text
@@


1.439.2.6.2.1
log
@MF6: Add DEFAULTS files for amd64, i386, and pc98.

Approved by:	re (scottl)
@
text
@d73 1
a73 1
# Bus support.
d75 1
d225 2
@


1.439.2.7
log
@MFC: Add DEFAULTS files for amd64, i386, and pc98.

Approved by:	re (scottl)
@
text
@d73 1
a73 1
# Bus support.
d75 1
d225 2
@


1.439.2.8
log
@Hook the MFI driver up to the kernel build.

Approved by: re
@
text
@a129 1
device		mfi		# LSI MegaRAID SAS
@


1.439.2.9
log
@MFC:

Add kbdmux(4) to GENERIC on i386 and amd64.

Remove the USB keyboard hack now that KBDMUX is enabled by default.
Allow it to be disabled if Safe Mode is selected.

Requested by:	scottl
Approved by:	re (scottl)
@
text
@a140 2
device		kbdmux		# keyboard multiplexer

@


1.439.2.9.2.1
log
@MFC: add bce

Approved by:	re
@
text
@a183 1
device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
@


1.439.2.9.2.2
log
@MFC The rr232x driver.

Approved by: re.
@
text
@a120 1
device		rr232x		# Highpoint RocketRAID 232x
@


1.439.2.10
log
@MFC: Add bce

Approved by:	re
@
text
@a183 1
device		bce		# Broadcom BCM5706/BCM5708 Gigabit Ethernet
@


1.439.2.11
log
@Hook up the rr232x driver.

Approved by: re
@
text
@a120 1
device		rr232x		# Highpoint RocketRAID 232x
@


1.439.2.12
log
@MFC: add ath and related modules
@
text
@a221 3
device		wlan_wep	# 802.11 WEP support
device		wlan_ccmp	# 802.11 CCMP support
device		wlan_tkip	# 802.11 TKIP support
a222 3
device		ath		# Atheros pci/cardbus NIC's
device		ath_hal		# Atheros HAL (Hardware Access Layer)
device		ath_rate_sample	# SampleRate tx rate control for ath
@


1.439.2.13
log
@MFC: Move AH[CD]_REG_PRETTY_PRINT options to where they belongs.
@
text
@d61 4
a90 2
options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~128k to driver.
a91 2
options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~215k to driver.
@


1.439.2.14
log
@MFC:
- Remove SCHED_ULE from GENERIC to better avoid foot-shooting by
  unsuspecting users.
- Add a comment in NOTES about experimental status of SCHED_ULE.
- Make warning about experimental status in sched_ule(4) a bit
  stronger.

This is not an exact MFC since we don't have alpha in -CURRENT.

Approved by:	re (kensmith)
@
text
@d30 1
@


1.439.2.15
log
@MFC: 1.457, 1.458

- Kill more references to lnc(4).
- Add le(4).

Tested by:	Gheorghe Ardelean
@
text
@a177 1
device		le		# AMD Am7900 LANCE and Am79C9xx PCnet
d192 1
a192 1
device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'le')
d214 2
@


1.439.2.16
log
@Turn on SMP in the default kernel.
Most FreeBSD/amd64 machines are either multi-socket and/or multi-core.
@
text
@a64 3
# Make an SMP-capable kernel by default
options 	SMP			# Symmetric MultiProcessor Kernel

@


1.439.2.17
log
@Back out rev 1.439.2.16 - it is on purpose that GENERIC doesn't support SMP
in 6.x vs 7-CURRENT (which has been SMP since Nov. 2003).
@
text
@d65 3
@


1.439.2.18
log
@MFC msk(4) to RELENG_6
  Add msk(4) to the list of drivers supported by GENERIC kernel.
@
text
@a190 1
device		msk		# Marvell/SysKonnect Yukon II Gigabit Ethernet
@


1.439.2.18.2.1
log
@Add the hptrr driver.

Submitted by: Highpoint
Approved by: re
@
text
@a119 1
device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
@


1.439.2.19
log
@Add the hptrr driver.

Submitted by: Highpoint
Approved by: re
@
text
@a119 1
device		hptrr		# Highpoint RocketRAID 17xx, 22xx, 23xx, 25xx
@


1.439.2.20
log
@MFC: kernel-mode NFS lock manager.
@
text
@a40 1
options 	NFSLOCKD		# Network Lock Manager
@


1.439.2.21
log
@SVN rev 180866 on 2008-07-28 02:20:29Z by yongari

MFC r179347.
  Add jme(4) to the list of drivers supported by GENERIC kernel.
@
text
@a191 1
device		jme		# JMicron JMC250 Gigabit/JMC260 Fast Ethernet
@


1.439.2.22
log
@SVN rev 187435 on 2009-01-19 15:38:26Z by sobomax

MFC: take NTFS out to match i386 GENERIC.
@
text
@d43 1
@


1.439.2.23
log
@SVN rev 187441 on 2009-01-19 17:17:32Z by sobomax

Put NTFS back, it's probably not worth to touch 6-STABLE now when it's in
the maintenance mode and AFAIK no more releases are planned from this
branch.
@
text
@a42 1
options 	NTFS			# NT File System
@


1.439.2.24
log
@Switch importer
@
text
@d19 1
a19 1
# $FreeBSD: stable/6/sys/amd64/conf/GENERIC 187441 2009-01-19 17:17:32Z sobomax $
@


1.439.2.21.2.1
log
@SVN rev 183531 on 2008-10-02 02:57:24Z by kensmith

Create releng/6.4 from stable/6 in preparation for 6.4-RC1.

Approved by:	re (implicit)
@
text
@@


1.438
log
@MFi386: remove NO_MIXED_MODE
@
text
@d231 1
d265 1
@


1.437
log
@Follow i386's suit and include AGP support in the generic kernel.
@
text
@a79 1
options 	NO_MIXED_MODE		# Don't penalize working chipsets
@


1.436
log
@MFR5: rev 1.421.2.6: Enable support for 32-bit Linux binaries by default.
There are too many questions in freebsd-amd64@@ about how to enable Linux
support that it seems a required piece of functionality.  Thus we should
just have it on by default.
@
text
@d159 2
@


1.435
log
@Glue the arcmsr driver into the tree.
@
text
@d49 1
d52 1
d82 3
@


1.434
log
@Add USB Communication Device Class Ethernet driver. Originally written for
FreeBSD based on aue(4) it was picked by OpenBSD, then from OpenBSD ported
to NetBSD and finally NetBSD version merged with original one goes into
FreeBSD.

Obtained from:  http://www.gank.org/freebsd/cdce/
                NetBSD
                OpenBSD
@
text
@d125 1
@


1.433
log
@Add a comment to note that pseudo-device bpf is required for DHCP.
This is mentioned in the Handbook but it is not as obvious to new
users why bpf is needed compared to the other largely self-explanatory
items in GENERIC.

PR:		conf/40855
MFC after:	1 week
@
text
@d262 1
@


1.432
log
@Make it clear nve needs mii, and shorten long comment line.
@
text
@d242 1
@


1.431
log
@Enable ehci by default on i386 and amd64. It had got to the stage
where having this disabled was actually hurting us, since so many
BIOSes include legacy USB emulation that takes control of all usb
ports and only the ehci driver knows how to disable it.
@
text
@a178 1
device		nve		# nVidia nForce MCP on-board Ethernet Networking
d191 2
a192 1
device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'lnc')
@


1.430
log
@FreeBSD consumer bits of the nForce MCP NIC binary blob.

Demanded by:	DES
Encouraged by:	scottl
Obtained from:	q@@onthenet.com.au (partially)
KNF'ed by:	obrien
@
text
@d247 1
@


1.429
log
@MFi386: Sync whitespace and an abbreviation
@
text
@d179 1
@


1.428
log
@o Use tab instead of spaces for puc(4) line.
o Use capitalized "Ethernet" for consistency.
@
text
@d74 1
a74 1
options 	SMP		# Symmetric MultiProcessor Kernel
d77 2
a78 2
device		atpic		# 8259A compatability
options 	NO_MIXED_MODE	# Don't penalize working chipsets
d256 1
a256 1
# USB Ethernet, requires mii
@


1.427
log
@Minor sync to i386 GENERIC in the form of comments and whitespace.
@
text
@d173 1
a173 1
#device         puc
d189 2
a190 2
device		lge		# Level 1 LXT1001 gigabit ethernet
device		nge		# NatSemi DP83820 gigabit ethernet
d201 1
a201 1
device		vge		# VIA VT612x gigabit ethernet
@


1.426
log
@Reduce annoying SCSI probing delay from 15 to 5 seconds in all GENRIC kernels.

Discussed on:	-current
@
text
@d56 1
a56 1
options 	_KPOSIX_PRIORITY_SCHEDULING # Posix P1003_1B real-time extensions
d75 1
d102 1
a102 1
#device		ispfw		# Firmware for QLogic HBAs- normally a module
@


1.425
log
@MFi386: add ispfw (except using correct device<tab><tab>ispfw format,
<space><tab> is for the options line)
@
text
@d51 1
a51 1
options 	SCSI_DELAY=15000	# Delay (in ms) before probing SCSI
@


1.424
log
@Add device driver support for the VIA Networking Technologies
VT6122 gigabit ethernet chip and integrated 10/100/1000 copper PHY.
The vge driver has been added to GENERIC for i386, pc98 and amd64,
but not to sparc or ia64 since I don't have the ability to test
it there. The vge(4) driver supports VLANs, checksum offload and
jumbo frames.

Also added the lge(4) and nge(4) drivers to GENERIC for i386 and
pc98 since I was in the neighborhood. There's no reason to leave them
out anymore.
@
text
@d101 1
@


1.423
log
@Switch the default scheduler to 4BSD to match what will go into RELENG_5 soon.
It can be switched back once 5.3 is tested and released.  Also turn on
PREEMPTION as many of the stability problems with it have been fixed.

MT5: 3 days.
@
text
@d187 2
d199 1
@


1.422
log
@Always compile PFIL_HOOKS into the kernel and remove the associated kernel
compile option.  All FreeBSD packet filters now use the PFIL_HOOKS API and
thus it becomes a standard part of the network stack.

If no hooks are connected the entire packet filter hooks section and related
activities are jumped over.  This removes any performance impact if no hooks
are active.

Both OpenBSD and DragonFlyBSD have integrated PFIL_HOOKS permanently as well.
@
text
@d30 3
a32 1
options 	SCHED_ULE		# ULE scheduler
@


1.421
log
@Sync with i386 - add ADAPTIVE_GIANT, remove pcic
@
text
@a59 1
options 	PFIL_HOOKS		# pfil(9) framework
@


1.421.2.1
log
@Remove the kernel debugging options from GENERIC.

Approved by: re
@
text
@d28 2
d62 9
@


1.421.2.2
log
@Switch to the 4BSD scheduler for RELENG_5

Approved by: re
@
text
@d28 1
a28 1
options 	SCHED_4BSD		# 4BSD scheduler
@


1.421.2.3
log
@Merge the vge(4) driver from the HEAD. Also add nge(4) and lge(4) to
GENERIC for x86.

Approved by:	re (scottl)
@
text
@a184 1
device		vge		# VIA VT612x gigabit ethernet
@


1.421.2.4
log
@MFC: Make PFIL_HOOKS a permanent part of the kernel and remove the associated
kernel compile option.

Approved by:	re (scottl)
@
text
@d58 1
@


1.421.2.4.2.1
log
@MFR5 shifting GENERIC back to UP instead of MP which should be a little
     safer for installs and gives the majority of users the correct (faster)
     kernel.

Revs MFR5'd:

> Revision   Changes    Path
> 1.421.2.5  +0 -2      src/sys/amd64/conf/GENERIC
> 1.1.2.1    +9 -0      src/sys/amd64/conf/SMP (new)
> 1.413.2.7  +0 -2      src/sys/i386/conf/GENERIC
> 1.5.2.1    +9 -0      src/sys/i386/conf/SMP (new)

Discussed by:	re@@
Approved by:	re (scottl)
@
text
@d60 2
@


1.421.2.5
log
@To be safe for installs as well as providing the faster kernel for the
majority of users shift GENERIC back to UP instead of SMP.  Provide
a config file people with MP boxes can use.

Discussed by:	re@@
Approved by:	re (scottl)
@
text
@d60 2
@


1.421.2.6
log
@Enable support for 32-bit Linux binaries in 5.4-RELEASE by default.
@
text
@a44 1
options 	COMPAT_43		# Needed by COMPAT_LINUX32
a46 1
options 	COMPAT_LINUX32		# Compatible with i386 linux binaries 
a63 3
# Linux 32-bit ABI support
options 	LINPROCFS		# Cannot be a module yet.

@


1.421.2.7
log
@Sync formatting with 6-CURRENT.
Add lge(4), and nge(4), and commented out ispfw.
@
text
@d54 1
a54 1
options 	_KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
a90 1
#device 	ispfw		# Firmware for QLogic HBAs- normally a module
d161 1
a161 1
#device		puc
a176 2
device		lge		# Level 1 LXT1001 gigabit Ethernet
device		nge		# NatSemi DP83820 gigabit Ethernet
d187 1
a187 1
device		vge		# VIA VT612x gigabit Ethernet
@


1.421.2.8
log
@MFC: Comments to note bpf is required for DHCP.

Approved by:	re (kensmith)
@
text
@a229 1
# Note that 'bpf' is required for DHCP.
@


1.421.2.9
log
@Add a commented-out ehci entry.

Approved by:	re (kensmith)
@
text
@a235 1
#device		ehci		# EHCI PCI->USB interface (USB 2.0)
@


1.421.2.10
log
@MFC:

o Add new cdce(4) driver;

o move some common code out of every USB etherned driver into a central
  location.

Approved by:	re (scottl)
@
text
@a249 1
device		cdce		# Generic USB over Ethernet
@


1.421.2.11
log
@MFC: Glue the arcmsr driver into the tree.

Approved by: re
@
text
@a113 1
device		arcmsr		# Areca SATA II RAID
@


1.421.2.11.2.1
log
@MFR5: revision 1.421.2.12
> date: 2005/04/09 17:00:17;  author: kensmith;  state: Exp;  lines: +4 -1
> Disable the NO_MIXED_MODE option by default but leave it as a commented
> entry to make it easy to find.  It causes some popular motherboards to
> fail and the magic required to make them work isn't widely known.
>
> Requested by:   des and others whose email address I've lost
> Discussed with: peter, obrien, re@@
> Tested by:      various folks on amd64@@, des, kensmith

Approved by:	re (scottl)
@
text
@d64 1
a64 4

# Enabling NO_MIXED_MODE gives a performance improvement on some motherboards
# but does not work with some boards (mostly nVidia chipset based).
#options 	NO_MIXED_MODE	# Don't penalize working chipsets
@


1.421.2.12
log
@Disable the NO_MIXED_MODE option by default but leave it as a commented
entry to make it easy to find.  It causes some popular motherboards to
fail and the magic required to make them work isn't widely known.

Requested by:	des and others whose email address I've lost
Discussed with:	peter, obrien, re@@
Tested by:	various folks on amd64@@, des, kensmith
MTR5_4:		Soon
@
text
@d64 1
a64 4

# Enabling NO_MIXED_MODE gives a performance improvement on some motherboards
# but does not work with some boards (mostly nVidia chipset based).
#options 	NO_MIXED_MODE	# Don't penalize working chipsets
@


1.421.2.13
log
@MFC: Add the agp driver to GENERIC.
@
text
@a145 2
device		agp		# support several AGP chipsets

@


1.420
log
@Complete 'IA32' -> 'COMPAT_IA32' change for the Linuxulator32.
@
text
@d61 1
a152 1
#device		pcic		# ExCA ISA and PCI bridges
@


1.419
log
@Making a loadable null.ko for /dev/(null|zero) proved rather
unpopular, so remove this (mis)feature.

Encouragement provided by:	jhb (and others)
@
text
@d47 1
a47 1
options 	IA32			# Compatible with i386 binaries
@


1.418
log
@Add the I/O device for those architectures that have it.
@
text
@a222 1
device		null		# Null and zero devices
@


1.417
log
@Break out the MI part of the /dev/[k]mem and /dev/io drivers into
their own directory and module, leaving the MD parts in the MD
area (the MD parts _are_ part of the modules). /dev/mem and /dev/io
are now loadable modules, thus taking us one step further towards
a kernel created entirely out of modules. Of course, there is nothing
preventing the kernel from having these statically compiled.
@
text
@d222 1
@


1.416
log
@Remove ahb, aha, ie, le and wl devices.  They are all ISA/EISA only.
I went ahead and left in the ISA cards that also have pccard
attachments.  There's no way that these devices could attach.

OK'd by: peter
@
text
@d220 3
a223 1
device		loop		# Network loopback
@


1.415
log
@Enable ADAPTIVE_MUTEXES by default by changing the sense of the option to
NO_ADAPTIVE_MUTEXES.  This option has been enabled by default on amd64 for
quite some time, and has been extensively tested on i386 and sparc64.  It
shows measurable performance gains in many circumstances, and few negative
effects.  It would be nice in t he future if adaptive mutexes actually went
to sleep after a certain amount of spinning, but that will require quite a
bit more testing.
@
text
@a94 1
device		ahb		# EISA AHA1742 family
a105 1
device		aha		# Adaptec 154x SCSI adapters
a207 2
# XXX kvtop brokenness
#device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
a212 3
# ISA devices that use the old ISA shims
#device		le

a217 1
#device		wl		# Older non 802.11 Wavelan wireless NIC.
@


1.414
log
@In -CURRENT pseudo devices are not statically assigned at compile time,
remove a stale comment.

PR:		kern/62285
@
text
@a30 1
options 	ADAPTIVE_MUTEXES	# mutexes first spin lock, then sleep
@


1.413
log
@Fix the build.  pcm is no more.
@
text
@d228 1
a228 1
# Pseudo devices - the number indicates how many units to allocate.
@


1.412
log
@Add options KDB and GDB. KDB takes on the function of what DDB used
to be. Both DDB and GDB specify which KDB backends to include.
@
text
@a82 4

# Sound (no modules)
device		pcm

@


1.411
log
@The majority of FreeBSD/amd64 machines are SMP, so use ADAPTIVE_MUTEXES
by default to improve performance.
@
text
@d64 3
a66 1
options 	DDB			# Enable the kernel debugger
@


1.410
log
@MFi386: add ixgp device
@
text
@d31 1
@


1.409
log
@Turn on modules for amd64.  Fear.
@
text
@d179 1
@


1.408
log
@MFi386: add rue and twa
@
text
@a28 1
makeoptions	NO_MODULES=not_yet
@


1.407
log
@Add option GEOM_GPT. This brings the ability to have a large number of
partitions on a single disk.
@
text
@d76 1
d131 1
d263 1
@


1.406
log
@Spell Ethernet correctly.
@
text
@d47 1
@


1.405
log
@Add NTFS since many may want to dual-boot MS-Win64 w/FreeBSD.
@
text
@d183 1
a183 1
device		bfe		# Broadcom BCM440x 10/100 ethernet
d192 1
a192 1
device		sk		# SysKonnect SK-984x & SK-982x gigabit ethernet
d194 1
a194 1
device		ti		# Alteon Networks Tigon I/II gigabit ethernet
d213 2
a214 2
device		sn		# SMC's 9000 series of ethernet chips
device		xe		# Xircom pccard ethernet
d256 4
a259 4
device		aue		# ADMtek USB ethernet
device		axe		# ASIX Electronics USB ethernet
device		cue		# CATC USB ethernet
device		kue		# Kawasaki LSI USB ethernet
@


1.404
log
@Shorten a long comment.
@
text
@d42 1
@


1.403
log
@Remove a device that will compile fine, isn't 64-bit clean.
@
text
@d191 1
a191 1
device		sk		# SysKonnect SK-984x and SK-982x gigabit ethernet
@


1.402
log
@GRR. MFi386: white space spam
@
text
@a122 1
device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
@


1.401
log
@ - Recruit some new ULE users by making it the default scheduler in GENERIC.
   ULE will be in a probationary period to determine whether it will be left
   as the default in 5.3 which would likely mean the rest of the 5.x series.
@
text
@d15 2
a16 2
# device lines is also present in the ../../conf/NOTES and NOTES files. 
# If you are in doubt as to the purpose or necessity of a line, check first 
d25 2
a26 2
#To statically compile in device wiring instead of /boot/device.hints
#hints		"GENERIC.hints"		#Default places to look for devices.
d28 1
a28 1
makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
d31 23
a53 23
options 	SCHED_ULE		#ULE scheduler
options 	INET			#InterNETworking
options 	INET6			#IPv6 communications protocols
options 	FFS			#Berkeley Fast Filesystem
options 	SOFTUPDATES		#Enable FFS soft updates support
options 	UFS_ACL			#Support for access control lists
options 	UFS_DIRHASH		#Improve performance on big directories
options 	MD_ROOT			#MD is a potential root device
options 	NFSCLIENT		#Network Filesystem Client
options 	NFSSERVER		#Network Filesystem Server
options 	NFS_ROOT		#NFS usable as /, requires NFSCLIENT
options 	MSDOSFS			#MSDOS Filesystem
options 	CD9660			#ISO 9660 Filesystem
options 	PROCFS			#Process filesystem (requires PSEUDOFS)
options 	PSEUDOFS		#Pseudo-filesystem framework
options 	IA32			#Compatible with i386 binaries
options 	COMPAT_FREEBSD4		#Compatible with FreeBSD4
options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
options 	KTRACE			#ktrace(1) support
options 	SYSVSHM			#SYSV-style shared memory
options 	SYSVMSG			#SYSV-style message queues
options 	SYSVSEM			#SYSV-style semaphores
options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
d62 5
a66 5
options 	DDB			#Enable the kernel debugger
options 	INVARIANTS		#Enable calls of extra sanity checking
options 	INVARIANT_SUPPORT	#Extra sanity checks of internal structures, required by INVARIANTS
options 	WITNESS			#Enable checks to detect deadlocks and cycles
options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
d69 1
a69 1
options 	SMP			# Symmetric MultiProcessor Kernel
d71 2
a72 2
device		atpic			# 8259A compatability
options 	NO_MIXED_MODE		# Don't penalize working chipsets
d87 6
a92 6
device		atadisk			# ATA disk drives
device		ataraid			# ATA RAID drives
device		atapicd			# ATAPI CDROM drives
device		atapifd			# ATAPI floppy drives
device		atapist			# ATAPI tape drives
options 	ATA_STATIC_ID		#Static device numbering
d152 5
a156 5
# Pcmcia and cardbus bridge support
device		cbb			# cardbus (yenta) bridge
#device		pcic			# ExCA ISA and PCI bridges
device		pccard			# PC Card (16-bit) bus
device		cardbus			# CardBus (32-bit) bus
d201 1
a201 1
# ISA Ethernet NICs.  pccard nics included.
d221 1
a221 1
device		an		# Aironet 4500/4800 802.11 wireless NICs. 
@


1.400
log
@Add PFIL_HOOKS to the GENERIC kernel configuration, primarily so
that one can load the IPFilter module (which requires PFIL_HOOKS).

Requested by:	Many, for over a year
@
text
@d31 1
a31 1
options 	SCHED_4BSD		#4BSD scheduler
@


1.399
log
@Turn on NO_MIXED_MODE for amd64 generic.  It turns out that all the
known samples of broken chipsets that needed mixed mode in the first place
are so broken (ie: locks up) that we can't use IO APIC mode at all and it
needs to be turned off in the bios.  So, the MIXED_MODE penalty on the
good chipsets gained nothing.

Approved by:  re (scottl)
@
text
@d59 1
@


1.399.2.1
log
@Disable WITNESS, INVARIANTS, and DDB for our Tier-1 platforms for the release
@
text
@d61 2
a62 2
#options 	DDB			#Enable the kernel debugger
#options 	INVARIANTS		#Enable calls of extra sanity checking
d64 2
a65 2
#options 	WITNESS			#Enable checks to detect deadlocks and cycles
#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
@


1.399.2.2
log
@Don't build a kernel.debug for the release.
@
text
@d28 1
a28 1
#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
@


1.399.2.3
log
@MFC: Add PFIL_HOOKS to the GENERIC kernel configuration.

Requested by:	re
@
text
@a58 1
options 	PFIL_HOOKS		# pfil(9) framework
@


1.398
log
@Sync with i386.
- turn on SMP in generic
- add 'device atpic' - this is unconditional on i386, but certain nvidia
  based systems need to disable acpi because the reference bios seems to be
  hosed.  If acpi is disabled, we won't find the apic.  amd64 has the
  mptable code in a seperate compile option as well.
- turn sym back on, it doesn't fail to compile anymore.

Approved by: re
@
text
@d71 1
@


1.397
log
@Converge with i386/GENERIC
@
text
@d28 1
a28 1
#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
d67 5
d100 1
a100 2
#XXX #error unknown architecture
#device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
@


1.396
log
@Mention the puc(4) glue driver in a commented-out example so the user
of "dumb" PCI-based serial/parallel boards get a hint how to enable
them.

I wasn't sure about the ia64, pc98, powerpc, and sparc64 archs whether
they'd support puc(4) or not.
@
text
@d67 1
a69 2
device		acpi
options 	ACPI_DEBUG
d72 3
a104 6
# RAID controllers interfaced to the SCSI subsystem
device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
device		ciss		# Compaq Smart RAID 5*
device		dpt		# DPT Smartcache III, IV - See NOTES for options!
device		iir		# Intel Integrated RAID
device		mly		# Mylex AcceleRAID/eXtremeRAID
d107 1
a107 1
device		scbus		# SCSI bus (required)
d115 9
a124 1
#XXX pointer/int warnings
a126 1
device		amr		# AMI MegaRAID
a127 1
device		ips		# IBM (Adaptec) ServeRAID
d177 1
a258 2

device		pcm		# Sound
@


1.395
log
@Statically compile in sound as we don't have modules yet.
@
text
@d161 4
@


1.394
log
@Sort 'bge' correctly.
@
text
@d252 2
@


1.393
log
@Turn aac back on now that its been cleaned up for 64 bit compilation
@
text
@d171 1
a186 1
device		bge		# Broadcom BCM570xx Gigabit Ethernet
@


1.392
log
@Take the support for the 8139C+/8169/8169S/8110S chips out of the
rl(4) driver and put it in a new re(4) driver. The re(4) driver shares
the if_rlreg.h file with rl(4) but is a separate module. (Ultimately
I may change this. For now, it's convenient.)

rl(4) has been modified so that it will never attach to an 8139C+
chip, leaving it to re(4) instead. Only re(4) has the PCI IDs to
match the 8169/8169S/8110S gigE chips. if_re.c contains the same
basic code that was originally bolted onto if_rl.c, with the
following updates:

- Added support for jumbo frames. Currently, there seems to be
  a limit of approximately 6200 bytes for jumbo frames on transmit.
  (This was determined via experimentation.) The 8169S/8110S chips
  apparently are limited to 7.5K frames on transmit. This may require
  some more work, though the framework to handle jumbo frames on RX
  is in place: the re_rxeof() routine will gather up frames than span
  multiple 2K clusters into a single mbuf list.

- Fixed bug in re_txeof(): if we reap some of the TX buffers,
  but there are still some pending, re-arm the timer before exiting
  re_txeof() so that another timeout interrupt will be generated, just
  in case re_start() doesn't do it for us.

- Handle the 'link state changed' interrupt

- Fix a detach bug. If re(4) is loaded as a module, and you do
  tcpdump -i re0, then you do 'kldunload if_re,' the system will
  panic after a few seconds. This happens because ether_ifdetach()
  ends up calling the BPF detach code, which notices the interface
  is in promiscuous mode and tries to switch promisc mode off while
  detaching the BPF listner. This ultimately results in a call
  to re_ioctl() (due to SIOCSIFFLAGS), which in turn calls re_init()
  to handle the IFF_PROMISC flag change. Unfortunately, calling re_init()
  here turns the chip back on and restarts the 1-second timeout loop
  that drives re_tick(). By the time the timeout fires, if_re.ko
  has been unloaded, which results in a call to invalid code and
  blows up the system.

  To fix this, I cleared the IFF_UP flag before calling ether_ifdetach(),
  which stops the ioctl routine from trying to reset the chip.

- Modified comments in re_rxeof() relating to the difference in
  RX descriptor status bit layout between the 8139C+ and the gigE
  chips. The layout is different because the frame length field
  was expanded from 12 bits to 13, and they got rid of one of the
  status bits to make room.

- Add diagnostic code (re_diag()) to test for the case where a user
  has installed a broken 32-bit 8169 PCI NIC in a 64-bit slot. Some
  NICs have the REQ64# and ACK64# lines connected even though the
  board is 32-bit only (in this case, they should be pulled high).
  This fools the chip into doing 64-bit DMA transfers even though
  there is no 64-bit data path. To detect this, re_diag() puts the
  chip into digital loopback mode and sets the receiver to promiscuous
  mode, then initiates a single 64-byte packet transmission. The
  frame is echoed back to the host, and if the frame contents are
  intact, we know DMA is working correctly, otherwise we complain
  loudly on the console and abort the device attach. (At the moment,
  I don't know of any way to work around the problem other than
  physically modifying the board, so until/unless I can think of a
  software workaround, this will have do to.)

- Created re(4) man page

- Modified rlphy.c to allow re(4) to attach as well as rl(4).

Note that this code works for the sample 8169/Marvell 88E1000 NIC
that I have, but probably won't work for the 8169S/8110S chips.
RealTek has sent me some sample NICs, but they haven't arrived yet.
I will probably need to add an rlgphy driver to handle the on-board
PHY in the 8169S/8110S (it needs special DSP initialization).
@
text
@d121 2
a122 2
#device		aac		# Adaptec FSA RAID
#device		aacp		# SCSI passthrough for aac (requires CAM)
@


1.391
log
@MFi386: add device ataraid, this is now seperate and not pulled in by atadisk.
@
text
@d174 1
@


1.390
log
@Turn ips back on.
@
text
@d79 1
@


1.389
log
@Oops, I only added a comment about why ips doesn't compile.  Actually
comment it out for real.
@
text
@d124 1
a124 2
#XXX trivial pointer/int warnings
#device		ips		# IBM (Adaptec) ServeRAID
@


1.388
log
@Sync with i386 - add everything that compiles.  There are a few drivers
that are trivially easy to fix (eg: ips) that I've not committed fixes for.
@
text
@d125 1
a125 1
device		ips		# IBM (Adaptec) ServeRAID
@


1.387
log
@Sync with i386/GENERIC ordering.
@
text
@d1 1
a1 1
# ex:ts=8
d28 1
a28 1
#makeoptions	DEBUG=-g
d33 1
d36 2
d42 5
d48 2
a49 2
options 	IA32
options 	KTRACE
d53 6
a58 1

d61 1
a61 2
#options 	DDB
#options 	ALT_BREAK_TO_DEBUGGER
d64 2
a65 1
#options 	WITNESS
d70 5
a74 1
#options 	ACPI_DEBUG
d80 2
d84 47
d143 6
a148 1
#device		agp		# support several AGP chipsets
d154 13
a166 3
#device		ppc
#device		ppbus		# Parallel port bus (required)
#device		lpt		# Printer
d171 1
d173 11
d187 25
d216 4
d221 2
a222 1
device		pty		# Pseudo-ttys (telnet etc)
d229 22
a250 6
#device          uhci            # UHCI PCI->USB interface
#device          ohci            # OHCI PCI->USB interface
#device          usb             # USB Bus (required)
#device          ugen            # Generic
#device          uhid            # "Human Interface Devices"
#device          ukbd            # Keyboard
@


1.386
log
@Add acpi to the build.  Remove the hack from machdep.c that lies to the
loader to shut it up.
@
text
@a23 6
maxusers	0
options 	IA32
options 	COMPAT_FREEBSD4

makeoptions	NO_MODULES=not_yet
#makeoptions	DEBUG=-g
d28 3
d37 9
a45 2
options 	NFSSERVER
options 	NFS_ROOT		#NFS usable as root device, requires NFSCLIENT
d48 2
a51 2
#options 	DDB
#options 	ALT_BREAK_TO_DEBUGGER
a53 4
options 	SYSVMSG
options 	SYSVSEM
options 	SYSVSHM

d63 1
a63 2

options 	KTRACE
d99 5
a103 2
device		pty
device		bpf
@


1.385
log
@Add BASIC i386 binary support for the amd64 kernel.  This is largely
stolen from the ia64/ia32 code (indeed there was a repocopy), but I've
redone the MD parts and added and fixed a few essential syscalls.  It
is sufficient to run i386 binaries like /bin/ls, /usr/bin/id (dynamic)
and p4.  The ia64 code has not implemented signal delivery, so I had
to do that.

Before you say it, yes, this does need to go in a common place.  But
we're in a freeze at the moment and I didn't want to risk breaking ia64.
I will sort this out after the freeze so that the common code is in a
common place.

On the AMD64 side, this required adding segment selector context switch
support and some other support infrastructure.  The %fs/%gs etc code
is hairy because loading %gs will clobber the kernel's current MSR_GSBASE
setting.  The segment selectors are not used by the kernel, so they're only
changed at context switch time or when changing modes.  This still needs
to be optimized.

Approved by:	re (amd64/* blanket)
@
text
@d29 1
d46 3
d56 2
d64 1
a64 1
options	KTRACE
@


1.384
log
@Turn syscons on now that it works, so that anybody trying to run this
can see something.  Probing for keyboard still works for auto serial
console mode.
@
text
@d25 2
d45 4
@


1.383
log
@Commit MD parts of a loosely functional AMD64 port.  This is based on
a heavily stripped down FreeBSD/i386 (brutally stripped down actually) to
attempt to get a stable base to start from.  There is a lot missing still.
Worth noting:
- The kernel runs at 1GB in order to cheat with the pmap code.  pmap uses
  a variation of the PAE code in order to avoid having to worry about 4
  levels of page tables yet.
- It boots in 64 bit "long mode" with a tiny trampoline embedded in the
  i386 loader.  This simplifies locore.s greatly.
- There are still quite a few fragments of i386-specific code that have
  not been translated yet, and some that I cheated and wrote dumb C
  versions of (bcopy etc).
- It has both int 0x80 for syscalls (but using registers for argument
  passing, as is native on the amd64 ABI), and the 'syscall' instruction
  for syscalls.  int 0x80 preserves all registers, 'syscall' does not.
- I have tried to minimize looking at the NetBSD code, except in a couple
  of places (eg: to find which register they use to replace the trashed
  %rcx register in the syscall instruction).  As a result, there is not a
  lot of similarity.  I did look at NetBSD a few times while debugging to
  get some ideas about what I might have done wrong in my first attempt.
@
text
@d55 3
a57 3
#device		atkbdc		# AT keyboard controller
#device		atkbd		# AT keyboard
#device		psm		# PS/2 mouse
d59 1
a59 1
#device		vga		# VGA video card driver
d61 1
a61 1
#device		splash		# Splash screen and screen saver support
d64 1
a64 1
#device		sc
@


1.382
log
@Add FireWire drivers to GENERIC.
@
text
@d1 2
a2 2
#
# GENERIC -- Generic kernel configuration file for FreeBSD/i386
d21 2
a22 4
machine		i386
cpu		I486_CPU
cpu		I586_CPU
cpu		I686_CPU
d24 3
a30 2
makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols

a32 1
options 	INET6			#IPv6 communications protocols
a34 2
options 	UFS_ACL			#Support for access control lists
options 	UFS_DIRHASH		#Improve performance on big directories
d37 1
a37 1
options 	NFSSERVER		#Network Filesystem Server
a38 17
options 	MSDOSFS			#MSDOS Filesystem
options 	CD9660			#ISO 9660 Filesystem
options 	PROCFS			#Process filesystem (requires PSEUDOFS)
options 	PSEUDOFS		#Pseudo-filesystem framework
options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
options 	COMPAT_FREEBSD4		#Compatible with FreeBSD4
options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
options 	KTRACE			#ktrace(1) support
options 	SYSVSHM			#SYSV-style shared memory
options 	SYSVMSG			#SYSV-style message queues
options 	SYSVSEM			#SYSV-style semaphores
options 	_KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~128k to driver.
options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~215k to driver.
a40 1
options 	DDB			#Enable the kernel debugger
a42 6
options 	WITNESS			#Enable checks to detect deadlocks and cycles
options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed

# To make an SMP kernel, the next two are needed
#options 	SMP			# Symmetric MultiProcessor Kernel
#options 	APIC_IO			# Symmetric (APIC) I/O
a44 1
device		eisa
a46 3
# Floppy drives
device		fdc

d51 2
a52 49
device		atapifd			# ATAPI floppy drives
device		atapist			# ATAPI tape drives
options 	ATA_STATIC_ID		#Static device numbering

# SCSI Controllers
device		ahb		# EISA AHA1742 family
device		ahc		# AHA2940 and onboard AIC7xxx devices
device		ahd		# AHA39320/29320 and onboard AIC79xx devices
device		amd		# AMD 53C974 (Tekram DC-390(T))
device		isp		# Qlogic family
device		mpt		# LSI-Logic MPT-Fusion
#device		ncr		# NCR/Symbios Logic
device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')
device		trm		# Tekram DC395U/UW/F DC315U adapters

device		adv		# Advansys SCSI adapters
device		adw		# Advansys wide SCSI adapters
device		aha		# Adaptec 154x SCSI adapters
device		aic		# Adaptec 15[012]x SCSI adapters, AIC-6[23]60.
device		bt		# Buslogic/Mylex MultiMaster SCSI adapters

device		ncv		# NCR 53C500
device		nsp		# Workbit Ninja SCSI-3
device		stg		# TMC 18C30/18C50

# RAID controllers interfaced to the SCSI subsystem
device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
device		ciss		# Compaq Smart RAID 5*
device		dpt		# DPT Smartcache III, IV - See NOTES for options!
device		iir		# Intel Integrated RAID
device		mly		# Mylex AcceleRAID/eXtremeRAID

# SCSI peripherals
device		scbus		# SCSI bus (required)
device		ch		# SCSI media changers
device		da		# Direct Access (disks)
device		sa		# Sequential Access (tape etc)
device		cd		# CD
device		pass		# Passthrough device (direct SCSI access)
device		ses		# SCSI Environmental Services (and SAF-TE)

# RAID controllers
device		aac		# Adaptec FSA RAID
device		aacp		# SCSI passthrough for aac (requires CAM)
device		amr		# AMI MegaRAID
device		ida		# Compaq Smart RAID
device		mlx		# Mylex DAC960 family
device		pst		# Promise Supertrak SX6000
device		twe		# 3ware ATA RAID
d55 3
a57 3
device		atkbdc		# AT keyboard controller
device		atkbd		# AT keyboard
device		psm		# PS/2 mouse
d59 1
a59 1
device		vga		# VGA video card driver
d61 1
a61 1
device		splash		# Splash screen and screen saver support
d64 1
a64 1
device		sc
d66 1
a66 21
# Enable this for the pcvt (VT220 compatible) console driver
#device		vt
#options 	XSERVER			# support for X server on a vt console
#options 	FAT_CURSOR		# start with block cursor

device		agp		# support several AGP chipsets

# Floating point support - do not disable.
device		npx

# Power management support (see NOTES for more options)
#device		apm
# Add suspend/resume support for the i8254.
device		pmtimer

# PCCARD (PCMCIA) support
# Pcmcia and cardbus bridge support
device		cbb			# cardbus (yenta) bridge
#device		pcic			# ExCA ISA and PCI bridges
device		pccard			# PC Card (16-bit) bus
device		cardbus			# CardBus (32-bit) bus
d72 3
a74 13
device		ppc
device		ppbus		# Parallel port bus (required)
device		lpt		# Printer
device		plip		# TCP/IP over parallel
device		ppi		# Parallel port interface device
#device		vpo		# Requires scbus and da


# PCI Ethernet NICs.
device		de		# DEC/Intel DC21x4x (``Tulip'')
device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card
device		txp		# 3Com 3cR990 (``Typhoon'')
device		vx		# 3Com 3c590, 3c595 (``Vortex'')
a78 1
device		dc		# DEC/Intel 21143 and various workalikes
a79 9
device		pcn		# AMD Am79C97x PCI 10/100 (precedence over 'lnc')
device		rl		# RealTek 8129/8139
device		sf		# Adaptec AIC-6915 (``Starfire'')
device		sis		# Silicon Integrated Systems SiS 900/SiS 7016
device		ste		# Sundance ST201 (D-Link DFE-550TX)
device		tl		# Texas Instruments ThunderLAN
device		tx		# SMC EtherPower II (83c170 ``EPIC'')
device		vr		# VIA Rhine, Rhine II
device		wb		# Winbond W89C840F
a82 22
# ISA Ethernet NICs.  pccard nics included.
device		cs		# Crystal Semiconductor CS89x0 NIC
# 'device ed' requires 'device miibus'
device		ed		# NE[12]000, SMC Ultra, 3c503, DS8390 cards
device		ex		# Intel EtherExpress Pro/10 and Pro/10+
device		ep		# Etherlink III based cards
device		fe		# Fujitsu MB8696x based cards
device		ie		# EtherExpress 8/16, 3C507, StarLAN 10 etc.
device		lnc		# NE2100, NE32-VL Lance Ethernet cards
device		sn		# SMC's 9000 series of ethernet chips
device		xe		# Xircom pccard ethernet

# ISA devices that use the old ISA shims
#device		le

# Wireless NIC cards
device		wlan		# 802.11 support
device		an		# Aironet 4500/4800 802.11 wireless NICs. 
device		awi		# BayStack 660 and others
device		wi		# WaveLAN/Intersil/Symbol 802.11 wireless NICs.
#device		wl		# Older non 802.11 Wavelan wireless NIC.

a86 4
device		sl		# Kernel SLIP
device		ppp		# Kernel PPP
device		tun		# Packet tunnel.
device		pty		# Pseudo-ttys (telnet etc)
d88 2
a89 6
device		gif		# IPv6 and IPv4 tunneling
device		faith		# IPv6-to-IPv4 relaying (translation)

# The `bpf' device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
device		bpf		# Berkeley packet filter
d92 6
a97 22
device		uhci		# UHCI PCI->USB interface
device		ohci		# OHCI PCI->USB interface
device		usb		# USB Bus (required)
#device		udbp		# USB Double Bulk Pipe devices
device		ugen		# Generic
device		uhid		# "Human Interface Devices"
device		ukbd		# Keyboard
device		ulpt		# Printer
device		umass		# Disks/Mass storage - Requires scbus and da
device		ums		# Mouse
device		urio		# Diamond Rio 500 MP3 player
device		uscanner	# Scanners
# USB Ethernet, requires mii
device		aue		# ADMtek USB ethernet
device		axe		# ASIX Electronics USB ethernet
device		cue		# CATC USB ethernet
device		kue		# Kawasaki LSI USB ethernet

# FireWire support
device		firewire	# FireWire bus code
device		sbp		# SCSI over FireWire (Requires scbus and da)
device		fwe		# Ethernet over FireWire (non-standard!)
@


1.381
log
@Add device driver support for the ASIX Electronics AX88172 USB 2.0
ethernet controller. The driver has been tested with the LinkSys
USB200M adapter. I know for a fact that there are other devices out
there with this chip but don't have all the USB vendor/device IDs.

Note: I'm not sure if this will force the driver to end up in the
install kernel image or not. Special magic needs to be done to exclude
it to keep the boot floppies from bloating again, someone please
advise.
@
text
@d258 5
@


1.380
log
@- Move driver to newbus.
- Provide identify methods for EtherExpress and 3c507 cards; this
  means these cards no longer need wired configs.
- Provide a detach method.
@
text
@d255 1
@


1.379
log
@Nuke HTT from here too.

Spotted by:	jhb
@
text
@d209 1
@


1.378
log
@Add an options entry for HTT in SMP and GENERIC similar to the SMP and
APIC_IO options.

Requested by:	John Cagle <john.cagle@@hp.com>
@
text
@a71 3
# To support HyperThreading, HTT is needed in addition to SMP and APIC_IO
#options 	HTT			# HyperThreading Technology

@


1.377
log
@Remove bitrot associated with `maxusers'.

Submitted by:	bde
@
text
@d72 3
@


1.376
log
@Fix the style of the SCHED_4BSD commit.
@
text
@a25 1
maxusers	0
@


1.375
log
@Put replace spaces with tabs in keeping with the rest of the file.
@
text
@d33 1
a33 1
options		SCHED_4BSD		#4BSD scheduler
@


1.374
log
@ - Remove a redundant scheduler option.

Pointy hat to:	jeff
Spotted by:	dillon
@
text
@d33 1
a33 1
options         SCHED_4BSD              #4BSD scheduler
@


1.373
log
@ - Introduce the SCHED_ULE and SCHED_4BSD options for compile time selection
   of the scheduler.
 - Add SCHED_4BSD as the scheduler for all kernel config files in cvs.
@
text
@a67 1
options		SCHED_4BSD
@


1.372
log
@wi now needs wlan

Reviewed by:	imp
@
text
@d33 1
d68 1
@


1.371
log
@Add the if_bge driver.  I can't find any reason why it's not here, and it's
pretty common on Dell servers and other high-end boxes.
@
text
@d217 1
@


1.370
log
@Add the trm(4) driver.

MFC after:	1 day
@
text
@d200 1
@


1.369
log
@Permits UFS ACLs to be used with the GENERIC kernel.  Due to recent
ACL configuration changes, this shouldn't result in different code paths
for file systems not explicitly configured for ACLs by the system
administrator.  For UFS1, administrators must still recompile their
kernel to add support for extended attributes; for UFS2, it's sufficient
to enable ACLs using tunefs or at mount-time (tunefs preferred for
reliability reasons).  UFS2, for a variety of reasons, including
performance and reliability, is the preferred file system for use with
ACLs.

Approved by:	re
@
text
@d96 1
@


1.369.2.1
log
@Per the RC2 schedule, remove INVARIANTS, WITNESS, and DEBUG options from the
RELENG_5_0 kernels.
@
text
@d31 1
a31 1
#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
d62 2
a63 2
#options 	DDB			#Enable the kernel debugger
#options 	INVARIANTS		#Enable calls of extra sanity checking
d65 2
a66 2
#options 	WITNESS			#Enable checks to detect deadlocks and cycles
#options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
@


1.369.2.2
log
@MFC: add the if_bge driver

Approved by:	re (rwatson)
@
text
@a198 1
device		bge		# Broadcom BCM570xx Gigabit Ethernet
@


1.368
log
@Remove the P1003_1B kernel option; it is no longer used.
@
text
@d37 1
@


1.367
log
@Remove NO_GEOM option.  No outstanding show-stoppers.

Sponsored by:	DARPA & NAI Labs.
@
text
@d53 1
a53 2
options 	P1003_1B		#Posix P1003_1B real-time extensions
options 	_KPOSIX_PRIORITY_SCHEDULING
@


1.366
log
@NB: This commit does *NOT* make GEOM the default in FreeBSD
NB: But it will enable it in all kernels not having options "NO_GEOM"

Put the GEOM related options into the intended order.

Add "options NO_GEOM" to all kernel configs apart from NOTES.

In some order of controlled fashion, the NO_GEOM options will be
removed, architecture by architecture in the coming days.

There are currently three known issues which may force people to
need the NO_GEOM option:

boot0cfg/fdisk:
        Tries to update the MBR while it is being used to control
        slices.  GEOM does not allow this as a direct operation.

SCSI floppy drives:
        Appearantly the scsi-da driver return "EBUSY" if no media
        is inserted.  This is wrong, it should return ENXIO.

PC98:
        It is unclear if GEOM correctly recognizes all variants of
        PC98 disklabels.  (Help Wanted!  I have neither docs nor HW)

These issues are all being worked.

Sponsored by:	DARPA & NAI Labs.
@
text
@a32 2
options		NO_GEOM

@


1.365
log
@Add the pst (Promise SX6000) driver to GENERIC.
@
text
@d33 2
@


1.364
log
@Whitespace consistency fix from addition of IAHD_REG_PRETTY_PRINT: use
tabs not spaces.
@
text
@d129 1
@


1.363
log
@Use "options " rather than "options<tab>".
@
text
@d59 1
a59 1
                                        # output.  Adds ~215k to driver.
@


1.362
log
@Statically compile pcn(4) into the install kernel vs. using as module.
lnc(4) will attach to AMD PCnet/FAST NICs if pcn(4) does not attach.
I.e. pcn(4) gets first chance.  There is a problem however in that pcn(4)
was moved out of the install kernel so that the module would be used.
This however causes bad installs if one has an AMD PCnet/FAST NIC.
@
text
@d56 1
a56 1
options		AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
d58 1
a58 1
options		AHD_REG_PRETTY_PRINT	# Print register bitfields in debug
@


1.361
log
@Enable ahd/ahc register pretty printing by default.  This expedites
handling of bug reports.
@
text
@d188 1
a188 1
device		pcn		# AMD Am79C97x PCI 10/100 NICs
@


1.360
log
@remove unit counts from atkbdc, pckbd, sc
@
text
@d56 4
d90 1
a90 1
device		ahd		# AHA39320 and onboard AIC79xx devices
@


1.359
log
@pccbb->cbb
@
text
@d128 1
a128 1
device		atkbdc	1	# AT keyboard controller
d137 1
a137 1
device		sc	1
@


1.358
log
@Add support for the LSI-Logic Fusion/MP architecture.

This is an architecture that present a thing message passing interface
to the OS. You can query as to how many ports and what kind are attached
and enable them and so on.

A less grand view is that this is just another way to package SCSI (SPI or
FC) and FC-IP into a one-driver interface set.

This driver support the following hardware:

LSI FC909:	Single channel, 1Gbps, Fibre Channel (FC-SCSI only)
LSI FC929:	Dual Channel, 1-2Gbps, Fibre Channel (FC-SCSI only)
LSI 53c1020:	Single Channel, Ultra4 (320M) (Untested)
LSI 53c1030:	Dual Channel, Ultra4 (320M)

Currently it's in fair shape, but expect a lot of changes over the
next few weeks as it stabilizes.

Credits:

The driver is mostly from some folks from Jeff Roberson's company- I've
been slowly migrating it to broader support that I it came to me as.

The hardware used in developing support came from:

	FC909: LSI-Logic, Advansys (now Connetix)
	FC929: LSI-Logic
	53c1030: Antares Microsystems (they make a very fine board!)

MFC after:	3 weeks
@
text
@d156 1
a156 1
device		pccbb			# cardbus (yenta) bridge
@


1.357
log
@Make ppp(4) devices clonable and unloadable.
@
text
@d89 1
@


1.356
log
@Add Intersil and Symbol as vendors for 802.11 cards that the wi driver
supports.

Obtained from: NetBSD
@
text
@d219 1
a219 1
device		ppp	1	# Kernel PPP
@


1.355
log
@Add device agp to GENERIC, filter it out of floppy builds

Approved by:	des (mentor)
@
text
@d211 1
a211 1
device		wi		# WaveLAN/IEEE 802.11 wireless NICs. 
@


1.354
log
@Remove commented out PCI_ENABLE_IO_MODES.  It is gone now.
@
text
@d143 2
@


1.353
log
@Fix the link to the Handbook
@
text
@a70 1
#options 	PCI_ENABLE_IO_MODES	# Enable pci resources left off by a "lazy BIOS"
@


1.352
log
@de-count pci
@
text
@d7 1
a7 1
#    http://www.FreeBSD.org/handbook/kernelconfig-config.html
@


1.351
log
@Add explicit unit count on 'device pci' for ahc/ahd
@
text
@d70 1
a70 1
device		pci	1		# Unit count is for ahc/ahd
@


1.350
log
@Various comment and minor style fixes.  No actual content changes.

Inspired by:	bde
@
text
@d70 1
a70 1
device		pci
@


1.349
log
@Introduce syscall.master option 'COMPAT4' which allows one to wrap
syscalls for FreeBSD 4 compatibility.
Add kernel option COMPAT_FREEBSD4 to enable these syscalls.
@
text
@d15 3
a17 2
# device lines is also present in the NOTES configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in NOTES.
d128 3
a130 3
device		atkbdc	1	# At keyboard controller
device		atkbd		# at keyboard
device		psm		# psm mouse
d132 1
a132 1
device		vga		# VGA screen
d134 1
a134 2
# splash screen/screen saver
device		splash
@


1.348
log
@Comment out apm; ACPI is the modern replacement, and folks who really
need it can uncomment it. This may buy us some kernel space.

Discussed with:	imp & msmith (quite a while ago)
@
text
@d46 1
@


1.347
log
@Make NEWCARD the default pccard/cardbus system.
@
text
@d147 1
a147 1
device		apm
@


1.346
log
@Remove ALT_BREAK_TO_DEBUGGER.  This was inconsistent (both in form
and function) with existing configuration choices.  Arguably if
ALT_BREAK_TO_DEBUGGER was present, so should have been
BREAK_TO_DEBUGGER.  Regardless, it broke the option sort order in
these kernel configuration files.

Requested by:	bde
@
text
@d152 5
a156 2
device		card		# pccard bus
device		pcic		# PCMCIA bridge
@


1.345
log
@Hook up the ahd driver.
@
text
@a60 1
options 	ALT_BREAK_TO_DEBUGGER
@


1.344
log
@Do not refer to the Intel PRO/1000 by its internal name.

Requested by:	pdeuskar
@
text
@d86 1
@


1.343
log
@Restore us back to the rev 1.324 level of having an Intel gigE driver.
@
text
@d169 1
a169 1
device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
@


1.342
log
@Permit alternative break sequence to break to debugger in GENERIC.  Breakage
of serial break on -CURRENT seems rampant for some reason, and I like
being able to get into ddb.

Reviewed by:	peter
@
text
@d169 1
@


1.341
log
@Typo fix: detects -> detect.

Reviewed by:	phk
@
text
@d61 1
@


1.340
log
@Add a CAM interface to the aac driver.  This is useful in case you should
ever connect a SCSI Cdrom/Tape/Jukebox/Scanner/Printer/kitty-litter-scooper
to your high-end RAID controller.  The interface to the arrays is still
via the block interface; this merely provides a way to circumvent the
RAID functionality and access the SCSI buses directly.  Note that for
somewhat obvious reasons, hard drives are not exposed to the da driver
through this interface, though you can still talk to them via the pass
driver.  Be the first on your block to low-level format unsuspecting
drives that are part of an array!

To enable this, add the 'aacp' device to your kernel config.

MFC after:	3 days
@
text
@d59 1
a59 1
options 	WITNESS			#Enable checks to detects deadlocks and cycles
@


1.339
log
@Since WITNESS doesn't just do mutexes, remove "mutex" from the WITNESS
comment in GENERIC config files of appropriate platforms.  For whatever
reason, powerpc didn't use WITNESS in GENERIC.
@
text
@d118 1
@


1.338
log
@GC various bits and pieces of USERCONFIG from all over the place.
@
text
@d59 1
a59 1
options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
@


1.337
log
@Dike out a highly insecure UCONSOLE option.
TIOCCONS must be able to VOP_ACCESS() /dev/console to succeed.

Obtained from:	OpenBSD
@
text
@a46 2
#options 	USERCONFIG		#boot -c editor
#options 	VISUAL_USERCONFIG	#visual boot -c editor
@


1.336
log
@s/options\t\t/options \t/
@
text
@a46 1
options 	UCONSOLE		#Allow users to grab the console
@


1.335
log
@Re-enable WITNESS for GENERIC.  Since the 5.x branch is mostly about
SMP we'd like as much feedback as possible from users about possible
locking problems as early as possible.

To negate most of the performance impact I've also enabled
WITNESS_SKIPSPIN.  I've done this as we've been running WITNESS
over the spinlock code for a while without incident and it goes a
long way to making the performance problems of WITNESS much more
bearable.

Users who should be running current should know about turning WITNESS
off for performance reasons.

That said and done, WITNESS could/should be made into a tuneable,
but we'll leave that as an excersize to those that want to disable
it without a kernel recompile.
@
text
@d63 1
a63 1
options		WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
@


1.334
log
@Remove WITNESS from GENERIC by default: as we grow more locks, this gets
slower, and may be impeding adoption of -CURRENT by developers.  We
recommend turning on WITNESS by default on crash boxes, and when doing
locking development.  It will probably get turned on by default for a week
or two following any major locking commits, also.

Approved by:	all and sundry (jhb, phk, ...)
@
text
@d62 2
a63 1
#options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
@


1.333
log
@Add the 'iir' driver, for the Intel Integrated RAID controllers and
prior ICP Vortex models.  This driver was developed by Achim Leubner
of Intel (previously with ICP Vortex) and Boji Kannanthanam of Intel.

Submitted by:	"Kannanthanam, Boji T" <boji.t.kannanthanam@@intel.com>
MFC after:	2 weeks
@
text
@d62 1
a62 1
options 	WITNESS			#Enable mutex checks to detects deadlocks and cycles
@


1.332
log
@Enable UFS_DIRHASH in the GENERIC kernel.

Suggested by:	silby
Reviewed by:	dillon
MFC after:	5 days
@
text
@d104 1
d106 1
@


1.331
log
@Allow maxusers to be specified as 0 in the kernel config, which will
cause the system to auto-size to between 32 and 512 depending on the
amount of memory.

MFC after:	1 week
@
text
@d36 1
@


1.330
log
@PROCFS requires PSEUDOFS.  I forgot that GENERIC didn't have PSEUDOFS yet.
@
text
@d25 1
a25 1
maxusers	32
@


1.329
log
@Fix tab damage in rev 1.326.
@
text
@d42 2
a43 1
options 	PROCFS			#Process filesystem
@


1.328
log
@Spell deivces as devices.
@
text
@d69 1
a69 1
#options		PCI_ENABLE_IO_MODES	# Enable pci resources left off by a "lazy BIOS"
@


1.327
log
@Move device lnc to isa section, since it no longer uses the compat shims.
Add comment about lnc.
Remove probe order comment from isa_compat.c.  That appears to no longer
be the case.
@
text
@d195 1
a195 1
# ISA deivces that use the old ISA shims
@


1.326
log
@Add PCI_ENABLE_IO_MODES option, for BIOSen that neglect this.

Submitted by: Andrew R. Reiter arr@@watson.org
@
text
@d191 1
d195 1
a195 2
# The probe order of these is presently determined by i386/isa/isa_compat.c.
#device		ie
a196 1
device		lnc
@


1.325
log
@Remove wx.
@
text
@d69 1
@


1.324
log
@Drop support for x87 emulation.  Any CPU one would dare to run 5-CURRENT
on would have built-in FP support.
@
text
@a180 1
device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
@


1.323
log
@Make SCSI changer and SES devices standard in generic kernels.

Reviewed by:	ken@@kdm.org
@
text
@a31 1
options 	MATH_EMULATE		#Support for x87 emulation
@


1.322
log
@The faith(4) device is no longer a count device so don't specify a count.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.321 2001/09/24 03:23:47 obrien Exp $
d107 1
d112 1
@


1.321
log
@+ Fix misplacement of `txp'
+ Document our -CURRENT debugging bits
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.320 2001/09/22 19:02:18 jedgar Exp $
d214 1
a214 1
device		faith	1	# IPv6-to-IPv4 relaying (translation)
@


1.320
log
@Update NFS_ROOT comments to reflect the NFSCLIENT option
instead of the depricated NFS option.

Reviewed by:	peter
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.319 2001/09/18 23:31:27 peter Exp $
d58 4
a61 4
options 	DDB
options 	INVARIANTS
options 	INVARIANT_SUPPORT
options 	WITNESS
d163 1
a164 1
device		txp		# 3Com 3cR990 (``Typhoon'')
@


1.319
log
@Cleanup and split of nfs client and server code.
This builds on the top of several repo-copies.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.318 2001/08/25 07:42:27 peter Exp $
d40 1
a40 1
options 	NFS_ROOT		#NFS usable as root device, NFS required
@


1.318
log
@Argh! Revert accidental commit.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.317 2001/08/25 02:20:00 peter Exp $
d38 2
a39 1
options 	NFS			#Network Filesystem
@


1.317
log
@Optionize UPAGES for the i386.  As part of this I split some of the low
level implementation stuff out of machine/globaldata.h to avoid exposing
UPAGES to lots more places.  The end result is that we can double
the kernel stack size with 'options UPAGES=4' etc.

This is mainly being done for the benefit of a MFC to RELENG_4 at some
point.  -current doesn't really need this so much since each interrupt
runs on its own kstack.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.316 2001/08/05 21:56:11 nate Exp $
d28 1
a28 1
hints		"GENERIC.hints"		#Default places to look for devices.
a60 2
options 	UPAGES=4
options		CPU_ENABLE_SSE
@


1.316
log
@- Removed comment about ThinkPad keyboards from the PCVT line.  Any ThinkPad
  that needs this probably won't run -current, as it's at least 5 years old.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.315 2001/07/23 20:44:52 wpaul Exp $
d28 1
a28 1
#hints		"GENERIC.hints"		#Default places to look for devices.
d61 2
@


1.315
log
@You were knocked senseless by the Boomerang, spun around by the Cyclone,
blown over by the Hurricane and had a house dropped on you by the Tornado.
Now it's time to have your parade rained on by... the Typhoon!

This commit adds driver support for 3Com 3cR990 10/100 ethernet
adapters based on the Typhoon I and Typhoon II chipsets. This is actually
a port of the OpenBSD driver with many hacks by me.

No Virginia, there isn't any support for the hardware crypto yet. However
there is support for TCP/IP checksum offload and VLANs.

Special thanks go to Jason Wright, Aaron Campbell and Theo de Raadt for
squeezing enough info out of 3Com to get this written, and for doing
most of the hard work.

Manual page is included. Compiled as a module and included in GENERIC.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.314 2001/07/13 13:34:07 dd Exp $
a134 2
# If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
#options 	PCVT_SCANSET=2		# IBM keyboards are non-std
@


1.314
log
@`pcn' supports AMD Am79C97x cards, not Am79C79x cards.

PR:		28946
Submitted by:	Ryuichiro Imura <imura@@ryu16.org>
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.313 2001/07/02 21:01:48 brooks Exp $
d165 1
@


1.313
log
@gif(4) and stf(4) modernization:

 - Remove gif dependencies from stf.
 - Make gif and stf into modules
 - Make gif cloneable.

PR:		kern/27983
Reviewed by:	ru, ume
Obtained from:	NetBSD
MFC after:	1 week
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.312 2001/06/12 09:39:57 peter Exp $
d171 1
a171 1
device		pcn		# AMD Am79C79x PCI 10/100 NICs
@


1.312
log
@Hints overhaul:
- Replace some very poorly thought out API hacks that should have been
  fixed a long while ago.
- Provide some much more flexible search functions (resource_find_*())
- Use strings for storage instead of an outgrowth of the rather
  inconvenient temporary ioconf table from config().  We already had a
  fallback to using strings before malloc/vm was running anyway.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.311 2001/05/30 03:18:22 mjacob Exp $
d213 1
a213 1
device		gif	4	# IPv6 and IPv4 tunneling
@


1.311
log
@move wx to be part of miibus requiring chipsets
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.310 2001/05/29 18:49:01 phk Exp $
d46 2
a47 2
options 	USERCONFIG		#boot -c editor
options 	VISUAL_USERCONFIG	#visual boot -c editor
@


1.310
log
@Remove MFS options from all example kernel configs.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.309 2001/05/25 17:55:39 jkh Exp $
a164 1
device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
d180 1
@


1.309
log
@Take pcm (audio) back out of GENERIC; there appears to be some
concensus, most notably among the maintainers, that it's better
loaded as a module.

Finally-pushed-over-the-edge-by-the-anguished-cries-of:	rwatson
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.308 2001/05/13 20:52:39 phk Exp $
a36 1
options 	MFS			#Memory Filesystem
@


1.308
log
@Convert DEVFS from an "opt-in" to an "opt-out" option.

If for some reason DEVFS is undesired, the "NODEVFS" option is
needed now.

Pending any significant issues, DEVFS will be made mandatory in
-current on july 1st so that we can start reaping the full
benefits of having it.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.307 2001/04/15 19:37:27 obrien Exp $
a145 3

# Audio support
device		pcm
@


1.307
log
@Turn on kernel debugging support (DDB, INVARIANTS, INVARIANT_SUPPORT, WITNESS)
by default while SMPng is still being developed.

Submitted by:	jhb
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.306 2001/03/16 11:52:25 sos Exp $
a42 1
options 	DEVFS			#Device Filesystem
@


1.306
log
@Remove the now defunct ATA_ENABLE* options

Spotted by: phk
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.305 2001/03/12 21:51:07 jlemon Exp $
d30 1
a30 1
#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
d57 6
@


1.305
log
@Move the fxp driver so it is under the miibus section.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.304 2001/03/07 04:58:38 gsutter Exp $
a75 1
#options 	ATA_ENABLE_ATAPI_DMA	#Enable DMA on ATAPI devices
@


1.304
log
@Spelling and capitalization fixes.

Reviewed by:	gshapiro, jake, jhb, rwatson (all within 30 seconds)
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.303 2001/03/03 08:31:37 imp Exp $
a163 1
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
d171 1
@


1.303
log
@Add support for Dlink DL10022 to the ed driver.  This is a mii part
bolted to a ne-2000 chip.  This is necessary for the NetGear FA-410TX
and other cards.

This also requires you add mii to your kernel if you have an ed driver
configured.

This code will result in a couple of timeout messages for ed on the
impacted cards.  Additional work will be needed, but this does work
right now, and many people need these cards.

Submitted by: Ian Dowse <iedowse@@maths.tcd.ie>
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.302 2001/02/25 05:52:38 peter Exp $
d81 1
a81 1
device		amd		# AMD 53C974 (Teckram DC-390(T))
d86 5
a90 5
device		adv		# Advansys scsi adapters
device		adw		# Advansys wide scsi adapters
device		aha		# Adaptec 154x scsi adapters
device		aic		# Adaptec 15[012]x scsi adapters, AIC-6[23]60.
device		bt		# Buslogic/Mylex MultiMaster scsi adapters
d204 1
a204 1
# Pseudo devices - the number indicates how many units to allocated.
@


1.302
log
@Drop the 'count' from the aha device specs
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.301 2001/02/04 15:35:08 peter Exp $
d185 1
@


1.301
log
@Clean up some leftovers from the root mount cleanup that was done some
time ago.  FFS_ROOT and CD9660_ROOT are obsolete.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.300 2001/01/27 08:18:36 phk Exp $
d88 1
a88 1
device		aha	1	# Adaptec 154x scsi adapters
@


1.300
log
@Turn DEVFS on by default.

You may need to turn this off if you you vinum.  Apart from that I know of
no reason not to run with DEVFS.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.299 2001/01/19 13:06:37 peter Exp $
a35 1
options 	FFS_ROOT		#FFS usable as root device [keep this!]
a42 1
options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
@


1.299
log
@At great personal risk to my sanity, turn off COMPAT_OLDISA and the
two drivers that depend on it - ie and le.  The compat code has not been
disabled.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.298 2001/01/14 17:50:13 markm Exp $
d45 1
a45 1
#options 	DEVFS			#Device Filesystem
@


1.298
log
@Remove NOBLOCKRANDOM as a compile-time option. Instead, provide
exactly the same functionality via a sysctl, making this feature
a run-time option.

The default is 1(ON), which means that /dev/random device will
NOT block at startup.

setting kern.random.sys.seeded to 0(OFF) will cause /dev/random
to block until the next reseed, at which stage the sysctl
will be changed back to 1(ON).

While I'm here, clean up the sysctls, and make them dynamic.
Reviewed by:		des
Tested on Alpha by:	obrien
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.297 2001/01/14 10:19:42 jhb Exp $
a66 1
options 	COMPAT_OLDISA		# compatability shims for le
d195 2
a196 2
device		ie
device		le
@


1.297
log
@Argh, remove a local customization that snuck in here.

Noticed by:	jasone
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.296 2001/01/14 10:11:10 jhb Exp $
a207 1
options 	NOBLOCKRANDOM	# avoid any blocking on device random
@


1.296
log
@Remove I386_CPU from GENERIC.  Support for the 386 seriously pessimizes
performance on other x86 processors.  Custom kernels can still be built
that will run on the 386.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.295 2000/12/20 11:24:47 paul Exp $
a30 1
makeoptions	KERNEL=kernel.GENERIC
@


1.295
log
@Re-enable the lnc driver in GENERIC.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.294 2000/12/13 01:11:34 msmith Exp $
a20 1
cpu		I386_CPU
d31 1
@


1.294
log
@Remove the COMPAT_OLDPCI option, it's going away.

Turn 'lnc' off in GENERIC for the moment, pending its update to newbus.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.293 2000/12/11 14:02:00 phk Exp $
d68 1
a68 1
options 	COMPAT_OLDISA		# compatability shims for lnc, le
d199 1
a199 1
#device		lnc
@


1.293
log
@Remove DDB, it leaked in here with another commit.

Submitted by:	bde
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.292 2000/12/08 20:08:18 phk Exp $
a68 1
options 	COMPAT_OLDPCI		# compatability shims for lnc
d199 1
a199 1
device		lnc
@


1.292
log
@Staticize some malloc M_ instances.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.291 2000/11/15 18:36:24 imp Exp $
a241 2

options 	DDB
@


1.291
log
@Add pmtimer device, necessary for proper time keeping when apm or
other power management devices are enabled.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.290 2000/11/14 01:13:57 jkh Exp $
d242 2
@


1.290
log
@Proper capitalization of PCMCIA (and avoid matching pcm)
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.289 2000/11/14 01:11:13 jkh Exp $
d145 2
@


1.289
log
@In the year 2000, I think it's perfectly reasonable to include audio
support by default in GENERIC.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.288 2000/11/07 21:20:52 imp Exp $
d151 1
a151 1
device		pcic		# pcmcia bridge
@


1.288
log
@Make the ISA nic section look like the other device sections with
comments on the same line like so:
	device		foo		# FooInc Brand NetEther cards

Also, move the wireless NIC cards to their own section.

Add commented out wl driver in wireless section.

Remove obsolete or redundant comments about some of the wireless cards
that used to apply but don't since we've removed 'at foobus'.

There should be no functional changes in this change.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.287 2000/11/07 21:06:57 imp Exp $
d145 3
@


1.287
log
@Minor ordering changes to make more sections strictly alphabetical.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.286 2000/11/07 20:22:18 semenu Exp $
d91 5
a95 5
device		adv
device		adw
device		aha	1
device		aic
device		bt
d121 3
a123 3
device		atkbdc	1
device		atkbd
device		psm
d125 1
a125 1
device		vga
d147 2
a148 2
device		card
device		pcic
d151 1
a151 1
device		sio
d183 8
a190 21
# ISA Ethernet NICs.
device		cs
device		ed
device		ex
device		ep
device		fe
device		sn
# WaveLAN/IEEE 802.11 wireless NICs. Note: the WaveLAN/IEEE really
# exists only as a PCMCIA device, so there is no ISA attatement needed
# and resources will always be dynamically assigned by the pccard code.
device		wi
# Aironet 4500/4800 802.11 wireless NICs. Note: the declaration below will
# work for PCMCIA and PCI cards, as well as ISA cards set to ISA PnP
# mode (the factory default). If you set the switches on your ISA
# card for a manually chosen I/O address and IRQ, you must specify
# those paremeters here.
device		an
# BayStack 660 and others
device		awi
# Xircom pccard ethernet
device		xe
d196 6
@


1.286
log
@Synced tx(4) driver descriptions + ``device tx'' line moved to the
list of drivers using miibus.

PR:		kern/22556
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.285 2000/11/07 00:58:35 wpaul Exp $
a39 1
#options 	DEVFS			#Device Filesystem
d46 1
a92 1
device		bt
d95 1
d115 1
a116 1
device		amr		# AMI MegaRAID
d184 1
a188 1
device		cs
d204 1
@


1.285
log
@The vx driver no longer needs the PCI compat shims. Also should now
work on the alpha (at least the PCI part should).
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.284 2000/10/28 22:32:17 nik Exp $
d178 1
a178 1
device		tx		# SMC 9432TX (83c170 ``EPIC'')
@


1.284
log
@Add a brief comment telling people to retain 'device miibus' as necessary.

PR:		docs/21981
Submitted by:	Matthew Emmerton <matt@@gsicomp.on.ca>
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.283 2000/10/27 06:05:59 markm Exp $
d69 1
a69 1
options 	COMPAT_OLDPCI		# compatability shims for lnc, vx
@


1.283
log
@As the blocking model has seems to be troublesome for many, disable
it for now with an option.

This option is already deprecated, and will be removed when the
entropy-harvesting code is fast enough to warrant it.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.282 2000/10/25 10:34:31 n_hibma Exp $
d169 1
@


1.282
log
@The USB scanner driver. To be used together with SANE.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.281 2000/10/23 12:55:39 non Exp $
d210 1
@


1.281
log
@Add PC-Card/ISA SCSI host adpater drivers from NetBSD/pc98
(a NetBSD port for NEC PC-98x1 machines). They are ncv for NCR 53C500,
nsp for Workbit Ninja SCSI-3, and stg for TMC 18C30 and 18C50.

I thank NetBSD/pc98 and bsd-nomads people.

Obtained from:	NetBSD/pc98
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.280 2000/10/12 01:46:43 msmith Exp $
d236 1
@


1.280
log
@Bring the 'twe' driver back now that we think it should work.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.279 2000/09/22 23:39:47 ps Exp $
d96 4
@


1.279
log
@Remove the NCPU, NAPIC, NBUS, NINTR config options.  Make NAPIC,
NBUS, NINTR dynamic and set NCPU to a maximum of 16 under SMP.

Reviewed by:	peter
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.278 2000/09/20 17:30:20 wpaul Exp $
d114 1
@


1.278
log
@Add a new driver for the AMD PCnet/FAST, FAST+ and Home PCI adapters.
Previously, these cards were supported by the lnc driver (and they
still are, but the pcn driver will claim them first), which is fine
except the lnc driver runs them in 16-bit LANCE compatibility mode.
The pcn driver runs these chips in 32-bit mode and uses the RX alignment
feature to achieve zero-copy receive. (Which puts it in the same
class as the xl, fxp and tl chipsets.) This driver is also MI, so it
will work on the x86 and alpha platforms. (The lnc driver is still
needed to support non-PCI cards. At some point, I'll need to newbusify
it so that it too will me MI.)

The Am79c978 HomePNA adapter is also supported.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.277 2000/09/15 02:25:41 nyan Exp $
a63 5
# Optionally these may need tweaked, (defaults shown):
#options 	NCPU=2			# number of CPUs
#options 	NBUS=8			# number of busses
#options 	NAPIC=1			# number of IO APICs
#options 	NINTR=24		# number of INTs
@


1.277
log
@Moved the fe driver from the compat section to the correct section.

Submitted by:	sanpei
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.276 2000/09/13 03:20:34 msmith Exp $
d171 1
@


1.276
log
@A new driver for PCI:SCSI RAID controllers based on the Adaptec FSA
design.  This includes integrated Dell RAID controllers, the Dell
PERC 2/QC and the HP NetRAID-4M.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.275 2000/09/12 13:21:40 markm Exp $
d73 1
a73 1
options 	COMPAT_OLDISA		# compatability shims for lnc, fe, le
d185 1
a203 1
device		fe
@


1.275
log
@Turn the /dev/random device into a (pseudo-)device, not an option.

(I didn't realise that it was this easy!)
Submitted by:	jhb
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.274 2000/09/11 21:20:39 billf Exp $
d115 1
@


1.274
log
@Move tx to the list of drivers that now require miibus.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.273 2000/09/01 07:51:23 msmith Exp $
a59 1
options 	RANDOMDEV		#entropy device
d207 1
@


1.273
log
@Add the 'asr' driver, supplied by Mark Salyzyn of Adaptec (nee DPT).
This provides support for the Adaptec SCSI RAID controller family,
as well as the DPT SmartRAID V and VI families.

The driver will be maintained by Mark and Adaptec, and any changes
should be referred to the MAINTAINER.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.272 2000/08/24 18:56:54 peter Exp $
a164 1
device		tx		# SMC 9432TX (83c170 ``EPIC'')
d176 1
@


1.272
log
@Comment out the static wiring of hints for GENERIC - the release process
now installs the hints file into /boot.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.271 2000/08/23 03:29:49 msmith Exp $
d104 2
a105 1
device		dpt		# DPT Smartcache - See NOTES for options!
@


1.271
log
@Add entries for the 'mly' driver.  Re-group 'mly' and 'dpt' into a new
classification for RAID controllers that have CAM interfaces.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.270 2000/08/20 21:34:31 phk Exp $
d28 2
a29 1
hints		"GENERIC.hints"		#Default places to look for devices.
@


1.270
log
@  Remove all traces of Julians DEVFS (incl from kern/subr_diskslice.c)

  Remove old DEVFS support fields from dev_t.

  Make uid, gid & mode members of dev_t and set them in make_dev().

  Use correct uid, gid & mode in make_dev in disk minilayer.

  Add support for registering alias names for a dev_t using the
  new function make_dev_alias().  These will show up as symlinks
  in DEVFS.

  Use makedev() rather than make_dev() for MFSs magic devices to prevent
  DEVFS from noticing this abuse.

  Add a field for DEVFS inode number in dev_t.

  Add new DEVFS in fs/devfs.

  Add devfs cloning to:
        disk minilayer (ie: ad(4), sd(4), cd(4) etc etc)
        md(4), tun(4), bpf(4), fd(4)

  If DEVFS add -d flag to /sbin/inits args to make it mount devfs.

  Add commented out DEVFS to GENERIC
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.269 2000/07/29 02:12:44 obrien Exp $
a91 1
device		dpt		# DPT Smartcache - See NOTES for options!
d101 4
@


1.269
log
@Revert previous commit.  Not all RAID controllers are SCSI.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.268 2000/07/29 02:00:28 obrien Exp $
d39 1
@


1.268
log
@Move the RAID controllers next to the SCSI controllers.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.267 2000/07/29 01:31:08 obrien Exp $
a101 6
# RAID controllers
device		ida		# Compaq Smart RAID
device		amr		# AMI MegaRAID
device		mlx		# Mylex DAC960 family


d108 5
@


1.267
log
@Comment out `ncr' as `sym' handles all that `ncr' does.
(only commented out to make it easy for people to find it that really
 wants it.)

Asked for by:	Peter
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.266 2000/07/25 08:25:48 billf Exp $
d102 6
a113 5

# RAID controllers
device		ida		# Compaq Smart RAID
device		amr		# AMI MegaRAID
device		mlx		# Mylex DAC960 family
@


1.266
log
@s%LINT%NOTES%g
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.265 2000/07/10 15:17:52 mjacob Exp $
d93 2
a94 2
device		ncr		# NCR/Symbios Logic
device		sym		# NCR/Symbios Logic (newer chipsets)
@


1.265
log
@Removing commented out devices I added.
@
text
@d15 2
a16 2
# device lines is also present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT.
d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.264 2000/07/08 07:05:40 mjacob Exp $
d91 1
a91 1
device		dpt		# DPT Smartcache - See LINT for options!
d137 1
a137 1
# Power management support (see LINT for more options)
@


1.264
log
@Oops- remove the '0' appended to targbh.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.263 2000/07/08 07:02:58 mjacob Exp $
a107 5

#device		ses		# SCSI Environmental Services (and SAF-TE)
#device		targ		# SCSI Target Mode Code
#device		targbh		# SCSI Target Mode Blackhole Device
#define		pt		# SCSI Processor Target Device
@


1.263
log
@Add in the commented out SCSI device entries of

#device         ses             # SCSI Environmental Services (and SAF-TE)
#device         targ            # SCSI Target Mode Code
#device         targbh0         # SCSI Target Mode Blackhole Device
#define         pt              # SCSI Processor Target Device

so that people know that they are there.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.262 2000/06/25 09:18:07 markm Exp $
d111 1
a111 1
#device		targbh0		# SCSI Target Mode Blackhole Device
@


1.262
log
@Get the build bits right for the new Architecture Independant null- and
entropy drivers.
Reviewed by:	dfr(mostly)
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.261 2000/06/22 06:01:02 peter Exp $
d108 5
@


1.261
log
@Add SOFTUPDATES to GENERIC  (BOOTMFS has this filtered out)
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.260 2000/06/13 22:28:46 peter Exp $
d58 1
@


1.260
log
@Borrow phk's axe and apply the next stage of config(8)'s evolution.

Use Warner Losh's "hint" driver to decode ascii strings to fill the
resource table at boot time.

config(8) no longer generates an ioconf.c table - ie: the configuration
no longer has to be compiled into the kernel.  You can reconfigure your
isa devices with the likes of this at loader(8) time:
  set hint.ed.0.port=0x320

userconfig will be rewritten to use this style interface one day and will
move to /boot/userconfig.4th or something like that.

It is still possible to statically compile in a set of hints into a kernel
if you do not wish to use loader(8).  See the "hints" directive in GENERIC
as an example.

All device wiring has been moved out of config(8).  There is a set of
helper scripts (see i386/conf/gethints.pl, and the same for alpha and pc98)
that extract the 'at isa? port foo irq bar' from the old files and produces
a hints file.  If you install this file as /boot/device.hints (and update
/boot/defaults/loader.conf - You can do a build/install in sys/boot) then
loader will load it automatically for you.  You can also compile in the
hints directly with:  hints "device.hints"  as well.

There are a few things that I'm not too happy with yet.  Under this scheme,
things like LINT would no longer be useful as "documentation" of settings.
I have renamed this file to 'NOTES' and stored the example hints strings
in it.  However... this is not something that config(8) understands, so
there is a script that extracts the build-specific data from the
documentation file (NOTES) to produce a LINT that can be config'ed and
built.  A stack of man4 pages will need updating. :-/

Also, since there is no longer a difference between 'device' and
'pseudo-device' I collapsed the two together, and the resulting 'device'
takes a 'number of units' for devices that still have it statically
allocated.  eg:  'device fe 4' will compile the fe driver with NFE set
to 4.  You can then set hints for 4 units (0 - 3).  Also note that
'device fe0' will be interpreted as "zero units of 'fe'" which would be
bad, so there is a config warning for this.  This is only needed for
old drivers that still have static limits on numbers of units.
All the statically limited drivers that I could find were marked.

Please exercise EXTREME CAUTION when transitioning!

Moral support by: phk, msmith, dfr, asmodai, imp, and others
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.259 2000/05/31 19:01:45 msmith Exp $
d37 1
@


1.259
log
@Bump the default NBUS value to 8.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.258 2000/05/30 23:01:37 green Exp $
d28 2
d70 2
a71 2
options 	COMPAT_OLDISA		# Old ISA driver shims
options 	COMPAT_OLDPCI		# Old PCI driver shims
d74 1
a74 3
device		fdc0	at isa? port IO_FD1 irq 6 drq 2
device		fd0	at fdc0 drive 0
device		fd1	at fdc0 drive 1
a76 2
device		ata0	at isa? port IO_WD1 irq 14
device		ata1	at isa? port IO_WD2 irq 15
d94 1
a94 1
device		adv0	at isa?
d96 3
a98 3
device		bt0	at isa?
device		aha0	at isa?
device		aic0	at isa?
d113 3
a115 3
device		atkbdc0	at isa? port IO_KBD
device		atkbd0	at atkbdc? irq 1 flags 0x1
device		psm0	at atkbdc? irq 12
d117 1
a117 1
device		vga0	at isa?
d120 1
a120 1
pseudo-device	splash
d123 1
a123 1
device		sc0	at isa? flags 0x100
d126 1
a126 1
#device		vt0	at isa?
d133 1
a133 1
device		npx0	at nexus? port IO_NPX irq 13
d136 1
a136 1
device		apm0    at nexus? disable flags 0x20 # Advanced Power Management
d140 1
a140 2
device		pcic0	at isa? irq 10 port 0x3e0 iomem 0xd0000
device		pcic1	at isa? irq 11 port 0x3e2 iomem 0xd4000 disable
d143 1
a143 4
device		sio0	at isa? port IO_COM1 flags 0x10 irq 4
device		sio1	at isa? port IO_COM2 irq 3
device		sio2	at isa? disable port IO_COM3 irq 5
device		sio3	at isa? disable port IO_COM4 irq 9
d146 1
a146 1
device		ppc0	at isa? irq 7
d174 1
a174 1
device		ed0	at isa? port 0x280 irq 10 iomem 0xd8000
d177 2
a178 2
device		cs0	at isa? port 0x300
device		sn0	at isa? port 0x300 irq 10
d194 4
a197 4
device		ie0	at isa? port 0x300 irq 10 iomem 0xd0000
device		fe0	at isa? port 0x300
device		le0	at isa? port 0x300 irq 5 iomem 0xd0000
device		lnc0	at isa? port 0x280 irq 10 drq 0
d200 9
a208 9
pseudo-device	loop		# Network loopback
pseudo-device	ether		# Ethernet support
pseudo-device	sl		# Kernel SLIP
pseudo-device	ppp	1	# Kernel PPP
pseudo-device	tun		# Packet tunnel.
pseudo-device	pty		# Pseudo-ttys (telnet etc)
pseudo-device	md		# Memory "disks"
pseudo-device	gif	4	# IPv6 and IPv4 tunneling
pseudo-device	faith	1	# IPv6-to-IPv4 relaying (translation)
d210 1
a210 1
# The `bpf' pseudo-device enables the Berkeley Packet Filter.
d212 1
a212 1
pseudo-device	bpf		# Berkeley packet filter
@


1.258
log
@Change sl(4) configuration lines to reflect its new dynamic nature.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.257 2000/05/22 16:12:27 dan Exp $
d61 1
a61 1
#options 	NBUS=4			# number of busses
@


1.257
log
@sysctl'ize ICMP_BANDLIM and ICMP_BANDLIM_SUPPRESS_OUTPUT.

Suggested by: des/nbm
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.256 2000/05/13 11:21:19 hoek Exp $
d208 1
a208 1
pseudo-device	sl	1	# Kernel SLIP
@


1.256
log
@Change to comments only: spell FreeBSD.org correctly
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.255 2000/05/12 03:05:35 jhb Exp $
a53 1
options		ICMP_BANDLIM		#Rate limit bad replies
@


1.255
log
@Turn on USB support for most USB devices.  udbp is not turned on since
NETGRAPH is not present in GENERIC at the moment.  Also, change some
settings to support USB installs:

- Add KBD_INSTALL_CDEV as an option to make /dev/kbd[01] actually work.
- Turn on keyboard probing in sc0.  The syscons driver will now use a
  flag documented in ukbd(4) but not in sc(4) that tells syscons to
  actively search for a keyboard device if none is found.  This allows
  USB keyboards to just be plugged in and instantly start working.
- Require the atkbd0 driver to actually probe to see if a keyboard is
  there.  This allows USB keyboards to be seen by sc0 if an AT keyboard
  isn't plugged into the computer.  This also means that you will no
  longer be able to plug an AT keyboard into a machine after it has
  booted a GENERIC kernel and use it.  AT keyboards aren't designed for
  this anyway.  USB keyboards are designed for this, and they work.
@
text
@d7 1
a7 1
#    http://www.freebsd.org/handbook/kernelconfig-config.html
d11 1
a11 1
# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.254 2000/05/03 00:49:57 imp Exp $
@


1.254
log
@Move sn and cs drivers from the compat section to the real section.
Enable xe driver now that I've had reports that it works.

PR: 18323
Submitted by: MIHIRA Yoshiro-san
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.253 2000/05/01 22:48:19 n_hibma Exp $
d55 1
d117 1
a117 1
device		atkbd0	at atkbdc? irq 1
d126 1
a126 1
device		sc0	at isa?
d222 3
a224 3
#device		uhci		# UHCI PCI->USB interface
#device		ohci		# OHCI PCI->USB interface
#device		usb		# USB Bus (required)
d226 7
a232 7
#device		ugen		# Generic
#device		uhid		# "Human Interface Devices"
#device		ukbd		# Keyboard
#device		ulpt		# Printer
#device		umass		# Disks/Mass storage - Requires scbus and da
#device		ums		# Mouse
#device		urio		# Diamond Rio 500 MP3 player
d234 3
a236 3
#device		aue		# ADMtek USB ethernet
#device		cue		# CATC USB ethernet
#device		kue		# Kawasaki LSI USB ethernet
@


1.253
log
@The USB double bulk pipe driver (Host to host cables). Currently there
are two supported chips, the NetChip 1080 (only prototypes available)
and the EzLink cable. Any other cable should be supported however as they
are all very much alike (there is a difference between them wrt
performance).

It uses Netgraph.

This driver was mostly written by Doug Ambrisko and Julian Elischer and
I would like to thank Whistle for yet another contribution. And my
aplogies to them for me sitting on the driver for so long (2 months).

Also, many thanks to Reid Augustin from NetChip for providing me with a
prototype of their 1080 chip.

Be aware of the fact that this driver is very immature and has only been
tested very lightly. If someone feels like learning about Netgraph however
this is an excellent driver to start playing with.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.252 2000/04/15 18:46:15 asmodai Exp $
d183 2
d197 2
a203 4
device		cs0	at isa? port 0x300
device		sn0	at isa? port 0x300 irq 10
# Disabled because it is currently broken.
#device		xe
@


1.252
log
@Fix typo, extentions -> extensions

Submitted by:	George Cox <gjvc@@sophos.com>
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.251 2000/04/06 02:48:43 imp Exp $
d224 1
@


1.251
log
@Awi driver, ported from NetBSD from Atsushi Once-san.

From the README:
	Any IEEE 802.11 cards use AMD Am79C930 and Harris (Intersil) Chipset
	with PCnetMobile firmware by AMD.
	   BayStack 650   1Mbps Frequency Hopping PCCARD adapter
	   BayStack 660   2Mbps Direct Sequence PCCARD adapter
	   Icom SL-200    2Mbps Direct Sequence PCCARD adapter
	   Melco WLI-PCM  2Mbps Direct Sequence PCCARD adapter
	   NEL SSMagic    2Mbps Direct Sequence PCCARD adapter
	   Netwave AirSurfer Plus
			  1Mbps Frequency Hopping PCCARD adapter
	   Netwave AirSurfer Pro
			  2Mbps Direct Sequence PCCARD adapter

Known Problems:
	WEP is not supported.
	Does not create IBSS itself.
	Cannot configure the following on FreeBSD:
		selection of infrastructure/adhoc mode
		ESSID
		...

Submitted by: Atsushi Onoe <onoe@@sm.sony.co.jp>
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.250 2000/04/04 13:14:43 hm Exp $
d52 1
a52 1
options 	P1003_1B		#Posix P1003_1B real-time extentions
@


1.250
log
@Remove obsolete reference to PCVT_FREEBSD.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.249 2000/03/21 17:00:58 dan Exp $
d193 2
d202 2
a203 2
# requires PCCARD (PCMCIA) support to be activated
#device		xe0	at isa?
@


1.249
log
@Include a space between hash ('#') and 'Berkeley packet filter' like
all the other comments have.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.248 2000/03/19 13:33:25 peter Exp $
d127 1
a127 1
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
@


1.248
log
@Document and supply COMPAT_OLDPCI and COMPAT_OLDISA so 'make release'
still works.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.247 2000/03/16 09:16:06 n_hibma Exp $
d216 1
a216 1
pseudo-device	bpf		#Berkeley packet filter
@


1.247
log
@Please welcome the URio driver. Written by
Iwasa Kazmi <kzmi\@@ca2.so-net.ne.jp>
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246 2000/03/09 16:32:55 jlemon Exp $
d68 2
@


1.246
log
@Add Compaq `ida' driver to GENERIC, update it's LINT entry.

Approved by:	jordan
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.245 2000/02/27 07:35:42 green Exp $
d226 1
@


1.246.2.1
log
@Even though xe0 was commented out, people still (rightfully) think they can
just uncomment it and have it magically work. This driver _is_ broken for
4.0 and there is no way to make it work as it stands right now. Hopefully
this will cut down on the amount of (semi-bogus) "bug" reports.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246 2000/03/09 16:32:55 jlemon Exp $
d198 2
@


1.246.2.2
log
@MFC: fix posix option typo.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.1 2000/04/05 18:16:15 billf Exp $
d52 1
a52 1
options 	P1003_1B		#Posix P1003_1B real-time extensions
@


1.246.2.3
log
@MFC: Change to comments only: spell FreeBSD.org correctly
@
text
@d7 1
a7 1
#    http://www.FreeBSD.org/handbook/kernelconfig-config.html
d11 1
a11 1
# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.2 2000/04/15 18:47:42 asmodai Exp $
@


1.246.2.4
log
@Add appropriate options that will preserve `ncr'
precedence over `sym' for NCR legacy devices 810,
815, 825, after merge of `sym' from -current.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.3 2000/05/13 11:22:14 hoek Exp $
a92 3
options		SYM_SETUP_LP_PROBE_MAP=0x40
				# Allow ncr to attach legacy NCR devices when 
				# both sym and ncr are configured
@


1.246.2.5
log
@MFC: USB support during installation and enabling of USB in the
GENERIC kernel.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.4 2000/05/14 10:40:27 groudier Exp $
a54 1
options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
d117 1
a117 1
device		atkbd0	at atkbdc? irq 1 flags 0x1
d126 1
a126 1
device		sc0	at isa? flags 0x100
d218 9
a226 9
device		uhci		# UHCI PCI->USB interface
device		ohci		# OHCI PCI->USB interface
device		usb		# USB Bus (required)
device		ugen		# Generic
device		uhid		# "Human Interface Devices"
device		ukbd		# Keyboard
device		ulpt		# Printer
device		umass		# Disks/Mass storage - Requires scbus and da
device		ums		# Mouse
d228 3
a230 3
device		aue		# ADMtek USB ethernet
device		cue		# CATC USB ethernet
device		kue		# Kawasaki LSI USB ethernet
@


1.246.2.6
log
@Activate soft updates in GENERIC by default (It is filtered from BOOTMFS)
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.5 2000/06/08 23:07:29 jhb Exp $
a34 1
options 	SOFTUPDATES		#Enable FFS soft updates support
@


1.246.2.7
log
@Add xe driver back.  It works for a while now in -stable and is needed in
GENERIC for successful installations using it.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.6 2000/06/22 06:03:12 peter Exp $
a195 2
# Xircom Ethernet
device		xe
@


1.246.2.8
log
@Add the 3ware ATA RAID driver
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.7 2000/07/13 16:13:46 imp Exp $
a115 1
device		twe		# 3ware Escalade
@


1.246.2.9
log
@MFC: bring the 'asr' driver for current DPT RAID controllers back to -STABLE.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.8 2000/07/20 02:51:02 msmith Exp $
d91 1
a110 4

# RAID controllers interfaced to the SCSI subsystem
device		asr		# DPT SmartRAID V, VI and Adaptec SCSI RAID
device		dpt		# DPT Smartcache - See LINT for options!
@


1.246.2.10
log
@Disable the 'twe' driver for the 4.1.1 release; there are issues with current
card firmware and the current driver which make it unadvisable to support
installing.  Doing this means that I can supply a fixed driver in a loadable
module once we have resolved the issue.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.9 2000/09/21 20:33:51 msmith Exp $
d119 1
a119 1
#device		twe		# 3ware Escalade
@


1.246.2.11
log
@MFC: Newbus'ify and bus_space'ify.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.10 2000/09/21 20:42:29 msmith Exp $
a189 1
device		fe0	at isa? port 0x300
d204 1
@


1.246.2.12
log
@MFC:
Remove the NCPU, NAPIC, NBUS, NINTR config options.  Make NAPIC,
NBUS, NINTR dynamic and set NCPU to a maximum of 16 under SMP.

Move MAXCPU from machine/smp.h to machine/param.h to expose MAXCPU
in the !SMP case and replace NCPUS with MAXCPU since they are
redundant.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.11 2000/09/22 10:01:48 nyan Exp $
d61 5
@


1.246.2.13
log
@MFC: bring the pcn(4) driver (and homePNA PHY driver that sort of goes
with it) over from -current. This includes today's minor update to support
the PCnet/PRO chip.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.12 2000/09/30 02:49:30 ps Exp $
a171 1
device		pcn		# AMD Am79C79x PCI 10/100 NICs
@


1.246.2.14
log
@MFC: (GENERIC.hints Rev.1.3)
Default the pcic to polling

reviewed in mobile mailing list
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.13 2000/10/03 18:46:52 wpaul Exp $
d144 2
a145 2
device		pcic0	at isa? irq 0 port 0x3e0 iomem 0xd0000
device		pcic1	at isa? irq 0 port 0x3e2 iomem 0xd4000 disable
@


1.246.2.15
log
@MFC: bring the 'twe' driver back from the dead.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.14 2000/10/05 00:45:17 sanpei Exp $
d114 1
a114 1
device		twe		# 3ware Escalade
@


1.246.2.16
log
@Comment out the le(4) driver; it seems broken at the moment.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.15 2000/10/12 01:47:16 msmith Exp $
d201 1
a201 1
#device		le0	at isa? port 0x300 irq 5 iomem 0xd0000
@


1.246.2.17
log
@MFC: the 'mly' driver for Mylex AcceleRAID and eXtremeRAID PCI:SCSI RAID
controllers.  This driver interfaces with CAM and thus does not require
any changes to libdisk, sysinstall, etc.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.16 2000/10/27 03:24:41 jkh Exp $
a108 1
device		mly		# Mylex AcceleRAID/eXtremeRAID
@


1.246.2.18
log
@MFC (it's a comment change).  Make the miibus requirement more obvious.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.17 2000/10/27 10:06:56 msmith Exp $
a170 1
# NOTE: Be sure to keep the 'device miibus' line in order to use these NICs!
@


1.246.2.19
log
@[MFC]
Add PC-Card/ISA SCSI host adpater drivers from NetBSD/pc98
(a NetBSD port for NEC PC-98x1 machines). They are ncv for NCR 53C500,
nsp for Workbit Ninja SCSI-3, and stg for TMC 18C30 and 18C50.

Also, pccard.conf, HARDWARE.TXT, and RELNOTES.TXT are changed for
new drivers.

Obtained from:	NetBSD/pc98
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.18 2000/10/28 22:33:42 nik Exp $
a97 4

device		ncv		# NCR 53C500
device		nsp		# Workbit Ninja SCSI-3
device		stg		# TMC 18C30/18C50
@


1.246.2.20
log
@MFC: the USB scanner driver. See SANE home page for supported USB scanners.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.19 2000/10/29 11:05:45 non Exp $
a236 1
device		uscanner	# Scanners
@


1.246.2.21
log
@Add the aac driver to GENERIC.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.20 2000/10/31 23:16:07 n_hibma Exp $
a115 1
device		aac		# Adaptec FSA RAID, Dell PERC2/PERC3
@


1.246.2.22
log
@Spelling fixes.

Submitted by:	Andy Farkas <andyf@@speednet.com.au> (partial)
Reviewed by:	gshapiro, jake, jhb, rwatson
Approved by:	jkh
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.21 2001/01/12 23:45:14 scottl Exp $
d85 1
a85 1
device		amd		# AMD 53C974 (Tekram DC-390(T))
d195 1
a195 1
# exists only as a PCMCIA device, so there is no ISA attachment needed
d202 1
a202 1
# those parameters here.
d213 1
a213 1
# Pseudo devices - the number indicates how many units to allocate.
@


1.246.2.23
log
@Add awi to GENERIC and LINT.  It was mistakenly not done when awi was MFC'd.
Move xe a little in GENERIC.

Approved by: jkh (he hopes that this won't overflow the floppy)
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.22 2001/03/07 06:43:55 gsutter Exp $
a193 4
# Xircom Ethernet
device		xe
# PRISM I IEEE 802.11b wireless NIC.
device		awi
d204 2
@


1.246.2.24
log
@MFC:

remove opsolete WC/TAGS/ATAPI_DMA options, they are now tuneables

Approved by: jkh
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.23 2001/03/07 08:08:42 imp Exp $
d80 1
@


1.246.2.25
log
@Move fxp so that it is in the miibus section.

Reminded by:  Andy Farkas <andyf@@speednet.com.au>
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.24 2001/04/05 17:23:10 sos Exp $
d169 1
a177 1
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
@


1.246.2.26
log
@MFC: move wx to be part of miibus requiring chipsets
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.25 2001/05/13 03:50:01 jlemon Exp $
d171 1
a185 1
device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
@


1.246.2.27
log
@Move tx(4) driver to the using miibus drivers group.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.26 2001/05/30 03:21:49 mjacob Exp $
d169 1
a182 1
device		tx		# SMC EtherPower II (83c170 ``EPIC'')
@


1.246.2.28
log
@MFC: `pcn' supports AMD Am79C97x cards, not Am79C79x cards.
@
text
@d18 1
a18 1
# $FreeBSD$
d176 1
a176 1
device		pcn		# AMD Am79C97x PCI 10/100 NICs
@


1.246.2.29
log
@MFC: Interface cloning support.  gif modularity and cloning.
stf modularity and removal of gif dependence.

Reviewed by:	brian
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.28 2001/07/19 05:40:42 dd Exp $
d222 1
a222 1
pseudo-device	gif		# IPv6 and IPv4 tunneling
@


1.246.2.30
log
@MFC new hwatch/dhwatch ddb commands for setting/deleting hardware
watchpoints within ddb.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.29 2001/07/24 19:10:16 brooks Exp $
a28 2

options		DDB
@


1.246.2.31
log
@Partial revert of last commit, I did not intend to commit "options
DDB" to GENERIC.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.30 2001/07/25 01:00:08 bsd Exp $
d29 2
@


1.246.2.32
log
@MFC: add miibus support for the Dlink DL10022 chips, as found on
the Netgear FA410-TX pccard. The "fa_select" program is no longer
needed to make these cards work. However, it may be necessary to
set the media type manually using "ifconfig media XXX" if autoneg
fails. "device miibus" is now required by the ed driver.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.31 2001/07/25 01:05:33 bsd Exp $
a188 1
# 'device ed' requires 'device miibus'
@


1.246.2.33
log
@MFC: add driver support for 3Com 3cR990 cards. Apologies if this re-bloats
the kernel after obrien de-bloated it: the driver has a compiled-in
firware image.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.32 2001/07/25 18:06:05 iedowse Exp $
a168 1
device		txp		# 3Com 3cR990 (``Typhoon'')
@


1.246.2.34
log
@MFC rev 1.177 of fd.c and 1.21 of fdc.h resp.: make the Y-E Data PCMCIA
floppy controller work.  The previous code was stale and didn't even
compile at all.

As per Hellmuth's suggestion, mention in a comment in GENERIC how to
configure the kernel for that FDC.

Tested by:	hm
Approved by:	murray
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.33 2001/07/30 17:31:40 wpaul Exp $
a69 4
#
# If you have a Toshiba Libretto with its Y-E Data PCMCIA floppy,
# don't use the above line for fdc0 but the following one:
#device		fdc0
@


1.246.2.35
log
@MFC support for the Diamond Rio MP3 player.

Hardware provided by: Andrew J Caines <A.J.Caines@@halplant.com>
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.246.2.34 2001/08/12 13:13:46 joerg Exp $
a245 1
device		urio		# Diamond Rio MP3 Player
@


1.246.2.36
log
@MFC the maxusers = 0 autosizing code.

Mike Silbersack is working on a more sophisticated version of this patch
but exams will prevent him from completing it prior to the 4.5 freeze, so
we decided to throw this code into 4.5 and Mike will revisit the issue
post-4.5.
@
text
@d18 1
a18 1
# $FreeBSD$
d26 1
a26 1
maxusers	0
@


1.246.2.37
log
@MFC: Enable UFS_DIRHASH in the GENERIC kernel.
@
text
@a35 1
options 	UFS_DIRHASH		#Improve performance on big directories
@


1.246.2.38
log
@There is still room on the MFSROOT floppy for i386.  Add 'bge' to
kern.flp and move if_txp.ko over to mfsroot.flp.

Tested on: 4.5-RC3
Approved by: rwatson
@
text
@a192 1
device		bge		# Broadcom BCM570x (``Tigon III'')
@


1.246.2.39
log
@Add support for Compaq SmartRAID 5* series raid controllers
This was already in -current GENERIC
@
text
@a117 1
device          ciss		# Compaq SmartRAID 5* series
@


1.246.2.40
log
@Fix minor style nit.
@
text
@d118 1
a118 1
device		ciss		# Compaq SmartRAID 5* series
@


1.246.2.41
log
@MFC of the relevant changes from current:
 - Add the aacp device for doing SCSI passthrough
 - Use locks for doing synchronous commands
 - Align DMA buffers
 - Add KMODDEPS line to the Makefile so that the linux dependency is caught.
@
text
@a121 1
device		aacp		# SCSI passthrough for aac (requires CAM)
@


1.246.2.42
log
@Bring the iir(4) driver back to -stable, at the request of the maintainer.
@
text
@a116 1
device          iir             # Intel Integrated RAID
@


1.246.2.43
log
@Support with Intel gigE cards with the EM driver, rather than the WX driver.

Approved by:	jhb(re)
@
text
@a176 1
device		em		# Intel PRO/1000 adapter Gigabit Ethernet Card (``Wiseman'')
d194 1
@


1.246.2.44
log
@Convert spaces to tab.
@
text
@d117 1
a117 1
device		iir		# Intel Integrated RAID
d153 1
a153 1
device		apm0	at nexus? disable flags 0x20 # Advanced Power Management
@


1.246.2.45
log
@Fix the link to the Handbook
@
text
@d7 1
a7 1
#    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/kernelconfig-config.html
@


1.246.2.46
log
@MFC MPT/Fusion driver
@
text
@a90 1
device 		mpt		# LSI-Logic MPT/Fusion
@


1.246.2.47
log
@Hook ahd into the build and take advantage of register pretty printing
in both the ahd and ahc drivers.
@
text
@a57 4
options		AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
					# output.  Adds ~128k to driver.
options		AHD_REG_PRETTY_PRINT	# Print register bitfields in debug 
					# output.  Adds ~215k to driver.
a88 1
device		ahd		# AHA39320/29320 and onboard AIC79xx devices
@


1.246.2.48
log
@Fix style nit.
@
text
@d96 1
a96 1
device		mpt		# LSI-Logic MPT/Fusion
@


1.246.2.49
log
@Use "options <tab>" rather than "options<tab><tab>".
@
text
@d56 1
a56 1
options 	ICMP_BANDLIM		#Rate limit bad replies
d58 1
a58 1
options 	AHC_REG_PRETTY_PRINT	# Print register bitfields in debug
d60 1
a60 1
options 	AHD_REG_PRETTY_PRINT	# Print register bitfields in debug 
d99 1
a99 1
options 	SYM_SETUP_LP_PROBE_MAP=0x40
@


1.246.2.50
log
@MFC GENERIC:1.355: Add device agp to GENERIC.

Some re-jostling of the install floppies for -STABLE may be required.
@
text
@a154 2
device		agp		# support several AGP chipsets

@


1.246.2.51
log
@Turn off the aacp device.  It's causing far too many problems and isn't
terribly useful during install.

Approved by:	re (jhb)
@
text
@d129 1
a129 1
#device		aacp		# SCSI passthrough for aac (requires CAM)
@


1.246.2.52
log
@Mark ISA network drivers with destructive probes disabled; they can
be enabled by the user should they be needed.

Approved by:	 re (murray)
@
text
@d208 1
a208 1
device		ed0	at isa? disable port 0x280 irq 10 iomem 0xd8000
d211 1
a211 1
device		fe0	at isa? disable port 0x300
d227 5
a231 5
device		ie0	at isa? disable port 0x300 irq 10 iomem 0xd0000
#device		le0	at isa? disable port 0x300 irq 5 iomem 0xd0000
device		lnc0	at isa? disable port 0x280 irq 10 drq 0
device		cs0	at isa? disable port 0x300
device		sn0	at isa? disable port 0x300 irq 10
@


1.246.2.53
log
@Add a commented-out HTT option to GENERIC similar to SMP and APIC_IO.

Requested by:	John Cagle <john.cagle@@hp.com>
Approved by:	re (murray)
@
text
@a66 3
# To support HyperThreading, HTT is needed in addition to SMP and APIC_IO
#options 	HTT			# HyperThreading Technology

@


1.246.2.54
log
@MFC: Add FireWire drivers to GENERIC and drivers.conf.
@
text
@a266 5

# FireWire support
device		firewire	# FireWire bus code
device		sbp		# SCSI over FireWire (Requires scbus and da)
device		fwe		# Ethernet over FireWire (non-standard!)
@


1.246.2.51.2.1
log
@Mark ISA network drivers with destructive probes disabled; they can
be enabled by the user should they be needed.

Approved by:	 re (murray)
@
text
@d208 1
a208 1
device		ed0	at isa? disable port 0x280 irq 10 iomem 0xd8000
d211 1
a211 1
device		fe0	at isa? disable port 0x300
d227 5
a231 5
device		ie0	at isa? disable port 0x300 irq 10 iomem 0xd0000
#device		le0	at isa? disable port 0x300 irq 5 iomem 0xd0000
device		lnc0	at isa? disable port 0x280 irq 10 drq 0
device		cs0	at isa? disable port 0x300
device		sn0	at isa? disable port 0x300 irq 10
@


1.246.2.51.2.2
log
@MFS: Add a commented out HTT kernel option for 4.8.

Approved by:	re (murray)
@
text
@a66 3
# To support HyperThreading, HTT is needed in addition to SMP and APIC_IO
#options 	HTT			# HyperThreading Technology

@


1.245
log
@Do some cleanups of the IPv6 stuff.  This is a non-functional change.

Approved by:	jkh
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.244 2000/02/26 22:09:31 jkh Exp $
d108 1
@


1.244
log
@Enable IPv6 support by default.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.243 2000/02/20 14:41:54 n_hibma Exp $
d208 2
a209 3
# for IPv6
pseudo-device	gif	4	#IPv6 and IPv4 tunneling
pseudo-device	faith	1	#for IPv6 and IPv4 translation
@


1.243
log
@Update the documentation to reflect Bill Paul's latest changes.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.242 2000/02/16 04:27:03 yokota Exp $
d32 1
d208 3
@


1.242
log
@Make it clear that 'options XSERVER' is for pcvt and not for syscons.

Submitted by: Doug Barton <Doug@@gorean.org>
Approved by: jkh
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.241 2000/02/04 07:02:53 jkh Exp $
d222 1
a222 1
# USB Ethernet
@


1.241
log
@Clean up POSIX options, syncronize generics.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.240 2000/02/01 09:32:04 n_hibma Exp $
d125 1
a125 1
#options 	XSERVER			# support for X server
@


1.240
log
@da0 -> da
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.239 2000/01/29 18:07:04 peter Exp $
d53 1
a53 2
options 	_KPOSIX_VERSION=199309L
options		ICMP_BANDLIM		# Rate limit bad replies
@


1.239
log
@Remove 'conflicts' token - it has been effectively doing absolutely
nothing for quite some time.  The only thing that cared was userconfig,
but it was for one invisible device so we never saw it's effects.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.238 2000/01/28 06:13:08 imp Exp $
d221 1
a221 1
#device		umass		# Disks/Mass storage - Requires scbus and da0
@


1.238
log
@Mitigate the stream.c attacks

o Drop all broadcast and multicast source addresses in tcp_input.
o Enable ICMP_BANDLIM in GENERIC.
o Change default to 200/s from 100/s.  This will still stop the attack, but
  is conservative enough to do this close to code freeze.

This is not the optimal patch for the problem, but is likely the least
intrusive patch that can be made for this.

Obtained from: Don Lewis and Matt Dillon.
Reviewed by: freebsd-security
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.237 2000/01/24 08:49:24 peter Exp $
d116 1
a116 1
device		vga0	at isa? conflicts
@


1.237
log
@Remove a bunch of no-op  "port ?" and "irq ?" declarations.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.236 2000/01/24 05:38:55 bde Exp $
d54 1
@


1.236
log
@Removed bogus quotes and unmangled related contractions.
"ktrace(1) syscall trace" -> "ktrace(1)".
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.235 2000/01/23 18:30:35 peter Exp $
d93 1
a93 1
device		adv0	at isa? port ? irq ?
d95 3
a97 3
device		bt0	at isa? port ? irq ?
device		aha0	at isa? port ? irq ?
device		aic0	at isa? port ? irq ?
d115 1
a115 1
device		vga0	at isa? port ? conflicts
d148 1
a148 1
device		ppc0	at isa? port? irq 7
d191 1
a191 1
device		fe0	at isa? port 0x300 irq ?
d194 1
a194 1
device		cs0	at isa? port 0x300 irq ?
d197 1
a197 1
#device		xe0	at isa? port? irq ?
@


1.235
log
@Some formatting cleanups and remove comments about numbers of units that
were intended to head off confusion about the trailing '0'.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.234 2000/01/23 14:46:19 peter Exp $
d37 1
a37 1
options 	NFS_ROOT		#NFS usable as root device, "NFS" req'ed
d40 1
a40 1
options 	CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
d47 1
a47 1
options 	KTRACE			#ktrace(1) syscall trace support
@


1.234
log
@Drop 'at ppbus?' and the trailing '0' from the ppbus children.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.233 2000/01/23 12:18:53 peter Exp $
a84 2
# A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is
# sufficient for any number of installed devices.
a99 1
# Only one of each of these is needed, they are dynamically allocated.
d149 5
a153 5
device		ppbus			# Parallel port bus (required)
device		lpt			# Printer
device		plip			# TCP/IP over parallel
device		ppi			# Parallel port interface device
#device		vpo			# Requires scbus and da
@


1.233
log
@Update GENERIC/LINT to leave out the useless digit at the end of pci
or other unwired devices.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.232 2000/01/23 04:29:17 imp Exp $
d153 4
a156 4
device		lpt0	at ppbus?	# Printer
device		plip0	at ppbus?	# TCP/IP over parallel
device		ppi0	at ppbus?	# Parallel port interface device
#device		vpo0	at ppbus?	# Requires scbus and da0
@


1.232
log
@Add the two wireless pccard nics.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.231 2000/01/21 20:19:18 wilko Exp $
d64 3
a66 3
device		isa0
device		eisa0
device		pci0
d76 5
a80 5
device		ata2
device		atadisk0	# ATA disk drives
device		atapicd0	# ATAPI CDROM drives
device		atapifd0	# ATAPI floppy drives
device		atapist0	# ATAPI tape drives
d87 7
a93 7
device		ahb0		# EISA AHA1742 family
device		ahc0		# AHA2940 and onboard AIC7xxx devices
device		amd0		# AMD 53C974 (Teckram DC-390(T))
device		dpt0		# DPT Smartcache - See LINT for options!
device		isp0		# Qlogic family
device		ncr0		# NCR/Symbios Logic
device		sym0		# NCR/Symbios Logic (newer chipsets)
d96 1
a96 1
device		adw0
d103 5
a107 5
device		scbus0		# SCSI bus (required)
device		da0		# Direct Access (disks)
device		sa0		# Sequential Access (tape etc)
device		cd0		# CD
device		pass0		# Passthrough device (direct SCSI access)
d110 2
a111 2
device		amr0		# AMI MegaRAID
device		mlx0		# Mylex DAC960 family
d140 1
a140 1
device		card0
d152 1
a152 1
device		ppbus0			# Parallel port bus (required)
d160 5
a164 5
device		de0		# DEC/Intel DC21x4x (``Tulip'')
device		fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
device		tx0		# SMC 9432TX (83c170 ``EPIC'')
device		vx0		# 3Com 3c590, 3c595 (``Vortex'')
device		wx0		# Intel Gigabit Ethernet Card (``Wiseman'')
d167 10
a176 10
device		miibus0		# MII bus support
device		dc0		# DEC/Intel 21143 and various workalikes
device		rl0		# RealTek 8129/8139
device		sf0		# Adaptec AIC-6915 (``Starfire'')
device		sis0		# Silicon Integrated Systems SiS 900/SiS 7016
device		ste0		# Sundance ST201 (D-Link DFE-550TX)
device		tl0		# Texas Instruments ThunderLAN
device		vr0		# VIA Rhine, Rhine II
device		wb0		# Winbond W89C840F
device		xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
d180 2
a181 2
device		ex0
device		ep0
d185 1
a185 1
device		wi0
d191 1
a191 1
device	an0
d216 9
a224 9
#device		uhci0		# UHCI PCI->USB interface
#device		ohci0		# OHCI PCI->USB interface
#device		usb0		# USB Bus (required)
#device		ugen0		# Generic
#device		uhid0		# "Human Interface Devices"
#device		ukbd0		# Keyboard
#device		ulpt0		# Printer
#device		umass0		# Disks/Mass storage - Requires scbus and da0
#device		ums0		# Mouse
d226 3
a228 3
#device		aue0		# ADMtek USB ethernet
#device		cue0		# CATC USB ethernet
#device		kue0		# Kawasaki LSI USB ethernet
@


1.231
log
@updated comments
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.230 2000/01/18 07:52:12 jkh Exp $
d185 1
a185 1
#device		wi0
d191 1
a191 1
# device	an0
@


1.230
log
@Enable POSIX P1003_1B extentions by default; there's no reason I can see
not to class them with the SYSV extentions as "optional but damn useful".

Also desired by:	wollman
@
text
@d2 1
a2 1
# GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.229 2000/01/14 20:40:58 wpaul Exp $
d43 1
a43 1
options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
@


1.229
log
@Add driver support for the Aironet 4500/4800 series wireless 802.11
NICs. (Finally!) The PCMCIA, ISA and PCI varieties are all supported,
though only the ISA and PCI ones will work on the alpha for now.
PCCARD, ISA and PCI attachments are all provided. Also provided an
ancontrol(8) utility for configuring the NIC, man pages, and updated
pccard.conf.sample. ISA cards are supported in both ISA PnP and hard-wired
mode, although you must configure the kernel explicitly to support the
hardwired mode since you have to know the I/O address and port ahead
of time.

Special thanks to Doug Ambrisko for doing the initial newbus hackery
and getting it to work in infrastructure mode.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.228 2000/01/14 08:16:28 peter Exp $
d51 3
@


1.228
log
@Add back the 'at ppbus?' for the lpt etc drivers.  Now it's used.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.227 2000/01/14 03:14:42 wpaul Exp $
d183 6
@


1.227
log
@Add device driver support for USB ethernet adapters based on the CATC
USB-EL1202A chipset. Between this and the other two drivers, we should
have support for pretty much every USB ethernet adapter on the market.
The only other USB chip that I know of is the SMC USB97C196, and right
now I don't know of any adapters that use it (including the ones made
by SMC :/ ).

Note that the CATC chip supports a nifty feature: read and write combining.
This allows multiple ethernet packets to be transfered in a single USB
bulk in/out transaction. However I'm again having trouble with large
bulk in transfers like I did with the ADMtek chip, which leads me to
believe that our USB stack needs some work before we can really make
use of this feature. When/if things improve, I intend to revisit the
aue and cue drivers. For now, I've lost enough sanity points.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.226 2000/01/13 07:01:12 mdodd Exp $
d148 6
a153 6
device		ppc0	at isa? port? flags 0x40 irq 7
device		ppbus0		# Parallel port bus (required)
device		lpt0		# Printer
device		plip0		# TCP/IP over parallel
device		ppi0		# Parallel port interface device
#device		vpo0		# Requires scbus and da0
@


1.226
log
@Remove the 'at isa? ...' bits for ex0.

Remove the confusing text about pccard and unit numbers for ep0.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.225 2000/01/12 02:30:42 obrien Exp $
d218 1
@


1.225
log
@Sort.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.224 2000/01/10 02:29:23 imp Exp $
d177 1
a177 3
device		ex0	at isa? port? irq?
# NOTE: This removes the isa attachment so that the pccard unit numbers
# come out right.
@


1.224
log
@Uncomment pcic device and put pccard in GENERIC.  PCCARD will be removed
in a little while as soon as I find all the places it is used in the
tree.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.223 2000/01/08 15:59:12 peter Exp $
d218 1
@


1.223
log
@s/controller/device/ as per config(8) changes
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.222 2000/01/05 04:27:11 wpaul Exp $
d137 3
a139 3
#device		card0
#device		pcic0	at isa?
#device		pcic1	at isa?
@


1.222
log
@Add device driver support for USB ethernet adapters based on the
Kawasaki LSI KL5KUSB101B chip, including the LinkSys USB10T, the
Entrega NET-USB-E45, the Peracom USB Ethernet Adapter, the 3Com
3c19250 and the ADS Technologies USB-10BT. This device is 10mbs
half-duplex only, so there's miibus or ifmedia support. This device
also requires firmware to be loaded into it, however KLSI allows
redistribution of the firmware images (I specifically asked about
this; they said it was ok).

Special thanks to Annelise Anderson for getting me in touch with
KLSI (eventually) and thanks to KLSI for providing the necessary
programming info.

Highlights:
- Add driver files to /sys/dev/usb
- update usbdevs and regenerate attendate files
- update usb_quirks.c
- Update HARDWARE.TXT and RELNOTES.TXT for i386 and alpha
- Update LINT, GENERIC and others for i386, alpha and pc98
- Add man page
- Add module
- Update sysinstall and userconfig.c
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.221 2000/01/04 11:15:02 mjacob Exp $
d61 3
a63 3
controller	isa0
controller	eisa0
controller	pci0
d66 1
a66 1
controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
d71 3
a73 3
controller	ata0	at isa? port IO_WD1 irq 14
controller	ata1	at isa? port IO_WD2 irq 15
controller	ata2
d84 13
a96 13
controller	ahb0		# EISA AHA1742 family
controller	ahc0		# AHA2940 and onboard AIC7xxx devices
controller	amd0		# AMD 53C974 (Teckram DC-390(T))
controller	dpt0		# DPT Smartcache - See LINT for options!
controller	isp0		# Qlogic family
controller	ncr0		# NCR/Symbios Logic
controller	sym0		# NCR/Symbios Logic (newer chipsets)

controller	adv0	at isa? port ? irq ?
controller	adw0
controller	bt0	at isa? port ? irq ?
controller	aha0	at isa? port ? irq ?
controller	aic0	at isa? port ? irq ?
d100 1
a100 1
controller	scbus0		# SCSI bus (required)
d111 1
a111 1
controller	atkbdc0	at isa? port IO_KBD
d137 1
a137 1
#controller	card0
d149 1
a149 1
controller	ppbus0		# Parallel port bus (required)
d153 1
a153 1
#controller	vpo0		# Requires scbus and da0
d164 1
a164 1
controller	miibus0		# MII bus support
d209 3
a211 3
#controller	uhci0		# UHCI PCI->USB interface
#controller	ohci0		# OHCI PCI->USB interface
#controller	usb0		# USB Bus (required)
d216 1
a216 1
#controller	umass0		# Disks/Mass storage - Requires scbus and da0
@


1.221
log
@add wx0 driver
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.220 1999/12/28 02:01:02 wpaul Exp $
d219 1
@


1.220
log
@This commit adds device driver support for the ADMtek AN986 Pegasus
USB ethernet chip. Adapters that use this chip include the LinkSys
USB100TX. There are a few others, but I'm not certain of their
availability in the U.S. I used an ADMtek eval board for development.
Note that while the ADMtek chip is a 100Mbps device, you can't really
get 100Mbps speeds over USB. Regardless, this driver uses miibus to
allow speed and duplex mode selection as well as autonegotiation.
Building and kldloading the driver as a module is also supported.

Note that in order to make this driver work, I had to make what some
may consider an ugly hack to sys/dev/usb/usbdi.c. The usbd_transfer()
function will use tsleep() for synchronous transfers that don't complete
right away. This is a problem since there are times when we need to
do sync transfers from an interrupt context (i.e. when reading registers
from the MAC via the control endpoint), where tsleep() us a no-no.
My hack allows the driver to have the code poll for transfer completion
subject to the xfer->timeout timeout rather that calling tsleep().
This hack is controlled by a quirk entry and is only enabled for the
ADMtek device.

Now, I'm sure there are a few of you out there ready to jump on me
and suggest some other approach that doesn't involve a busy wait. The
only solution that might work is to handle the interrupts in a kernel
thread, where you may have something resembling a process context that
makes it okay to tsleep(). This is lovely, except we don't have any
mechanism like that now, and I'm not about to implement such a thing
myself since it's beyond the scope of driver development. (Translation:
I'll be damned if I know how to do it.) If FreeBSD ever aquires such
a mechanism, I'll be glad to revisit the driver to take advantage of
it. In the meantime, I settled for what I perceived to be the solution
that involved the least amount of code changes. In general, the hit
is pretty light.

Also note that my only USB test box has a UHCI controller: I haven't
I don't have a machine with an OHCI controller available.

Highlights:

- Updated usb_quirks.* to add UQ_NO_TSLEEP quirk for ADMtek part.
- Updated usbdevs and regenerated generated files
- Updated HARDWARE.TXT and RELNOTES.TXT files
- Updated sysinstall/device.c and userconfig.c
- Updated kernel configs -- device aue0 is commented out by default
- Updated /sys/conf/files
- Added new kld module directory
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.219 1999/12/23 05:32:53 wpaul Exp $
d161 1
@


1.219
log
@Fix minor typo in comments about WaveLAN/IEEE driver: 802.1 -> 802.11
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.218 1999/12/22 05:52:04 obrien Exp $
d217 1
@


1.218
log
@Turn on the `sym' driver by default.  It lives well beside the `ncr' driver
now.  On one machine with <825a> and <875> controllers, `sym' correctly
attached.  On another one with only a <ncr 53c810 fast10 scsi>, the `ncr'
driver correctly attached.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.217 1999/12/19 20:33:05 billf Exp $
d180 1
a180 1
# WaveLAN/IEEE 802.1 wireless NICs. Note: the WaveLAN/IEEE really
@


1.217
log
@Borrow phk's axe and chop off the old soundcard-CDROM devices. We get
about 40k of savings from this, and these abominations are still in LINT
if anyone needs to use them.

Reviewed by:	jkh
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.216 1999/12/19 17:12:19 markm Exp $
d90 1
a90 1
#controller	sym0		# NCR/Symbios Logic (do not mix with ncr, it conflicts)
@


1.216
log
@Comment and order to reduce diffs. No functional change.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.215 1999/12/18 07:49:53 imp Exp $
a108 6

# Proprietary or custom CD-ROM Interfaces
device		wt0	at isa? port 0x300 irq 5 drq 1
device		mcd0	at isa? port 0x300 irq 10
device		matcd0	at isa? port 0x230
device		scd0	at isa? port 0x230
@


1.215
log
@spell isa right on sn0 line
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.214 1999/12/18 06:11:20 imp Exp $
d34 1
a35 1
options 	MFS			#Memory Filesystem
d183 2
d186 4
@


1.214
log
@Driver for the smc91xx series of ethernet chips.  Ported from PAO to
3.3R and then to -current.  The pccard support has been left in the
driver, but is presently non-functional because we are using the
isa_compat layer for the moment.

Obtained From: PAO
Sponsored by: Timing Solutions
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.213 1999/12/10 10:44:45 phk Exp $
d190 1
a190 1
device		sn0	at ias? port 0x300 irq 10
@


1.213
log
@Remove the if_ze and if_zp drivers.

These drivers were cloned from the ed and ep drivers back in 1994
when PCMCIA cards were a very new thing and we had no other support
for such devices.  They treated the PCIC (the chip which controls the
PCCARD slot) as part of their device and generally hacked their way
to success.  They have significantly bit-rotted relative to their
ancestor drivers (ed & ep) and they were a dead-end on the evolution
path to proper PCCARD support in FreeBSD.

They have been terminally broken since August 18 where mdodd forgot
them and nobody seems to have missed them enough to fix them since.

I found no outstanding PRs against these drivers.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.212 1999/12/08 09:19:36 sos Exp $
d190 1
@


1.212
log
@Finally use the new ata driver.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.211 1999/12/06 18:17:41 peter Exp $
a191 6

# PCCARD NIC drivers.
# ze and zp take over the pcic and cannot coexist with generic pccard
# support, nor the ed and ep drivers they replace.
#device		ze0	at isa? port 0x300 irq 10 iomem 0xd8000	
#device		zp0	at isa? port 0x300 irq 10 iomem 0xd8000
@


1.211
log
@Fold the pnp code into the base isa system to pave the way for PNPBIOS.

Reviewed by:	dfr (a few weeks ago)
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.210 1999/12/05 01:55:41 luoqi Exp $
d70 9
a78 24
# IDE controller and disks
controller	wdc0	at isa? port IO_WD1 irq 14
device		wd0	at wdc0 drive 0
device		wd1	at wdc0 drive 1

controller	wdc1	at isa? port IO_WD2 irq 15
device		wd2	at wdc1 drive 0
device		wd3	at wdc1 drive 1

# ATAPI devices on wdc?
device		wcd0		#IDE CD-ROM
device		wfd0		#IDE Floppy (e.g. LS-120)
device		wst0		#IDE Tape (e.g. Travan)

# The 'ATA' driver supports all ATA and ATAPI devices.
# It can reuse the majors of wd.c for booting purposes.
# You only need one "controller ata0" for it to find all
# PCI ATA/ATAPI devices on modern machines.
#controller	ata0
#device		atadisk0	# ATA disk drives
#device		atapicd0	# ATAPI CDROM drives
#device		atapifd0	# ATAPI floppy drives
#device		atapist0	# ATAPI tape drives
#options 	ATA_STATIC_ID		#Static dev number like old `wd' driver
@


1.210
log
@Reinstate the aic driver.

PR:		conf/15187
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.209 1999/12/04 17:41:18 wpaul Exp $
a61 1
controller	pnp0			# PnP support for ISA
@


1.209
log
@Add the if_dc driver and remove all of the al, ax, dm, pn and mx drivers
which it replaces. The new driver supports all of the chips supported
by the ones it replaces, as well as many DEC/Intel 21143 10/100 cards.

This also completes my quest to convert things to miibus and add
Alpha support.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.208 1999/12/03 00:16:20 msmith Exp $
d112 1
@


1.208
log
@Remove the 'gzip' image activator.  We're not using a.out anymore, so save
ourselves just over 8k.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.207 1999/12/02 03:13:10 jlemon Exp $
a177 1
device		ax0		# ASIX AX88140A
a179 1
device		pn0		# Lite-On 82c168/82c169 (``PNIC'')
d185 1
a185 3
device		al0		# ADMtek AL981/AN985 (``Comet''/``Centaur'')
device		dm0		# Davicom DM9100/DM9102
device		mx0		# Macronix 98713/98715/98725 (``PMAC'')
@


1.207
log
@Remove code to select APM version with flags to the apm0 device.  This
code has been disabled for the last 4 months.

Prodded into action by:	 n_hibma
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.206 1999/12/02 02:53:08 msmith Exp $
a224 1
pseudo-device	gzip		# Exec gzipped a.out's
@


1.206
log
@Add the AMI MegaRAID and Mylex DAC960 drivers.  Installation to arrays
on these controllers is now no different to the process for any other
supported disk controller.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.205 1999/11/28 00:59:03 obrien Exp $
d155 1
a155 1
device		apm0    at nexus? disable flags 0x31 # Advanced Power Management
@


1.205
log
@Sort PCI SCSI controlers.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.204 1999/11/28 00:48:13 obrien Exp $
d120 4
@


1.204
log
@/sys adjustments to add the `sym' controler driver.

This is commented out in GENERIC as you cannot mix `sym' with `ncr' right now.
Note that LINT is no more broken by this commit.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.203 1999/11/27 23:25:17 obrien Exp $
d98 1
a98 1
# A single entry for any of these controllers (ncr, ahb, ahc) is
a99 2
controller	ncr0		# NCR/Symbios Logic
#controller	sym0		# NCR/Symbios Logic (do not mix with ncr, it conflicts)
d103 1
d105 2
a106 1
controller	dpt0		# DPT Smartcache - See LINT for options!
@


1.203
log
@Add a commented out 'ATA' driver config block to help assist -CURRENT
people to migrate to this driver since it will be the default IDE/ATA/ATAPI
driver in 4.0-R.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.202 1999/11/26 20:08:39 phk Exp $
d101 1
@


1.202
log
@Retire MFS_ROOT and MFS_ROOT_SIZE options from the MFS implementation.

Add MD_ROOT and MD_ROOT_SIZE options to the md driver.

Make the md driver handle MFS_ROOT and MFS_ROOT_SIZE options for compatibility.

Add md driver to GENERIC, PCCARD and LINT.

This is a cleanup which removes the need for some of the worse hacks in
MFS:  We really want to have a rootvnode but MFS on a preloaded image
doesn't really have one.  md is a true device, so it is less trouble.

This has been tested with make release, and if people remember to add
the "md" pseudo-device to their kernels, PicoBSD should be just fine
as well.  If people have no other use for MFS, it can be removed from
the kernel.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.201 1999/11/22 11:13:00 shin Exp $
d84 12
@


1.201
log
@move INET6 option from GENERIC to LINT.

Thanks for Brian Fundakowski Feldman and Dag-Erling Smorgrav,
to give me the comment and the patch.

Submitted by:Dag-Erling Smorgrav
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.200 1999/11/22 02:44:48 shin Exp $
d34 1
a35 1
options 	MFS_ROOT		#MFS usable as root device, "MFS" req'ed
d209 1
@


1.200
log
@KAME netinet6 basic part(no IPsec,no V6 Multicast Forwarding, no UDP/TCP
for IPv6 yet)

With this patch, you can assigne IPv6 addr automatically, and can reply to
IPv6 ping.

Reviewed by: freebsd-arch, cvs-committers
Obtained from: KAME project
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.199 1999/11/01 04:02:56 peter Exp $
a31 1
#options 	"INET6"			#IPv6
@


1.199
log
@Update examples using 'disk' and 'tape' - they used to have magic meaning
to config(8) for static device tables that have not existed for quite
some time.  They have been aliases for 'device' for a while, and "tape"
went away entirely as it wasn't used anywhere (except in an example
in LINT.. "fixed").
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.198 1999/10/27 06:30:10 mdodd Exp $
d32 1
@


1.198
log
@Modify the entries regarding the 'ep' driver to take into account
my recent changes to that driver.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.197 1999/10/25 02:41:57 imp Exp $
d68 2
a69 2
disk		fd0	at fdc0 drive 0
disk		fd1	at fdc0 drive 1
d73 2
a74 2
disk		wd0	at wdc0 drive 0
disk		wd1	at wdc0 drive 1
d77 2
a78 2
disk		wd2	at wdc1 drive 0
disk		wd3	at wdc1 drive 1
@


1.197
log
@Massive rewrite of pccard to convert it to newbus.
o Gut the compatibility interface, you now must attach with newbus.
o Unit numbers from pccardd are now ignored.  This may change the units
  assigned to a card.  It now uses the first available unit.
o kill old skeleton code that is now obsolete.
o Use newbus attachment code.
o cleanup interfile dependencies some.
o kill list of devices per slot.  we use the device tree for what we need.
o Remove now obsolete code.
o The ep driver (and maybe ed) may need some config file tweaks to
  allow it to attach.  See config files that were committed for examples
  on how to do this.

Drivers to be commited shortly.

This is an interrum fix until the new pccard.  ed, ep and sio will be
supported by me with this release, although others are welcome to try
to support other devices before new pccard is working.

I plan on doing minimal further work on this code base.  Be careful
when upgrading, since this code is known to work on my laptop and
those of a couple others as well, but your milage may vary.

BUGS TO BE FIXED:

o system memory isn't allocated yet, it will be soon.
o No devices actually have a pccard newbus attach in the tree.

BUGS THAT MIGHT BE FIXED:

o card removal, including suspend, usually hangs the system.

Many thanks to Peter Wemm and Doug Rabson for helping me to fill in
the missing bits of New Bus understanding at FreeBSD Con '99.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.196 1999/10/22 04:36:52 n_hibma Exp $
d183 3
a186 1
device		ed0	at isa? port 0x280 irq 10 iomem 0xd8000
a187 5
# NOTE: if you configure ep0 for pccard, use
# device	ep0
# instead.
device		ep0	at isa? port 0x300 irq 10
device		ex0	at isa? port? irq?
@


1.196
log
@From: src/sys/i386/conf/PCCARD

revision 1.21
date: 1999/10/15 17:29:20;  author: imp;  state: Exp;  lines: +3 -3
Reorganize the attachement point for pcic (it was unattached and
floating before).  Attach pccard devices to pcic, one per slot
(although this may change to one per pcic).  pcic is now attached to
isa (to act as a bridge) and pccard is attached to pcic, cbb and
pc98ic (the last two are card bus bridge and the pc98ic version of
pcic, neither of which are in the tree yet).  Move pccard compat code
into pccard/pccard_compat.c.

THIS REQUIRES A CONFIG FILE CHANGE.  You must change your pcic/card
entries to be:
# PCCARD (PCMCIA) support
controller	pcic0	at isa?
controller	pcic1	at isa?
controller	card0

The old system was upside down and this corrects that problem.  It
will make it easier to add support for YENTA pccard/card bus bridges.

Much more cleanup needs to happen before newbus devices can have
pccard attachments.  My previous commit's comments were premature.

Forgotten by:	imp
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.195 1999/10/16 05:24:12 wpaul Exp $
d186 3
@


1.195
log
@Convert the mx driver to miibus.

In order to make this work, I created a pseudo-PHY driver to deal with
Macronix chips that use the built-in NWAY support and symbol mode port.
This is actually all of them, with the exception of the original MX98713
which presents its NWAY support via the MII serial interface.

The mxphy driver actually manipulates the controller registers directly
rather than using the miibus_readreg()/miibus_writereg() bus interface
since there are no MII registers to read. The mx driver itself pretends
that the NWAY interface is a PHY locayed at MII address 31 for the sole
purpose of allowing the mxphy_probe() routine to know when it needs to
attach to a host controller.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.194 1999/10/15 07:07:41 obrien Exp $
d142 2
a143 2
#device		pcic0	at card?
#device		pcic1	at card?
@


1.194
log
@Acutally our style is "options\x20\x09".

As BDE says:  "options\x09\x09foo" looks quite different from
"options\x20\x09foo" after adding a one or two character prefix.

Notice by:	BDE
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.193 1999/10/14 11:33:57 obrien Exp $
a163 1
device		mx0		# Macronix 98713/98715/98725 (``PMAC'')
d172 1
@


1.193
log
@Like it or not, we use ^I's not 0x20 to align things in this file.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.192 1999/09/22 05:07:49 wpaul Exp $
d47 4
a50 4
options		KTRACE			#ktrace(1) syscall trace support
options		SYSVSHM			#SYSV-style shared memory
options		SYSVMSG			#SYSV-style message queues
options		SYSVSEM			#SYSV-style semaphores
@


1.192
log
@Spruce up the ADMtek driver: conver to newbus, miibus and add support
for the AN985 "Centaur" chip, which is apparently the next genetation
of the "Comet." The AN985 is also a tulip clone and is similar to the
AL981 except that it uses a 99C66 EEPROM and a serial MII interface
(instead of direct access to the PHY registers).

Also updated various documentation to mention the AN985 and created
a loadable module.

I don't think there are any cards that use this chip on the market yet:
the datasheet I got from ADMtek has boxes with big X's in them where the
diagrams should be, and the sample boards I got have chips without any
artwork on them.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.191 1999/09/19 22:03:31 wpaul Exp $
d47 4
a50 4
options 	KTRACE			#ktrace(1) syscall trace support
options         SYSVSHM			#SYSV-style shared memory
options         SYSVMSG			#SYSV-style message queues
options         SYSVSEM			#SYSV-style semaphores
d93 1
a93 1
controller      dpt0		# DPT Smartcache - See LINT for options!
@


1.191
log
@Convert the VIA Rhine driver to miibus.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.190 1999/09/11 16:05:48 gibbs Exp $
a160 1
device		al0		# ADMtek AL981 (``Comet'')
d171 1
@


1.190
log
@Add the AMD driver.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.189 1999/09/09 18:30:58 peter Exp $
a167 1
device		vr0		# VIA Rhine, Rhine II
d178 1
@


1.189
log
@Seperate the miibus pci ethernet drivers from the non-miibus drivers so
it's a little clearer which is which from just looking at GENERIC.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.188 1999/09/06 06:14:28 wpaul Exp $
d91 1
@


1.188
log
@This commit adds driver support for PCI fast ethernet NICs based on
the Davicom DM9100 and DM9102 chipsets, including the Jaton Corporation
XPressNet. Datasheet is available from www.davicom8.com.

The DM910x chips are still more tulip clones. The API is reproduced
pretty faithfully, unfortunately the performance is pretty bad. The
transmitter seems to have a lot of problems DMAing multi-fragment
packets. The only way to make it work reliably is to coalesce transmitted
packets into a single contiguous buffer. The Linux driver (written by
Davicom) actually does something similar to this. I can't recomment this
NIC as anything more than a "connectivity solution."

This driver uses newbus and miibus and is supported on both i386
and alpha platforms.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.187 1999/09/05 21:01:01 wpaul Exp $
a157 2
# MII bus support, required for some 10/100 NICs
controller	miibus0
a162 1
device		dm0		# Davicom DM9100/DM9102
d166 7
a177 3
device		tx0		# SMC 9432TX (83c170 ``EPIC'')
device		vr0		# VIA Rhine, Rhine II
device		vx0		# 3Com 3c590, 3c595 (``Vortex'')
@


1.187
log
@This commit adds driver support for the Silicon Integrated Systems
SiS 900 and SiS 7016 PCI fast ethernet chipsets. Full manuals for the
SiS chips can be found at www.sis.com.tw.

This is a fairly simple chipset. The receiver uses a 128-bit multicast
hash table and single perfect entry for the station address. Transmit and
receive DMA and FIFO thresholds are easily tuneable. Documentation is
pretty decent and performance is not bad, even on my crufty 486. This
driver uses newbus and miibus and is supported on both the i386 and
alpha architectures.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.186 1999/09/01 09:01:54 jkh Exp $
d165 1
@


1.186
log
@Try and commit the tun comment fix again; I have no idea why there
was a clash the last time, leading me to think that it had already
been fixed.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.185 1999/09/01 00:51:23 brian Exp $
d170 1
@


1.185
log
@ppp(1) -> ppp(8)
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.184 1999/08/28 00:43:31 peter Exp $
d202 1
a202 1
pseudo-device	tun		# Packet tunnel, for ppp(8)
@


1.184
log
@$Id$ -> $FreeBSD$
@
text
@d18 1
a18 1
# $FreeBSD$
d202 1
a202 1
pseudo-device	tun		# Packet tunnel, for ppp(1)
@


1.183
log
@This commit adds device driver support for the Sundance Technologies ST201
PCI fast ethernet controller. Currently, the only card I know that uses
this chip is the D-Link DFE-550TX. (Don't ask me where to buy these: the
only cards I have are samples sent to me by D-Link.)

This driver is the first to make use of the miibus code once I'm sure
it all works together nicely, I'll start converting the other drivers.

The Sundance chip is a clone of the 3Com 3c90x Etherlink XL design
only with its own register layout. Support is provided for ifmedia,
hardware multicast filtering, bridging and promiscuous mode.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.182 1999/08/15 09:54:56 phk Exp $
@


1.182
log
@Give if_tun the "almost clone" makeover.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.181 1999/08/15 09:38:20 phk Exp $
d158 3
d170 1
@


1.181
log
@Give BPF the "almost-clone" update.  If you need more of them, make
more entries in /dev and be happy you don't need to recompile your
kernel.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.180 1999/08/08 19:28:57 phk Exp $
d198 1
a198 1
pseudo-device	tun	1	# Packet tunnel, for ppp(1)
@


1.180
log
@Make the pty driver as close to a cloning device as we can get for now,
we create the pty on the fly when it is first opened.

If you run out of ptys now, just MAKEDEV some more.

This also demonstrate the use of dev_t->si_tty_tty and dev_t->si_drv1
in a device driver.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.179 1999/08/07 01:42:08 jkh Exp $
d204 1
a204 1
pseudo-device	bpf	4	#Berkeley packet filter
@


1.179
log
@Enable bpf by default.  There was no significant dissention to my proposal
of 2 weeks ago that this be done, and anyone who wishes to make bpf more
selective according to securelevel or compile-time options is more
than free to do so.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.178 1999/07/25 04:32:43 wpaul Exp $
d199 1
a199 1
pseudo-device	pty	16	# Pseudo-ttys (telnet etc)
@


1.178
log
@This commit adds device driver support for Adaptec Duralink PCI fast
ethernet controllers based on the AIC-6915 "Starfire" controller chip.
There are single port, dual port and quad port cards, plus one 100baseFX
card. All are 64-bit PCI devices, except one single port model.

The Starfire would be a very nice chip were it not for the fact that
receive buffers have to be longword aligned. This requires buffer
copying in order to achieve proper payload alignment on the alpha.
Payload alignment is enforced on both the alpha and x86 platforms.
The Starfire has several different DMA descriptor formats and transfer
mechanisms. This driver uses frame descriptors for transmission which
can address up to 14 packet fragments, and a single fragment descriptor
for receive. It also uses the producer/consumer model and completion
queues for both transmit and receive. The transmit ring has 128
descriptors and the receive ring has 256.

This driver supports both FreeBSD/i386 and FreeBSD/alpha, and uses newbus
so that it can be compiled as a loadable kernel module. Support for BPF
and hardware multicast filtering is included.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.177 1999/07/13 08:08:20 obrien Exp $
d203 2
a204 2
# Be aware of the legal and administrative consequences of enabling this!
#pseudo-device	bpf	4	#Berkeley packet filter
@


1.177
log
@Move the xe0 driver back where it was.  It was misleading where it was as it
does not take over the PCIC, it does require PCCARD support, and it doesn't
replace any existing driver.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.176 1999/07/06 19:22:38 des Exp $
d166 1
@


1.176
log
@Rename bpfilter to bpf.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.175 1999/06/29 18:55:53 peter Exp $
d183 2
a188 1
#device		xe0	at isa? port? irq ?
@


1.175
log
@Put on my asbestos suit and attempt to tidy up and add some simple docs
or notes to make it much more obvious what things are for people who
have not committed LINT to memory yet.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.174 1999/06/20 03:36:46 jkh Exp $
d200 1
a200 1
# The `bpfilter' pseudo-device enables the Berkeley Packet Filter.
d202 1
a202 1
#pseudo-device	bpfilter 4	#Berkeley packet filter
@


1.174
log
@Clean up some of the documentation at the top.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.173 1999/06/15 13:14:39 des Exp $
d30 21
a50 17
options		MATH_EMULATE		#Support for x87 emulation
options		INET			#InterNETworking
options		FFS			#Berkeley Fast Filesystem
options		FFS_ROOT		#FFS usable as root device [keep this!]
options		MFS			#Memory Filesystem
options		MFS_ROOT		#MFS usable as root device, "MFS" req'ed
options		NFS			#Network Filesystem
options		NFS_ROOT		#NFS usable as root device, "NFS" req'ed
options		MSDOSFS			#MSDOS Filesystem
options		CD9660			#ISO 9660 Filesystem
options		CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
options		PROCFS			#Process filesystem
options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
options		UCONSOLE		#Allow users to grab the console
options		USERCONFIG		#boot -c editor
options		VISUAL_USERCONFIG	#visual boot -c editor
d53 2
a54 2
#options	SMP			# Symmetric MultiProcessor Kernel
#options	APIC_IO			# Symmetric (APIC) I/O
d56 4
a59 4
#options	NCPU=2			# number of CPUs
#options	NBUS=4			# number of busses
#options	NAPIC=1			# number of IO APICs
#options	NINTR=24		# number of INTs
d66 1
d71 1
d85 1
d88 5
a92 9
controller	ncr0
controller	ahb0
controller	ahc0
controller	isp0

# This controller offers a number of configuration options, too many to
# document here  - see the LINT file in this directory and look up the
# dpt0 entry there for much fuller documentation on this.
controller      dpt0
d99 7
a105 6
controller	scbus0

device		da0	#Only need one of these, the code dynamically grows
device		sa0
device		pass0
device		cd0
d107 1
d110 1
a110 3

controller	matcd0	at isa? port 0x230

d128 2
a129 2
#options		XSERVER			# support for X server
#options		FAT_CURSOR		# start with block cursor
d131 1
a131 1
#options		PCVT_SCANSET=2		# IBM keyboards are non-std
d133 1
d136 1
a136 3
#
# Laptop support (see LINT for more options)
#
d144 1
d152 46
a197 45
controller	ppbus0
device		lpt0	at ppbus?
device		plip0	at ppbus?
device		ppi0	at ppbus?
#controller	vpo0	at ppbus?

#
# The following Ethernet NICs are all PCI devices.
#
device al0		# ADMtek AL981 (``Comet'')
device ax0		# ASIX AX88140A
device de0		# DEC/Intel DC21x4x (``Tulip'')
device fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
device mx0		# Macronix 98713/98715/98725 (``PMAC'')
device pn0		# Lite-On 82c168/82c169 (``PNIC'')
device rl0		# RealTek 8129/8139
device tl0		# Texas Instruments ThunderLAN
device tx0		# SMC 9432TX (83c170 ``EPIC'')
device vr0		# VIA Rhine, Rhine II
device vx0		# 3Com 3c590, 3c595 (``Vortex'')
device wb0		# Winbond W89C840F
device xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')

# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
# Right now it appears that the ie0 must be probed before ep0. See
# revision 1.20 of this file.
device ed0 at isa? port 0x280 irq 10 iomem 0xd8000
device ie0 at isa? port 0x300 irq 10 iomem 0xd0000
device ep0 at isa? port 0x300 irq 10
device ex0 at isa? port? irq?
device fe0 at isa? port 0x300 irq ?
device le0 at isa? port 0x300 irq 5 iomem 0xd0000
device lnc0 at isa? port 0x280 irq 10 drq 0
#device xe0 at isa? port? irq ?
#device ze0 at isa? port 0x300 irq 10 iomem 0xd8000
#device zp0 at isa? port 0x300 irq 10 iomem 0xd8000
device cs0 at isa? port 0x300 irq ?

pseudo-device	loop
pseudo-device	ether
pseudo-device	sl	1
pseudo-device	ppp	1
pseudo-device	tun	1
pseudo-device	pty	16
d200 2
a201 15
# KTRACE enables the system-call tracing facility ktrace(2).
# This adds 4 KB bloat to your kernel, and slightly increases
# the costs of each syscall.
options		KTRACE		#kernel tracing

# This provides support for System V shared memory and message queues.
#
options         SYSVSHM
options         SYSVMSG
options         SYSVSEM

#  The `bpfilter' pseudo-device enables the Berkeley Packet Filter.  Be
#  aware of the legal and administrative consequences of enabling this
#  option.  The number of devices determines the maximum number of
#  simultaneous BPF clients programs runnable.
d205 9
a213 10
#controller	uhci0
#controller	ohci0
#controller	usb0
#
#device		ugen0
#device		uhid0
#device		ukbd0
#device		ulpt0
#controller	umass0
#device		ums0
@


1.173
log
@Kill option FAILSAFE.

PR:		i386/12187
Approved by:	bde
@
text
@d4 2
a5 5
# For more information read the handbook part System Administration -> 
# Configuring the FreeBSD Kernel -> The Configuration File. 
# The handbook is available in /usr/share/doc/handbook or online as
# latest version from the FreeBSD World Wide Web server 
# <URL:http://www.FreeBSD.ORG/>
d7 9
a15 2
# An exhaustive list of options and more detailed explanations of the 
# device lines is present in the ./LINT configuration file. If you are 
d18 1
a18 1
#	$Id: GENERIC,v 1.172 1999/05/21 04:37:35 wpaul Exp $
@


1.172
log
@This commit adds driver support for PCI fast ethernet cards based on the
ADMtek AL981 "Comet" chipset. The AL981 is yet another DEC tulip clone,
except with simpler receive filter options. The AL981 has a built-in
transceiver, power management support, wake on LAN and flow control.
This chip performs extremely well; it's on par with the ASIX chipset
in terms of speed, which is pretty good (it can do 11.5MB/sec with TCP
easily).

I would have committed this driver sooner, except I ran into one problem
with the AL981 that required a workaround. When the chip is transmitting
at full speed, it will sometimes wedge if you queue a series of packets
that wrap from the end of the transmit descriptor list back to the
beginning. I can't explain why this happens, and none of the other tulip
clones behave this way. The workaround this is to just watch for the end
of the transmit ring and make sure that al_start() breaks out of its
packet queuing loop and waiting until the current batch of transmissions
completes before wrapping back to the start of the ring. Fortunately, this
does not significantly impact transmit performance.

This is one of those things that takes weeks of analysis just to come
up with two or three lines of code changes.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.171 1999/05/20 20:02:34 n_hibma Exp $
a40 1
options		FAILSAFE		#Be conservative
@


1.171
log
@usbdi.h:
        Implement priorities.
GENERIC, LINT, files:
        Remove remarks about ordering of device names.
GENERIC, LINT:
        Sort the devices alphabetically in LINT and GENERIC.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.170 1999/05/14 03:57:23 obrien Exp $
d155 1
@


1.170
log
@Add the `xe' Xircom PC Card driver.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.169 1999/05/09 16:45:52 phk Exp $
d214 4
a217 4
# for the moment we have to specify the priorities of the device
# drivers explicitly by the ordering in the list below. This will
# be changed in the future.
#
a219 4
#device		ukbd0
#device		ulpt0
#device		uhid0
#device		ugen0
@


1.169
log
@Major lobotomy of config(8).  The

        config kernel mumble mumble

line has been obsoleted and removed and with it went all knowledge of
devices on the part of config.

You can still configure a root device (which is used if you give
the "-r" flag) but now with an option:

        options         ROOTDEVNAME=\"da0s2e\"

The string is parsed by the same code as at the "boot -a" prompt.

At the same time, make the "boot -a" prompt both more able and more
informative.

ALPHA/PC98 people:  You will have to adapt a few simple changes
(defining rootdev and dumpdev somewhere else) before config works
for you again, sorry, but it's all in the name of progress.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.168 1999/05/04 00:15:15 msmith Exp $
d179 1
@


1.168
log
@Disable the ppc chipset-specific probes by default.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.167 1999/05/02 21:54:02 n_hibma Exp $
a43 2

config		kernel	root on wd0
@


1.167
log
@Add driver for the Iomega Zip 100 drive.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.166 1999/04/24 21:45:44 peter Exp $
d147 1
a147 1
device		ppc0	at isa? port? irq 7
@


1.166
log
@De-quote where possible and minor tweaks.  depends on a current config(8).
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.165 1999/04/24 16:04:16 peter Exp $
d211 3
a213 3
#controller    uhci0
#controller    ohci0
#controller    usb0
d219 6
a224 5
#device        ums0
#device        ukbd0
#device        ulpt0
#device        uhid0
#device        ugen0
@


1.165
log
@Drop the tty/net/bio/cam interrupt class labels, they are meaninless here
now.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.164 1999/04/19 11:53:36 peter Exp $
d16 5
a20 5
machine		"i386"
cpu		"I386_CPU"
cpu		"I486_CPU"
cpu		"I586_CPU"
cpu		"I686_CPU"
d24 1
a24 1
#makeoptions	DEBUG="-g"		#Build kernel with gdb(1) debug symbols
d35 2
a36 2
options		"CD9660"		#ISO 9660 Filesystem
options		"CD9660_ROOT"		#CD-ROM usable as root. "CD9660" req'ed
d38 1
a38 1
options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
d61 1
a61 1
controller	fdc0	at isa? port "IO_FD1" irq 6 drq 2
d65 1
a65 1
controller	wdc0	at isa? port "IO_WD1" irq 14
d69 1
a69 1
controller	wdc1	at isa? port "IO_WD2" irq 15
d73 1
d76 1
d97 1
a97 2
device		da0

a98 1

d100 1
a100 2

device		cd0	#Only need one of these, the code dynamically grows
d121 1
d141 4
a144 4
device		sio0	at isa? port "IO_COM1" flags 0x10 irq 4
device		sio1	at isa? port "IO_COM2" irq 3
device		sio2	at isa? disable port "IO_COM3" irq 5
device		sio3	at isa? disable port "IO_COM4" irq 9
a203 1

a208 1

@


1.164
log
@Drop the 'at nexus?' from the busses, it's not used.
Reactivate eisa0 and pnp0 in GENERIC, they work..  (eisa has been converted
but pnp still (for the most part) works the old way).
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.163 1999/04/19 10:18:34 brian Exp $
d61 1
a61 1
controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2
d65 1
a65 1
controller	wdc0	at isa? port "IO_WD1" bio irq 14
d69 1
a69 1
controller	wdc1	at isa? port "IO_WD2" bio irq 15
d88 1
a88 1
controller	adv0	at isa? port ? cam irq ?
d90 2
a91 2
controller	bt0	at isa? port ? cam irq ?
controller	aha0	at isa? port ? cam irq ?
d103 2
a104 2
device		wt0	at isa? port 0x300 bio irq 5 drq 1
device		mcd0	at isa? port 0x300 bio irq 10
d106 1
a106 1
controller	matcd0	at isa? port 0x230 bio
d108 1
a108 1
device		scd0	at isa? port 0x230 bio
d112 2
a113 2
device		atkbd0	at atkbdc? tty irq 1
device		psm0	at atkbdc? tty irq 12
d121 1
a121 1
device		sc0	at isa? tty
d123 1
a123 1
#device		vt0	at isa? tty
d141 4
a144 4
device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4
device		sio1	at isa? port "IO_COM2" tty irq 3
device		sio2	at isa? disable port "IO_COM3" tty irq 5
device		sio3	at isa? disable port "IO_COM4" tty irq 9
d147 1
a147 1
device		ppc0	at isa? port? tty irq 7
d174 10
a183 10
device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000
device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000
device ep0 at isa? port 0x300 net irq 10
device ex0 at isa? port? net irq?
device fe0 at isa? port 0x300 net irq ?
device le0 at isa? port 0x300 net irq 5 iomem 0xd0000
device lnc0 at isa? port 0x280 net irq 10 drq 0
#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000
#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000
device cs0 at isa? port 0x300 net irq ?
@


1.163
log
@Spelling police
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.162 1999/04/16 21:22:07 peter Exp $
d56 4
a59 4
controller	isa0	at nexus?
#controller	pnp0			# PnP support for ISA
#controller	eisa0
controller	pci0	at nexus?
@


1.162
log
@Bring the 'new-bus' to the i386.  This extensively changes the way the
i386 platform boots, it is no longer ISA-centric, and is fully dynamic.
Most old drivers compile and run without modification via 'compatability
shims' to enable a smoother transition.  eisa, isapnp and pccard* are
not yet using the new resource manager.  Once fully converted, all drivers
will be loadable, including PCI and ISA.

(Some other changes appear to have snuck in, including a port of Soren's
 ATA driver to the Alpha.  Soren, back this out if you need to.)

This is a checkpoint of work-in-progress, but is quite functional.

The bulk of the work was done over the last few years by Doug Rabson and
Garrett Wollman.

Approved by:	core
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.161 1999/04/16 18:27:18 jkh Exp $
d110 1
a110 1
# atkbdc0 controlls both the keyboard and the PS/2 mouse
@


1.161
log
@Add SYSVSEM so that newer versions of Xaccel don't require a kernel
compile just to work.  We have the room now, so what the heck.

Reqested by:    Thomas Roell <roell@@xig.com>
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.160 1999/04/16 16:17:05 n_hibma Exp $
d56 4
a59 4
controller	isa0
controller	pnp0			# PnP support for ISA
controller	eisa0
controller	pci0
d111 3
a113 3
controller	atkbdc0	at isa? port IO_KBD tty
device		atkbd0	at isa? tty irq 1
device		psm0	at isa? tty irq 12
d129 1
a129 1
device		npx0	at isa? port IO_NPX irq 13
d134 1
a134 1
device		apm0    at isa?	disable	flags 0x31 # Advanced Power Management
d181 2
a182 2
device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000
device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000
@


1.160
log
@Remove the entries for umodem and ucom. These drivers only probe
and attach, nothing else. This is confusing to people.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.159 1999/04/13 20:59:36 peter Exp $
d202 1
@


1.159
log
@Add a commented-out example on using the makeoptions command to get a
kernel.debug.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.158 1999/04/13 19:38:09 peter Exp $
a222 2
#device        ucom0
#device        umodem0
@


1.158
log
@Shoot the LKM support in the old wd/wdc/atapi driver set in the head and
perform a cleanup/unifdef sweep over it to tidy things up.  The atapi
code is permanently attached to the wd driver and is always probed.

I will add an extra option bit in the flags to disable an atapi probe on
either the master or slave if needed, if people want this.

Remember, this driver is destined to die some time.  It's possible that
it will loose all atapi support down the track and only be used for
dumb non-ATA disks and all ata/atapi devices will be handled by the new
ata system.

ATAPI, ATAPI_STATIC and CMD640 are no longer options, all are implicit.

Previously discussed with:  sos
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.157 1999/04/11 20:53:50 n_hibma Exp $
d23 2
@


1.157
log
@Make debugging more selective.
Remove debugging options from GENERIC
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.156 1999/03/29 17:56:27 ken Exp $
a62 1
options		"CMD640"	# work around CMD640 chip deficiency
a70 2
options		ATAPI		#Enable ATAPI support for IDE bus
options		ATAPI_STATIC	#Don't do it as an LKM
@


1.156
log
@Delete all references to the "aic" driver.  It isn't in the tree, and
may not show up for a while, and I'm tired of people asking about it.

Perhaps this will eliminate some of the confusion.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.155 1999/03/16 13:34:00 sos Exp $
a227 4

#
#options       USB_DEBUG
#options       USBVERBOSE
@


1.155
log
@Rewert the atapi CDROM driver's name to wcd.
This is to avoid confusion with the new system.
Also provide real entires in MAKEDEV for the new system.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.154 1999/02/21 16:23:22 n_hibma Exp $
a92 1
#controller	aic0	at isa? port 0x340 bio irq 11
@


1.154
log
@Rename hid device to uhid (HID: Human Interface Device)
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.153 1999/02/20 23:29:24 n_hibma Exp $
d74 1
a74 1
device		acd0		#IDE CD-ROM
@


1.153
log
@Removed uhub from list. Mandatory with usb device and this was already
forced in conf/files. Unneccessary entry.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.152 1999/02/20 21:12:24 obrien Exp $
d227 1
a227 1
#device        hid0
@


1.152
log
@Really make the "Rename nlpt to lpt." purported to have been made in
rev 1.149.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.151 1999/02/18 01:13:40 wollman Exp $
a224 1
#device        uhub0
@


1.151
log
@Add a little bit more identifying information to the myriad PCI network
drivers.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.150 1999/02/14 20:28:38 jkh Exp $
d151 1
a151 1
device		nlpt0	at ppbus?
@


1.150
log
@MF3: add SYSVMSG
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.149 1999/02/14 12:00:00 nsouch Exp $
d156 16
a175 13
device ax0
device de0
device fxp0
device mx0
device pn0
device rl0
device tl0
device tx0
device vr0
device vx0
device wb0
device xl0

@


1.149
log
@Rename nlpt to lpt.

Remove from ppi.c the old depreciated module stuff.
Print info when if_plip can't use interrupts.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.148 1999/02/11 06:07:27 jkoshy Exp $
d197 1
a197 1
# This provides support for System V shared memory.
d199 3
a201 1
options		SYSVSHM
@


1.148
log
@Fix typos
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.147 1999/02/10 02:18:31 des Exp $
d149 1
a149 1
device		ppc0	at isa? port? net irq 7
@


1.147
log
@Use ppbus instead of the lpt driver. Throw in a (commented-out) vpo entry
for good measure.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.146 1999/02/04 22:34:23 adam Exp $
d148 1
a148 1
# Parallell port
d150 1
a150 1
constroller	ppbus0
@


1.146
log
@replace previous stupid comment with one more appropriate
where it will be easily found
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.145 1999/02/04 18:08:55 adam Exp $
d148 7
a154 1
device		lpt0	at isa? port? tty irq 7
@


1.145
log
@remind that apm is required in order for timekeeping to work
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.144 1999/01/27 15:34:25 eivind Exp $
a134 1
# XXX required for Pentium CPU
@


1.144
log
@Add ISA PnP support, now that we have the space for it.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143 1999/01/11 03:18:31 yokota Exp $
d135 1
@


1.143
log
@The first stage of console driver reorganization: activate new
keyboard and video card drivers.

Because of the changes, you are required to update your kernel
configuration file now!

The files in sys/dev/syscons are still i386-specific (but less so than
before), and won't compile for alpha and PC98 yet.

syscons still directly accesses the video card registers here and
there; this will be rectified in the later stages.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.142 1999/01/09 18:12:07 wpaul Exp $
d55 1
@


1.143.2.1
log
@Turn SYSVMSG on by default for the KDE folks.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143 1999/01/11 03:18:31 yokota Exp $
d190 1
a190 1
# This provides support for System V shared memory and message queues.
a192 1
options		SYSVMSG
@


1.143.2.2
log
@Use ppbus instead of the old lpt driver. Add a mention in LINT to the
effect that the old driver is deprecated.

Approved by:	jkh
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.1 1999/02/14 19:55:39 jkh Exp $
d147 1
a147 7
# Parallel port
device		ppc0	at isa? port? net irq 7
controller	ppbus0
device		nlpt0	at ppbus?
device		plip0	at ppbus?
device		ppi0	at ppbus?
#controller	vpo0	at ppbus?
@


1.143.2.3
log
@MFC.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.2 1999/02/15 02:50:07 des Exp $
d150 1
a150 1
device		lpt0	at ppbus?
@


1.143.2.4
log
@revert rev 1.143.2.2.
(nobody has yet to explain how I was able to config, compile, and run
a rev 1.143.2.2 kernel w/no warnings/errors)
@
text
@d150 1
a150 1
device		nlpt0	at ppbus?
@


1.143.2.5
log
@MFC:  Delete all references to the aic driver.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.4 1999/02/21 21:08:10 obrien Exp $
d92 1
@


1.143.2.6
log
@MFC: remove confusing entries. The drivers are not yet implemented.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.5 1999/03/29 17:59:38 ken Exp $
d220 2
@


1.143.2.7
log
@MFC: SYSVSEM
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.6 1999/04/16 16:30:24 n_hibma Exp $
a198 1
options		SYSVSEM
@


1.143.2.8
log
@Add beautiful descriptions of PCI network drivers from rev 1.151.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.7 1999/04/16 18:27:48 jkh Exp $
a153 16
#
# The following Ethernet NICs are all PCI devices.
#
device ax0		# ASIX AX88140A
device de0		# DEC/Intel DC21x4x (``Tulip'')
device fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
device mx0		# Macronix 98713/98715/98725 (``PMAC'')
device pn0		# Lite-On 82c168/82c169 (``PNIC'')
device rl0		# RealTek 8129/8139
device tl0		# Texas Instruments ThunderLAN
device tx0		# SMC 9432TX (83c170 ``EPIC'')
device vr0		# VIA Rhine, Rhine II
device vx0		# 3Com 3c590, 3c595 (``Vortex'')
device wb0		# Winbond W89C840F
device xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')

d158 12
@


1.143.2.9
log
@Remove the lines for the USB support. It is not ready for public
consumption.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.8 1999/04/18 23:37:02 obrien Exp $
d212 19
@


1.143.2.10
log
@nlpt->lpt  (lpt->olpt in LINT)
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.9 1999/04/19 20:11:32 n_hibma Exp $
d149 1
a149 1
device		lpt0	at ppbus?
@


1.143.2.11
log
@MFC: disable ppc chipset-specific probes by default.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.10 1999/04/24 02:30:18 obrien Exp $
d147 1
a147 1
device		ppc0	at isa? port? flags 0x40 net irq 7
@


1.143.2.12
log
@MFC: add pnp support.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.11 1999/05/04 00:15:55 msmith Exp $
a54 1
controller	pnp0
@


1.143.2.13
log
@MFC:  add `xe', the Xircom PC Card Ethernet driver
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.12 1999/05/14 15:12:26 jkh Exp $
a182 1
device xe0 at isa? port? irq ?
@


1.143.2.14
log
@Don't compile the `xe' driver by default.  Unlike the zp and ze drivers,
xe requires the `card' controler to be defined.  And unlike the ed, ep and
fe drivers, the xe driver doesn't support a non-PCMCIA NIC.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.13 1999/05/15 18:13:58 obrien Exp $
d183 1
a183 1
#device xe0 at isa? port? net irq ?
@


1.143.2.15
log
@Add the ADMtek PCI fast ethernet driver to the RELENG_3 branch. I've
been using this driver with my sample cards at work with 3.2-RELEASE
for a while now and it's been very stable. Works on the alpha platform
too.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.14 1999/05/17 05:49:45 obrien Exp $
a157 1
device al0		# ADMtek AL981 (``Comet'')
@


1.143.2.16
log
@MFC: fixups for tags and documentation.
@
text
@d4 5
a8 2
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
d10 2
a11 9
#    http://www.freebsd.org/handbook/kernelconfig-config.html
#
# The handbook is also available locally in /usr/share/doc/handbook
# if you've installed the doc distribution, otherwise always see the
# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
# latest information.
#
# An exhaustive list of options and more detailed explanations of the
# device lines is also present in the ./LINT configuration file. If you are
d14 1
a14 1
#	$Id: GENERIC,v 1.143.2.15 1999/06/19 21:37:44 wpaul Exp $
@


1.143.2.17
log
@Merge the Adaptec AIC-6915 fast ethernet and SysKonnect gigabit ethernet
drivers into the RELENG_3 branch.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.143.2.16 1999/07/02 04:04:53 jkh Exp $
a168 1
device sf0		# Adaptec AIC-6915 DuraLAN (``Starfire'')
@


1.143.2.18
log
@MFC: rev 1.179 (enable bpfilter), but only a single one.
@
text
@d18 1
a18 1
#	$Id: GENERIC,v 1.143.2.17 1999/08/08 21:22:11 wpaul Exp $
d217 3
a219 1
pseudo-device	bpfilter 1	#Berkeley packet filter
@


1.143.2.19
log
@$Id$ -> $FreeBSD$
@
text
@d18 1
a18 1
# $FreeBSD$
@


1.143.2.20
log
@MFC: Style.  This commit just minimize the diffs from -current,
including adapting the style cleanup peter did.  No functional
changes.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.19 1999/08/29 16:05:18 peter Exp $
d28 18
a45 22
options 	MATH_EMULATE		#Support for x87 emulation
options 	INET			#InterNETworking
options 	FFS			#Berkeley Fast Filesystem
options 	FFS_ROOT		#FFS usable as root device [keep this!]
options 	MFS			#Memory Filesystem
options 	MFS_ROOT		#MFS usable as root device, "MFS" req'ed
options 	NFS			#Network Filesystem
options 	NFS_ROOT		#NFS usable as root device, "NFS" req'ed
options 	MSDOSFS			#MSDOS Filesystem
options 	"CD9660"		#ISO 9660 Filesystem
options 	"CD9660_ROOT"		#CD-ROM usable as root. "CD9660" req'ed
options 	PROCFS			#Process filesystem
options 	"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
options 	UCONSOLE		#Allow users to grab the console
options 	FAILSAFE		#Be conservative
options 	USERCONFIG		#boot -c editor
options 	VISUAL_USERCONFIG	#visual boot -c editor
options 	KTRACE			#ktrace(1) syscall trace support
options 	SYSVSHM			#SYSV-style shared memory
options 	SYSVMSG			#SYSV-style message queues
options 	SYSVSEM			#SYSV-style semaphores
d50 2
a51 2
#options 	SMP			# Symmetric MultiProcessor Kernel
#options 	APIC_IO			# Symmetric (APIC) I/O
d53 4
a56 4
#options 	NCPU=2			# number of CPUs
#options 	NBUS=4			# number of busses
#options 	NAPIC=1			# number of IO APICs
#options 	NINTR=24		# number of INTs
d59 1
a59 1
controller	pnp0			# PnP support for ISA
a62 1
# Floppy drives
a66 1
# IDE controller and disks
a75 1
# ATAPI devices
a80 1
# SCSI Controllers
d83 9
a91 5
controller	ncr0		# NCR/Symbios Logic
controller	ahb0		# EISA AHA1742 family
controller	ahc0		# AHA2940 and onboard AIC7xxx devices
controller	isp0		# Qlogic family
controller	dpt0		# DPT Smartcache - See LINT for options!
d98 9
a106 7
# SCSI peripherals
# Only one of each of these is needed, they are dynamically allocated.
controller	scbus0		# SCSI bus (required)
device		da0		# Direct Access (disks)
device		sa0		# Sequential Access (tape etc)
device		cd0		# CD
device		pass0		# Passthrough device (direct SCSI)
a107 1
# Proprietary or custom CD-ROM Interfaces
d110 3
a112 1
device		matcd0	at isa? port 0x230 bio
d115 1
a115 1
# atkbdc0 controls both the keyboard and the PS/2 mouse
a126 1

d129 2
a130 2
#options 	XSERVER			# support for X server
#options 	FAT_CURSOR		# start with block cursor
d132 1
a132 1
#options 	PCVT_SCANSET=2		# IBM keyboards are non-std
a133 1
# Floating point support - do not disable.
d136 3
a138 1
# Power management support (see LINT for more options)
a145 1
# Serial (COM) ports
d153 23
a175 21
controller	ppbus0			# Parallel port bus (required)
device		lpt0	at ppbus?	# Printer
device		plip0	at ppbus?	# TCP/IP over parallel
device		ppi0	at ppbus?	# Parallel port interface device
#controller	vpo0	at ppbus?	# Requires scbus and da0

# PCI Ethernet NICs.
device		al0		# ADMtek AL981 (``Comet'')
device		ax0		# ASIX AX88140A
device		de0		# DEC/Intel DC21x4x (``Tulip'')
device		fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
device		mx0		# Macronix 98713/98715/98725 (``PMAC'')
device		pn0		# Lite-On 82c168/82c169 (``PNIC'')
device		rl0		# RealTek 8129/8139
device		sf0		# Adaptec AIC-6915 DuraLAN (``Starfire'')
device		tl0		# Texas Instruments ThunderLAN
device		tx0		# SMC 9432TX (83c170 ``EPIC'')
device		vr0		# VIA Rhine, Rhine II
device		vx0		# 3Com 3c590, 3c595 (``Vortex'')
device		wb0		# Winbond W89C840F
device		xl0		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
a176 1
# ISA Ethernet NICs.
d181 19
a199 24
device		ed0	at isa? port 0x280 net irq 10 iomem 0xd8000
device		ie0	at isa? port 0x300 net irq 10 iomem 0xd0000
device		ep0	at isa? port 0x300 net irq 10
device		ex0	at isa? port? net irq?
device		fe0	at isa? port 0x300 net irq ?
device		le0	at isa? port 0x300 net irq 5 iomem 0xd0000
device		lnc0	at isa? port 0x280 net irq 10 drq 0
device		cs0	at isa? port 0x300 net irq ?
# requires PCCARD (PCMCIA) support to be activated
#device		xe0	at isa? port? net irq ?

# PCCARD NIC drivers.
# ze and zp take over the pcic and cannot coexist with generic pccard
# support, nor the ed and ep drivers they replace.
device		ze0	at isa? port 0x300 net irq 10 iomem 0xd8000
device		zp0	at isa? port 0x300 net irq 10 iomem 0xd8000

# Pseudo devices - the number indicates how many units to allocated.
pseudo-device	loop		# Network loopback
pseudo-device	ether		# Ethernet support
pseudo-device	sl	1	# Kernel SLIP
pseudo-device	ppp	1	# Kernel PPP
pseudo-device	tun	1	# Packet tunnel, for ppp(1)
pseudo-device	pty	16	# Pseudo-ttys (telnet etc)
d202 15
a216 4
# The `bpfilter' pseudo-device enables the Berkeley Packet Filter.
# Be aware of the administrative consequences of enabling this!
# The number of devices determines the maximum number of
# simultaneous BPF clients programs runnable.
@


1.143.2.21
log
@Bring the AMD driver back into -stable.

Approved by: jkh
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.20 1999/09/01 22:27:00 eivind Exp $
a93 1
controller	amd0		# AMD 53C974 (Teckram DC-390(T))
@


1.143.2.22
log
@MFC: don't erroneously associate ppp with the tunnel device.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.21 1999/09/11 15:46:12 gibbs Exp $
d205 1
a205 1
pseudo-device	tun	1	# Packet tunnel
@


1.143.2.23
log
@MFC: merge in driver support for the Sundance ST201 and SiS 900/SiS 7016
PCI fast ethernet controllers.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.22 1999/09/14 22:53:30 jkh Exp $
a170 2
device		sis0		# Silicon Integrated Systems SiS 900/SiS 7016
device		ste0		# Sundance ST201 (D-Link DFE-550)
@


1.143.2.24
log
@Reinstate the aic driver.

PR:		conf/15187
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.23 1999/10/10 23:04:56 wpaul Exp $
a101 1
controller	aic0	at isa? port ? cam irq ?
@


1.143.2.25
log
@Add the `sym' SCSI driver.  Commented out in GENERIC as I have no way of
testing if `ncr' and `sym' can co-exist in a 3.x machine.  Uncommented of
course in LINT.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.24 1999/12/05 01:56:42 luoqi Exp $
a91 1
#controller	sym0		# NCR/Symbios Logic (do not mix with ncr, it conflicts)
@


1.143.2.26
log
@MFC: add a space after all the 'options' keywords so when you
     comment out the line the argument stays aligned.  This is
     a white-space only change.
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.25 2000/01/08 18:39:49 obrien Exp $
d73 1
a73 1
options 	"CMD640"	# work around CMD640 chip deficiency
d83 2
a84 2
options 	ATAPI		#Enable ATAPI support for IDE bus
options 	ATAPI_STATIC	#Don't do it as an LKM
@


1.143.2.27
log
@Add comment to ppc section, explaining that if you copy the line from
GENERIC you'll get a parallel port configured for networking, and not
printing.  Trying to use a port configured like this can lead to reboots.

Discussed on:	-stable
@
text
@d18 1
a18 1
# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.143.2.26 2000/01/31 21:30:31 archie Exp $
a156 5
#
# Note:	The ppc0 entry is configured to support networking over the 
#	parallel port.  If you will be using it for printing, change
#	"net" to "tty", and review ppc(4) to ensure you have the 
#	correct flags value.
@


1.142
log
@Add driver support (and man page) for PCI fast ethernet cards based
on the ASIX AX88140A chip. Update /sys/conf/files, RELNOTES.TXT,
/sys/i388/i386/userconfig.c, sysinstall/devices.c, GENERIC and LINT
accordingly.

For now, the only board that I know of that uses this chip is the
Alfa Inc. GFC2204. (Its predecessor, the GFC2202, was a DEC tulip card.)
Thanks again to Ulf for obtaining the board for me. If anyone runs
across another, please feel free to update the man page and/or the
release notes. (The same applies for the other drivers.)

FreeBSD should now have support for all of the DEC tulip workalike
chipsets currently on the market (Macronix, Lite-On, Winbond, ASIX).
And unless I'm mistaken, it should also have support for all PCI fast
ethernet chipsets in general (except maybe the SMC FEAST chip, which
nobody seems to ever use, including SMC). Now if only we could convince
3Com, Intel or whoever to cough up some documentation for gigabit
ethernet hardware.

Also updated RELNOTEX.TXT to mention that the SVEC PN102TX is supported
by the Macronix driver (assuming you actually have an SVEC PN102TX with
a Macronix chip on it; I tried to order a PN102TX once and got a box
labeled 'Hawking Technology PN102TX' that had a VIA Rhine board inside
it).
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.141 1999/01/01 08:09:57 peter Exp $
d111 10
d122 1
a122 1
device		sc0	at isa? port IO_KBD conflicts tty irq 1
d124 1
a124 1
#device		vt0	at isa? port IO_KBD conflicts tty irq 1
a147 2

device		psm0	at isa? port IO_KBD conflicts tty irq 12
@


1.141
log
@Part 1 of pcvt/voxware revival.  I hope I have not clobbered any other
deltas, but it is possible since I had a few merge conflicts over the last
few days while this has been sitting ready to go.

Approved by:	core
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.140 1998/12/27 13:55:47 sos Exp $
d145 1
@


1.140
log
@Pre 3.0 branch cleanup sos#1: wcd

Superceded by acd driver...
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.139 1998/12/27 13:40:55 phk Exp $
d111 1
d113 6
@


1.139
log
@Pre 3.0 branch cleanup casualty #6: ft
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.138 1998/12/27 13:12:59 phk Exp $
d73 1
a73 1
device		wcd0		#IDE CD-ROM
@


1.138
log
@Add commented out SMP stuff in GENERIC, remove stale configs.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.137 1998/12/27 13:06:40 phk Exp $
a60 4
# Unless you know very well what you're doing, leave ft0 at drive 2, or
# remove the line entirely if you don't need it.  Trying to configure
# it on another unit might cause surprises, see PR kern/7176.
tape		ft0	at fdc0 drive 2
@


1.137
log
@Pre 3.0 branch cleanup casualty #5: nca, sea, wds, uha

No CAM drivers available.  If somebody CAMifies one of these, they
will be welcome back in the tree
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.136 1998/12/27 12:52:45 phk Exp $
d44 9
@


1.136
log
@Pre 3.0 branch cleanup casualty #4: pcvt
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.135 1998/12/13 23:04:35 n_hibma Exp $
a86 1
#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5
@


1.135
log
@dded the stubs for umodem and ucom (communications class driver). They are nothing other than
the ugen driver with different variable names.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.134 1998/12/09 23:28:43 n_hibma Exp $
a106 1
# syscons is the default console driver, resembling an SCO console
a107 6
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
#device		vt0	at isa? port IO_KBD conflicts tty irq 1
#options		XSERVER			# support for X server
#options		FAT_CURSOR		# start with block cursor
# If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
#options		PCVT_SCANSET=2		# IBM keyboards are non-std
@


1.134
log
@Preliminary support for OHCI motherboards
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.133 1998/12/04 18:01:23 wpaul Exp $
d201 2
d205 1
@


1.133
log
@An early Christmas present: add driver support for a whole bunch of
PCI fast ethernet adapters, plus man pages.

if_pn.c: Netgear FA310TX model D1, LinkSys LNE100TX, Matrox FastNIC 10/100,
         various other PNIC devices

if_mx.c: NDC Communications SOHOware SFA100 (Macronix 98713A), various
         other boards based on the Macronix 98713, 98713A, 98715, 98715A
         and 98725 chips

if_vr.c: D-Link DFE530-TX, other boards based on the VIA Rhine and
         Rhine II chips (note: the D-Link and certain other cards
         that actually use a Rhine II chip still return the PCI
         device ID of the Rhine I. I don't know why, and it doesn't
         really matter since the driver treats both chips the same
         anyway.)

if_wb.c: Trendware TE100-PCIE and various other cards based on the
         Winbond W89C840F chip (the Trendware card is identical to
         the sample boards Winbond sent me, so who knows how many
         clones there are running around)

All drivers include support for ifmedia, BPF and hardware multicast
filtering.

Also updated GENERIC, LINT, RELNOTES.TXT, userconfig and
sysinstall device list.

I also have a driver for the ASIX AX88140A in the works.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.132 1998/11/26 23:13:11 n_hibma Exp $
d190 1
@


1.132
log
@Initial commit of ported NetBSD USB stack
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.131 1998/11/12 11:29:28 obrien Exp $
d143 2
d148 1
d150 1
@


1.131
log
@Remove `amd', `nca' SCSI devices to match Mike's LINT commit.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.130 1998/11/03 22:01:21 des Exp $
d182 19
@


1.130
log
@Back out previous commit. The bpfilter -> bpf transition will have to be a
flag day unless we can hack config(8) to smooth things over.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.129 1998/11/03 21:12:20 des Exp $
d71 1
a71 1
# A single entry for any of these controllers (ncr, ahb, ahc, amd) is
a73 1
#controller	amd0
a88 3
#controller	nca0	at isa? port 0x1f88 bio irq 10
#controller	nca1	at isa? port 0x350 bio irq 5
#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000
@


1.129
log
@Rename the 'bpfilter' pseudo-device to 'bpf'. The old syntax is still legal
and will stick around for a while.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.128 1998/10/22 13:49:51 bde Exp $
d181 1
a181 1
#  The `bpf' pseudo-device enables the Berkeley Packet Filter.  Be
d185 1
a185 1
#pseudo-device	bpf	4	#Berkeley packet filter
@


1.128
log
@Quote port names that have a digit in them.  IO_TIMER1 was lexed as
{ port_name = "IO_TIMER", port_number = 1 } and only worked because
it was reassembled to "IO_TIMER1".  Trailing digits always work, but
this is too magic to depend on.

Don't quote port names that don't have a digit in them.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.127 1998/10/22 12:23:03 bde Exp $
d181 1
a181 1
#  The `bpfilter' pseudo-device enables the Berkeley Packet Filter.  Be
d185 1
a185 1
#pseudo-device	bpfilter	4	#Berkeley packet filter
@


1.127
log
@Removed all `vector xxxintr' specifications.  Interrupt handlers are now
configured in drivers.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.126 1998/10/18 16:24:32 wpaul Exp $
d112 1
a112 1
device		sc0	at isa? port "IO_KBD" conflicts tty irq 1
d114 1
a114 1
#device		vt0	at isa? port "IO_KBD" conflicts tty irq 1
d120 1
a120 1
device		npx0	at isa? port "IO_NPX" irq 13
d139 1
a139 1
device		psm0	at isa? port "IO_KBD" conflicts tty irq 12
@


1.126
log
@Add driver support for PCI fast ethernet adapters based on the
RealTek 8129/8139 chipset like I've been threatening. Update kernel
configs, userconfig.c, relnotes and sysinstall. No man page yet;
comming soon.

I consider this driver stable enough that I want to give it some
exposure in -current.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.125 1998/10/16 01:30:11 obrien Exp $
d49 1
a49 1
controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2 vector fdintr
d58 1
a58 1
controller	wdc0	at isa? port "IO_WD1" bio irq 14 vector wdintr
d62 1
a62 1
controller	wdc1	at isa? port "IO_WD2" bio irq 15 vector wdintr
d88 5
a92 5
#controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
#controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
#controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
#controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
#controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
d104 2
a105 2
device		wt0	at isa? port 0x300 bio irq 5 drq 1 vector wtintr
device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
d112 1
a112 1
device		sc0	at isa? port "IO_KBD" conflicts tty irq 1 vector scintr
d114 1
a114 1
#device		vt0	at isa? port "IO_KBD" conflicts tty irq 1 vector pcrint
d120 1
a120 1
device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr
d132 4
a135 4
device		sio0	at isa? port "IO_COM1" flags 0x10 tty irq 4 vector siointr
device		sio1	at isa? port "IO_COM2" tty irq 3 vector siointr
device		sio2	at isa? disable port "IO_COM3" tty irq 5 vector siointr
device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
d137 1
a137 1
device		lpt0	at isa? port? tty irq 7 vector lptintr
d139 1
a139 1
device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
d153 10
a162 10
device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
device ep0 at isa? port 0x300 net irq 10 vector epintr
device ex0 at isa? port? net irq? vector exintr
device fe0 at isa? port 0x300 net irq ? vector feintr
device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
device cs0 at isa? port 0x300 net irq ? vector csintr
@


1.125
log
@Add commented out bpf entry.  (DHCP is popular here, and this is required).

Ok'ed by:	jkh
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.124 1998/10/10 08:13:58 jkh Exp $
d147 1
@


1.124
log
@Add entries for MFS which are consistent with the others, now that
Peter has made this more selectable.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.123 1998/10/07 13:51:45 obrien Exp $
d179 6
@


1.123
log
@Fix syntax errors I introduced.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.122 1998/10/07 03:42:44 gibbs Exp $
d28 2
@


1.122
log
@Add entries for the adw device driver.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.121 1998/10/05 07:45:54 obrien Exp $
d31 2
a32 2
options		CD9660			#ISO 9660 Filesystem
options		CD9660_ROOT		#CD-ROM usable as root device, "CD9660" req'ed
@


1.121
log
@Document that ``options xFS_ROOT'' requires the associated ``options xFS''.
Reordered xFS_ROOT's to be below the associated xFS.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.120 1998/10/03 17:09:00 jkh Exp $
d83 1
@


1.120
log
@Add dpt driver back to GENERIC and adjust a stale comment.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.119 1998/10/01 19:35:28 msmith Exp $
d27 1
d29 1
d31 2
a32 4
options		"CD9660"		#ISO 9660 Filesystem
options		"CD9660_ROOT"		#CD-ROM usable as root device
options		FFS_ROOT		#FFS usable as root device [keep this!]
options		NFS_ROOT		#NFS usable as root device
@


1.119
log
@Remove lpt1 - we have userconfig if you have a weird port.
Remove mse0 - the Microsoft Bus Mouse is a dinosaur.  There are probably
              more Pintos on the road than these on peoples' desks.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.118 1998/09/18 00:46:40 mjacob Exp $
d79 2
a80 4
# dpt0 entry there for much fuller documentation on this.  The options
# line following dpt0 here is also currently a *required* option for it.
# controller      dpt0
# options DPT_MEASURE_PERFORMANCE
@


1.118
log
@(requested by gibbs) Remove the SCSI_CAM option (and rework the isp driver
that had depended on it for compilation within or without CAM to use
__FreeBSD_version instead).
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.117 1998/09/17 03:15:30 msmith Exp $
a136 2
device		lpt1	at isa? port? tty
device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
@


1.117
log
@Mark the syscons and pcvt drivers as being allowed to conflict, so that
well-meaning but uneducated users don't exterminate the psm driver in
their zeal to achieve zero conflicts.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.116 1998/09/15 10:01:12 gibbs Exp $
a35 1
options		SCSI_CAM		#We're using CAM in this kernel
@


1.116
log
@sd->da, od is gone, no SCSI control devices.
new pass, xpt, and targ devices.

Nuke no longer used AHC options.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.115 1998/09/04 19:55:51 msmith Exp $
d112 1
a112 1
device		sc0	at isa? port "IO_KBD" tty irq 1 vector scintr
d114 1
a114 1
#device		vt0	at isa? port "IO_KBD" tty irq 1 vector pcrint
@


1.115
log
@Increase 'maxusers' to 32; with the number of people using GENERIC as
their one-size-fits-all kernel, this should help reduce the "out of foo"
reports.

Reviewed by:	jkh
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.114 1998/08/17 16:46:33 bde Exp $
d35 2
a36 2
options		SCSI_DELAY=15		#Be pessimistic about Joe SCSI device
options		BOUNCE_BUFFERS		#include support for DMA bounce buffers
d73 1
a73 1
controller	amd0
d82 2
a83 2
controller      dpt0
options DPT_MEASURE_PERFORMANCE
d85 8
a92 7
controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
controller	aha0	at isa? port "IO_AHA0" bio irq ? drq 5 vector ahaintr
controller	aic0	at isa? port 0x340 bio irq 11 vector aicintr
controller	nca0	at isa? port 0x1f88 bio irq 10 vector ncaintr
controller	nca1	at isa? port 0x350 bio irq 5 vector ncaintr
controller	sea0	at isa? bio irq 5 iomem 0xc8000 iosiz 0x2000 vector seaintr
d96 1
a96 1
device		sd0
d98 1
a98 1
device		od0	#See LINT for possible `od' options.
d100 1
a100 1
device		st0
@


1.114
log
@FIxed typo (syntax error) in previous commit.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.113 1998/08/16 17:14:59 wpaul Exp $
d22 1
a22 1
maxusers	10
@


1.113
log
@Import the (Fast) Etherlink XL driver. I'm reasonally confident in its
stability now. ALso modify /sys/conf/files, /sys/i386/conf/GENERIC
and /sys/i386/conf/LINT to add entries for the XL driver. Deactivate
support for the XL adapters in the vortex driver. LAstly, add a man
page.

(Also added an MLINKS entry for the ThunderLAN man page which I forgot
previously.)
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.112 1998/07/20 20:00:29 msmith Exp $
d151 1
a151 1
devixe xl0
@


1.112
log
@Add the 'cs' driver for Crystal Semiconductor CS89x0 devices.  This
supports PnP and if_media.  I've been running a slightly older version
here for several weeks now.
Submitted by:	Maxim Bolotin <max@@rsu.ru>
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.111 1998/07/17 06:45:26 joerg Exp $
d151 1
@


1.111
log
@Place a fat warning that floppy tapes should be configured as drive 2
only (normally).

PR:		kern/7176
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.110 1998/06/03 13:33:34 jkh Exp $
d161 1
@


1.110
log
@Add the DPT driver here.  It's kinda ironic that it got enabled in -stable
first. :)
PR:		6848
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.109 1998/05/21 03:22:19 wpaul Exp $
d51 3
@


1.109
log
@And entries for ThunderLAN driver.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.108 1998/04/22 18:18:12 mjacob Exp $
d74 7
@


1.108
log
@Add support for the Qlogic ISP SCSI && FC/AL Adapters
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.107 1998/02/16 23:57:03 msmith Exp $
d138 1
@


1.107
log
@Remove DISABLE_PSE option which was masking (but not fixing) the problem.
A correct fix for execution off MFS filesystems has been committed.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.106 1998/02/16 00:29:05 msmith Exp $
d73 1
@


1.106
log
@TEMPORARILY disable support for the 4MB kernel page, as it appears to be
causing installation images for -current to be unbootable.

Submitted by:	phk
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.105 1998/01/24 02:54:09 eivind Exp $
a40 2

options		DISABLE_PSE		#disable broken PSE support
@


1.105
log
@Make all file-system (MFS, FFS, NFS, LFS, DEVFS) related option new-style.

This introduce an xxxFS_BOOT for each of the rootable filesystems.
(Presently not required, but encouraged to allow a smooth move of option *FS
to opt_dontuse.h later.)

LFS is temporarily disabled, and will be re-enabled tomorrow.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.104 1998/01/21 18:34:44 jkh Exp $
d41 2
@


1.104
log
@Add entries for tx card.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.103 1998/01/16 22:12:58 pst Exp $
d30 3
@


1.103
log
@Bring in IDE ATAPI floppy support.
This is Junichi's v1.0 driver.

NOTE: Major device numbers have been changed to avoid conflict with other
      FreeBSD 3.0 devices.  The new numbers should be considered "official."
      This driver is still considered "beta" quality, although we have been
      playing with it.  Please submit bugs to junichi and myself.

Submitted by:	junichi@@astec.co.jp
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.102 1998/01/11 02:16:38 jkh Exp $
d134 1
@


1.102
log
@Add ppp, at long last, back to GENERIC.  We have enough room in the
kernel for it and I'm tired of reading the "This system lacks kernel
support for PPP..." line in people's tech support messages.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.101 1997/10/31 22:10:02 jseger Exp $
d61 2
a62 1
device		wcd0	#IDE CD-ROM
@


1.101
log
@Change comments about ijppp to iijppp.

PR:		conf/4905
Submitted by:	takas-su@@is.aist-nara.ac.jp
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.100 1997/10/28 07:24:30 joerg Exp $
d148 1
a148 2
# iijppp uses tun instead of ppp device
#pseudo-device	ppp	1
@


1.100
log
@Remove the stale `log' non-pseudodevice.

Found by:	the new config(8) ;-)
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.99 1997/10/26 04:36:07 nate Exp $
d148 1
a148 1
# ijppp uses tun instead of ppp device
@


1.99
log
@- Do a bunch of gratuitous changes intended to make the code easier to
  follow.
 * Rename/reorder all of the pccard structures, change many of the member
   names to be descriptive, and follow more closely other 'bus' drivers
   naming schemes.
 * Rename a bunch of parameter and local variable names to be more
   consistant in the code.
 * Renamed the PCCARD 'crd' device to be the 'card' device
 * KNF and make the code consistant where it was obvious.
 * ifdef'd out some unused code
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.98 1997/10/18 10:59:06 joerg Exp $
a146 1
pseudo-device	log
@


1.98
log
@Make all the documented (in pcvt(4)) options supported options.  While
i was at it, do no longer insist on `PCVT_FREEBSD' being declared in
the config file, but default it to a reasonable value.

More cleanup to follow, but this part is safe for RELENG_2_2, too.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.97 1997/10/08 17:05:03 nate Exp $
d112 3
a114 3
#controller	crd0
#device		pcic0	at crd?
#device		pcic1	at crd?
@


1.97
log
@- Enable PS/2 mouse support by default.  Given that almost all new hardware
  has a PS/2 port, this is a good thing.  Note, older 386/486 boxes may
  lockup the keyboard controller with this enabled, but most of these kinds
  of machines don't run -current, so the benefits outweigh the downsides.

Discussed with:		Kazutaka YOKOTA <yokota@@zodiac.mech.utsunomiya-u.ac.jp>
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.96 1997/09/22 00:37:08 gibbs Exp $
a98 1
#options		PCVT_FREEBSD=210	# pcvt running on FreeBSD >= 2.0.5
@


1.96
log
@Oops.  This file shouldn't have been committed.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.94 1997/09/14 18:57:01 joerg Exp $
d126 1
a126 1
device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
@


1.95
log
@Move the rules for aicasm to the MI conf file.
@
text
@d24 1
a24 1
#options		MATH_EMULATE		#Support for x87 emulation
a37 1
options		DDB
d59 3
a61 3
#options		ATAPI		#Enable ATAPI support for IDE bus
#options		ATAPI_STATIC	#Don't do it as an LKM
#device		wcd0	#IDE CD-ROM
d124 1
a124 1
#device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
d126 1
a126 1
#device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
d132 3
a134 3
#device de0
#device fxp0
#device vx0
d136 2
a137 2
#device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
#device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
d139 6
a144 6
#device ex0 at isa? port? net irq? vector exintr
#device fe0 at isa? port 0x300 net irq ? vector feintr
#device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
#device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
#device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
#device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
@


1.94
log
@Addf flags 0x10 to the sio0 line, so it is available as a potential
console.  This features backwards-compatibility to the era when sio(4)
was always available for a console.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.93 1997/07/22 08:33:52 jkh Exp $
d24 1
a24 1
options		MATH_EMULATE		#Support for x87 emulation
d38 1
d60 3
a62 3
options		ATAPI		#Enable ATAPI support for IDE bus
options		ATAPI_STATIC	#Don't do it as an LKM
device		wcd0	#IDE CD-ROM
d125 1
a125 1
device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
d127 1
a127 1
device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
d133 3
a135 3
device de0
device fxp0
device vx0
d137 2
a138 2
device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
d140 6
a145 6
device ex0 at isa? port? net irq? vector exintr
device fe0 at isa? port 0x300 net irq ? vector feintr
device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
device ze0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zeintr
device zp0 at isa? port 0x300 net irq 10 iomem 0xd8000 vector zpintr
@


1.93
log
@Well, consensus seems very split on this so I talked it over with DG
and he says he's happy to see forward movement in aligning our defaults
with a 16 bit world, the 8 bit folk already being veterans by this
point who know how to use userconfig.

In any case, perhaps Warner will soon come to save us all with his Dynamic
Probing(tm) feature and this will all become totally moot in any case,
so it's probably not worth arguing about either way.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.92 1997/07/15 04:04:45 jkh Exp $
d117 1
a117 1
device		sio0	at isa? port "IO_COM1" tty irq 4 vector siointr
@


1.92
log
@Add SYSVSHM by default.  Nobody seems to have objected too strongly
to this when raised, and most were in favor of at least this option
(some also asked for semaphores and messages, but I'll leave that argument
for another time :).
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.91 1997/06/06 12:24:43 jkh Exp $
d136 1
a136 2
device ed0 at isa? port 0x280 net irq  5 iomem 0xd8000 vector edintr
device ed1 at isa? port 0x300 net irq  5 iomem 0xd8000 vector edintr
a137 1
device ie1 at isa? port 0x360 net irq  7 iomem 0xd0000 vector ieintr
d143 1
a143 1
device ze0 at isa? port 0x300 net irq 5 iomem 0xd8000 vector zeintr
@


1.91
log
@YAMF22 - XSERVER comment changes.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.90 1997/04/14 00:35:20 gibbs Exp $
d163 3
@


1.90
log
@GENERIC, LINT:
Add an ie entry that corresponds to the location the old ix entry used
to probe and kill the ix entry.

files.i386:
Remove entries for the ix driver.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.89 1997/03/29 11:06:55 phk Exp $
d100 1
a100 1
#options		XSERVER			# include code for XFree86
@


1.89
log
@Sanitize APM a bit.  Convert various #ifdef to id_flags instead.
You may want to add "flags 0x31" to apm0 if you have a lousy
implementation.  Read LINT.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.88 1997/03/13 19:03:58 bde Exp $
d138 2
a139 1
device ie0 at isa? port 0x360 net irq  7 iomem 0xd0000 vector ieintr
a142 1
device ix0 at isa? port 0x300 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr
@


1.88
log
@Quoted CMD640.  It's still missing from options.i386.

Removed stale comment saying that npx0 is mandatory.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.87 1997/03/12 19:59:58 se Exp $
d110 2
a111 2
device		apm0    at isa?	disable	# Advanced Power Management
options		APM_BROKEN_STATCLOCK	# Workaround some buggy APM BIOS
@


1.87
log
@Activate CMD640 workaround
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.86 1997/02/22 09:31:34 peter Exp $
d50 1
a50 1
options		CMD640		# work around CMD640 chip deficiency
a104 1
# Mandatory, don't remove
@


1.86
log
@Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$.  We are not
ready for it yet.
@
text
@d14 1
a14 1
#	$Id$
d50 1
@


1.85
log
@Adjust ex0 entries properly after talking with Javier.
@
text
@d14 1
a14 1
#	$FreeBSD$
@


1.84
log
@Add the ex driver (Intel EtherExpress Pro/10).

I have no idea if this works since I don't have one of the cards to test.
I also don't know what the LINT and GENERIC entries should look like,
so I just made up some values for now and left them commented out.
Someone who knows the factory settings for a Pro/10, please contact me!

Submitted-By: Javier Martn Rueda <jmrueda@@diatel.upm.es>
@
text
@d140 1
a140 1
#device ex0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector exintr
@


1.83
log
@Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore.  This update would have been
insane otherwise.
@
text
@d140 1
@


1.82
log
@Mention amd driver in comment regarding PCI drivers.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.81 1996/12/18 01:30:19 se Exp $
@


1.81
log
@Add driver for AMD 53c974 SCSI (Tekram DC390/390T).
Remove MAX_LUN=2 option for NCR driver: FAILSAFE does
no longer imply MAX_LUN=1.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.80 1996/12/15 16:31:18 se Exp $
d62 2
a63 2
# A single entry for any of these controllers (ncr, ahb, ahc) is sufficient
# for any number of installed devices.
d65 1
a67 1
controller	amd0		#Tekram DC390/390T, use ncr0 for DC390W/U/F
@


1.80
log
@Remove "options MAXLUN=2" since the ncr driver will probe for 8 LUNs
now anyway, even if compiled with FAILSAFE defined.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.79 1996/12/13 07:55:10 jkh Exp $
d67 1
@


1.79
log
@Close PR#2198:

	I've added an installation from optical disk drive facility.
	This enables FreeBSD to be installed from an optical disk, which
	may be formatted in "super floppy" style or sliced into MSDOS-FS
	and UFS partitions.

	Note:  ncr.c should be reviewed by Stefan Esser <se@@freebsd.org>
	and cd.c by Joerg Wunsch <joerg@@freebsd.org> before bringing this
	into 2.2.

Submitted-By: Shunsuke Akiyama <akiyama@@kme.mei.co.jp>
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.78 1996/11/16 01:09:17 gibbs Exp $
a64 1
options		MAX_LUN=2	#ncr0: for PD drive
@


1.78
log
@Since there have been so many reports of the Memory Mapped I/O to the
aic7xxx cards failing on certain motherboards, reverse the logic used to
control this feature.  AHC_FORCE_PIO is replaced with AHC_ALLOW_MEMIO.
GENERIC no longer needs to specify the AHC_FORCE_PIO option since this is
the default.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77 1996/10/28 06:05:56 gibbs Exp $
d65 1
@


1.77
log
@Add two new aic7xxx driver options:

AHC_FORCE_PIO - This forces the driver to use PIO even on systems that
	say they have memory mapped the controller's registers.  This
	seems to fix Ken Lam's problems.  I've also placed this option
	in the GENERIC kernel file so that we are guaranteed to install
	even on these flakey machines.

AHC_SHARE_SCBS - This option attempts to share the external SCB SRAM on
	the 398X controllers allowing a totoll of 255 non-paged SCBs.
	This doesn't work quite yet, so this option is mostly here to
	help 398X owners to experiment and give me feedback until this
	works properly.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.76 1996/09/11 19:53:28 phk Exp $
a66 3
options		"AHC_FORCE_PIO"		# Some motherboards choke on MemI/O,
					# so use PIO in the ahc driver in the
					# generic kernel.
@


1.77.2.1
log
@Add "controller amd0" to enable AMD 53c974 PCI SCSI driver.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77 1996/10/28 06:05:56 gibbs Exp $
d62 2
a63 2
# A single entry for any of these controllers (ncr, ahb, ahc, amd) is
# sufficient for any number of installed devices.
a64 1
controller	amd0
@


1.77.2.2
log
@AHC_FORCE_PIO hasn't existed for a while now.  Remove it from here.
Memory mapped I/O is now a "positive" option AHC_ALLOW_MEMIO.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.1 1996/12/21 02:10:50 se Exp $
d68 4
@


1.77.2.3
log
@Another driver merge from current: ex(4).

I had to change one line of code, in order to address the changed
syntax/semantics of the address list handling.  Please somebody with
such a card test this driver again in RELENG_2_2.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.2 1997/02/03 22:53:24 gibbs Exp $
a138 1
#device ex0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector exintr
@


1.77.2.4
log
@Enable ex0.  It has been commented out accidentally only.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.3 1997/02/08 15:42:24 joerg Exp $
d139 1
a139 1
device ex0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector exintr
@


1.77.2.5
log
@Sync with current: ie driver understands Intel EtherExpress16
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.4 1997/02/22 20:31:24 joerg Exp $
d137 1
a137 2
device ie0 at isa? port 0x300 net irq 10 iomem 0xd0000 vector ieintr
device ie1 at isa? port 0x360 net irq  7 iomem 0xd0000 vector ieintr
d141 1
@


1.77.2.6
log
@Set flags to 0x1 on npx0 by default - too damn many people are being
bitten by the Pentium bcopy() stuff right now and I really don't want to
be answering this question for 2.2.x also.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.5 1997/04/14 00:48:30 gibbs Exp $
d104 1
a104 1
device		npx0	at isa? port "IO_NPX" irq 13 vector npxintr flags 0x1
@


1.77.2.7
log
@Add 1 vn device to this by default.  The reason is so that I can tell
people how to add swap files without also having to go through the
whole "well, first you gotta add a vn device" song and dance.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.6 1997/04/15 17:37:23 jkh Exp $
a152 1
pseudo-device	vn	1
@


1.77.2.8
log
@- Moved the flags in npx0 before the vector declaration, else config
  blows chunks.

Pointed out by:	bde
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.7 1997/04/15 18:05:59 jkh Exp $
d104 1
a104 1
device		npx0	at isa? port "IO_NPX" flags 0x1 irq 13 vector npxintr
@


1.77.2.9
log
@Add CMD640 option to work around EIDE chip bug.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.8 1997/04/18 14:06:20 nate Exp $
a49 1
options		"CMD640"	# work around CMD640 chip deficiency
@


1.77.2.10
log
@Indicate that XSERVER entry is for servers in general, not just XFree86
(it applies to Xaccel too).
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.9 1997/05/30 21:31:07 se Exp $
d99 1
a99 1
#options		XSERVER			# support for X server
@


1.77.2.11
log
@Add SYSVSHM to GENERIC here too.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.10 1997/06/06 12:24:17 jkh Exp $
a163 3
# This provides support for System V shared memory.
#
options         SYSVSHM
@


1.77.2.12
log
@MFC: make the pcvt options supported ones.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.11 1997/07/16 04:45:14 jkh Exp $
d98 1
@


1.77.2.13
log
@- MFC: Better suspend/resume laptop support.  Due to interest in
  bringing it in (and the fact that it's mostly broken here still), bring
  in all of the changes.  You must edit your custom kernel file, and
  re-config/build/install a new kernel for these changes.

[ Note userland changes are required as well, they'll be committed ASAP ]
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.12 1997/10/18 11:03:10 joerg Exp $
d112 3
a114 3
#controller	card0
#device		pcic0	at card?
#device		pcic1	at card?
@


1.77.2.14
log
@MFC: Add ppp back to GENERIC.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.13 1997/10/30 00:38:14 nate Exp $
d151 2
a152 1
pseudo-device	ppp	1
@


1.77.2.15
log
@Bring in v1.0 of Junichi's ATAPI floppy driver (LS-120 floppy support).

NOTE: The major device numbers have been changed to avoid conflicts with
      devices present in 2.2 and later kernel releases.
Submitted by:	junichi@@astech.co.jp
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.14 1998/01/14 15:25:12 jkh Exp $
d61 1
a61 2
device		wcd0		#IDE CD-ROM
device		wfd0		#IDE floppy (LS-120)
@


1.77.2.16
log
@Add entries for tx driver.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.15 1998/01/16 22:28:38 pst Exp $
a133 1
device tx0
@


1.77.2.17
log
@Added support for the DPT driver.

All non cosmettic changes are conditionalised on the #define  DPTOPT
so this should produce no functional changes if this is not defined.
All changed files have previously been tagged with PRE_DPT.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.16 1998/01/21 18:41:44 jkh Exp $
a69 1
#controller	dpt0
a76 6

#options   	DPT_MEASURE_PERFORMANCE #Leave alone for now
#options		DPT_VERIFY_HINTR		# Some hardware MUST have it!
#options		DPT_TRACK_CCB_STATES	# Some hardware MUST have it!
#options    	DPT_HANDLE_TIMEOUTS		# Some hardware must have it!
#options		DPT_TIMEOUT_FACTOR=4	# Some hardware needs more
@


1.77.2.18
log
@MFC: use more sensible defaults.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.17 1998/03/06 23:44:22 julian Exp $
d144 2
a145 1
device ed0 at isa? port 0x280 net irq 10 iomem 0xd8000 vector edintr
d147 1
d149 1
a149 1
device ex0 at isa? port? net irq? vector exintr
@


1.77.2.19
log
@correct the  DPT configuration options
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.18 1998/03/07 14:53:21 jkh Exp $
a78 1
#options	DPTOPT		#will go away
@


1.77.2.20
log
@Enabel psm0 by default.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.19 1998/03/08 11:06:51 julian Exp $
d134 1
a134 1
device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
@


1.77.2.21
log
@dpt stuff will be left disabled for now but at least better documented.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.20 1998/03/23 05:53:57 yokota Exp $
a65 7
#
# Note: The dpt driver is present in this release but was left disabled
# due to its relatively late entry (it's almost certainly benign to enable
# it but we didn't want to risk any chance of destabilizing 2.2.6).  To
# enable DPT support, uncomment the dpt0 controller entry and the two
# options DPTOPT and DPT_MEASURE_PERFORMANCE entries below.

@


1.77.2.22
log
@cosmetic.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.21 1998/03/23 08:04:00 jkh Exp $
d86 5
a90 5
#options		DPTOPT			# will go away soon
#options   		DPT_MEASURE_PERFORMANCE	# just enable for now
#options		DPT_VERIFY_HINTR	# Some hardware must have it!
#options		DPT_TRACK_CCB_STATES	# Some hardware must have it!
#options    		DPT_HANDLE_TIMEOUTS	# Some hardware must have it!
@


1.77.2.23
log
@The dpt driver is now standard equipment.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.22 1998/03/24 01:20:14 jkh Exp $
d66 6
d77 1
a77 1
controller	dpt0
d86 2
a87 1
options   		DPT_MEASURE_PERFORMANCE	# Required by DPT driver??
@


1.77.2.24
log
@MFC: fat warning from rev 1.111
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.23 1998/05/06 20:07:23 gibbs Exp $
a47 3
# Unless you know very well what you're doing, leave ft0 at drive 2, or
# remove the line entirely if you don't need it.  Trying to configure
# it on another unit might cause surprises, see PR kern/7176.
@


1.77.2.25
log
@MFC: the 'cs' driver for Crystal Semi CS89x0 adapters.  Note that this
is marked as 'disabled' in GENERIC as a safety measure only.

Submitted by:	Maxim Bolotin <max@@rsu.ru>
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.24 1998/07/17 06:46:12 joerg Exp $
a156 1
device cs0 at isa? disable port 0x300 net irq ? vector csintr
@


1.77.2.26
log
@Add XL driver and man page to the 2.2 branch.

Update sys/conf/files to include xl driver.
Update GENERIC and LINT.
Update sys/pci/if_vx_pci.c to not probe Etherlink XL cards anymore.
Update man4/man4.i386/Makefile to install new man page (correctly this
time!).

This version of the driver is current up to today. Both versions
should remain in sync, unless I screw up.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.25 1998/07/20 20:11:04 msmith Exp $
a146 1
device xl0
@


1.77.2.27
log
@MFC: raise the default 'maxusers' to 32.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.26 1998/08/24 18:17:50 wpaul Exp $
d22 1
a22 1
maxusers	32
@


1.77.2.28
log
@Add the ThunderLAN NIC driver to the 2.2.x branch. Update GENRIC
and LINT, userconfig, sysinstall, relnotes and add man page.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.27 1998/09/04 19:56:26 msmith Exp $
a144 1
device tl0
@


1.77.2.29
log
@MFC: Support for ISP SCSI and Fibre Channel Cards
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.77.2.28 1998/09/26 17:36:14 wpaul Exp $
a70 1
controller	isp0
@


1.77.2.30
log
@$Id$ -> $FreeBSD$
@
text
@d14 1
a14 1
# $FreeBSD$
@


1.76
log
@Make userconfig two (default: on) options:
	USERCONFIG to enable
	VISUAL_USERCONFIG to get the gui stuff too.
Requested by: pst
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.75 1996/08/27 16:25:53 wosch Exp $
d67 3
@


1.75
log
@Add hints to the file ./LINT and the handbook.
@
text
@d14 1
a14 1
#	$Id: GENERIC,v 1.74 1996/07/11 11:18:45 jkh Exp $
d36 2
@


1.74
log
@Merge.
@
text
@d4 5
a8 1
#	$Id: GENERIC,v 1.73 1996/07/10 03:35:59 jkh Exp $
d10 5
@


1.73
log
@Clean out some historical cruft.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.72 1996/06/30 09:39:29 joerg Exp $
d107 2
@


1.72
log
@Enable ktrace by default, accompanied by a small reminder about the
implications (4 KB bloat, slight slowdown of syscalls).

Reviewed by:	freebsd-hackers
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.71 1996/06/16 20:04:44 joerg Exp $
a76 1
device		mcd1	at isa? port 0x340 bio irq 11 vector mcdintr
a106 2
device		sio2	at isa? port "IO_COM3" tty irq 5 vector siointr
device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
a109 1
device		lpt2	at isa? port? tty
a129 1
device lnc1 at isa? port 0x300 net irq 10 drq 0 vector lncintr
@


1.71
log
@Explain the options for the `od' driver.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.70 1996/05/13 04:29:13 nate Exp $
a145 1
# keep this if you want to be able to continue to use /stand/sysinstall
d147 6
@


1.70
log
@Added commented out PCCARD entries to GENERIC, also document and add
entries in LINT.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.69 1996/05/01 03:26:58 bde Exp $
d69 1
a69 1
device		od0
@


1.69
log
@Only disable sio3 by default.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.68 1996/04/29 20:03:41 jkh Exp $
d101 4
@


1.68
log
@Add ATAPI_STATIC so that the ATAPI cdroms work correctly again
under -current.
Submitted-By: Serge Vakulenko <vak@@cronyx.ru>
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.67 1996/04/22 19:40:24 nate Exp $
d105 1
a105 1
#device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
@


1.67
log
@- add apm to the GENERIC kernel (disabled by default), and add some comments
  regarding apm to LINT
- Disabled the statistics clock on machines which have an APM BIOS and
  have the options "APM_BROKEN_STATCLOCK" enabled (which is default
  in GENERIC now)
- move around some of the code in clock.c dealing with the rtc to make
  it more obvios the effects of disabling the statistics clock

Reviewed by:	bde
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.66 1996/04/18 04:02:30 nate Exp $
d47 2
a48 1
options		ATAPI	#Enable ATAPI support for IDE bus
@


1.66
log
@Added a disabled psm0 (PS/2) mouse device, using the new 'disable'
keyword.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.65 1996/04/10 23:03:36 jkh Exp $
d94 6
@


1.65
log
@Disable sio3 in GENERIC - it messes with ATI cards.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.64 1996/04/09 09:00:41 jkh Exp $
d104 2
@


1.64
log
@Gag!  Somebody removed the bus mouse from GENERIC for reasons unknown.
That certainly explains why I noticed it suddenly missing from the
2.2 SNAPSHOT! :-)
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.63 1996/03/20 10:42:56 jkh Exp $
d98 1
a98 1
device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
@


1.63
log
@Add vx0 device to GENERIC.  Yes, I know that this bloats GENERIC, but
what can we do?
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.62 1996/03/17 08:39:50 jkh Exp $
d103 1
@


1.62
log
@Add fe0 to the LINT and GENERIC files (hmmm - looks like my rcvs setup't
isn't supplying all the proper header info here!  Last commit of fe0
entry should have had the following Submitted by line also).
Submitted-by: Masahiro SEKIGUCHI <seki@@sysrap.cs.fujitsu.co.jp>
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.61 1996/03/11 18:47:38 jkh Exp $
d110 2
@


1.61
log
@Add FAILSAFE option for selecting extra conservativeness when such
is more practical (like during installation).  Correspondingly, set the
option by default in GENERIC now.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.60 1996/01/20 06:14:33 nate Exp $
d114 1
@


1.60
log
@Added a comment above the npx0 device line
# Mandatory, don't remove
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.59 1996/01/07 19:19:38 gibbs Exp $
d26 1
@


1.59
log
@Add comment about only needing on of either ahc, ncr, or ahb type
controllers to handle any number of devices.
Remove unnecessary extra units for these controllers.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.58 1995/12/29 02:04:19 jkh Exp $
d91 1
@


1.58
log
@Make a couple of options that hurt when they're removed more
carefully noted.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.57 1995/12/24 08:13:22 davidg Exp $
d49 2
a53 1
controller	ahc1
@


1.57
log
@Added device fxp0 (device driver for Intel EtherExpress Pro/100).
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.56 1995/12/24 08:11:44 davidg Exp $
d22 1
a22 1
options		"COMPAT_43"		#Compatible with BSD 4.3
d126 1
@


1.56
log
@Added I686_CPU.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.55 1995/12/14 14:35:27 peter Exp $
d106 1
@


1.55
log
@GENERIC/LINT: Remove redundant quoting on some option lines.
LINT: add a couple of new/missing/undocumented options
files.i386: add linux code so that you can compile a kernel with static
linux emulation ("options LINUX")
i386/*: use #if defined(COMPAT_LINUX) || defined(LINUX) to enable static
support of linux emulation (just like "IBCS2" makes ibcs2 static)

The main thing this is going to make obvious, is that the LINUX code
(when compiled from LINT) has a lot of warnings, some of which dont look
too pleasant..
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.54 1995/12/12 08:46:34 gibbs Exp $
d11 1
@


1.54
log
@Have bt0 entry specify "bt_isa_intr" for its vector.  This one entry will
allow one EISA/ISA/PCI/VL Buslogic controller to be probed.  The driver
is almost fully dynamic.  It just needs some kdc work and for the SCSI code
to stop passing unit numbers up in the scsi_xfer struct.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.53 1995/12/10 22:14:15 bde Exp $
d22 1
a22 1
options		"SCSI_DELAY=15"		#Be pessimistic about Joe SCSI device
d83 1
a83 1
#options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD >= 2.0.5
d87 1
a87 1
#options		"PCVT_SCANSET=2"	# IBM keyboards are non-std
@


1.53
log
@Added pcvt option FAT_CURSOR.

Fixed comment about PCVT_VERSION=210.

Fixed tabs and trailing blanks.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.52 1995/11/29 20:07:46 nate Exp $
d53 1
a53 1
controller	bt0	at isa? port "IO_BT0" bio irq ? vector btintr
@


1.52
log
@GENERIC - Add a commented out line for adding support for IBM ThinkPad
          keyboards

LINT - Add SCANSET=2 support to the LINT kernel and comments reflecting it's
       purpose.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.51 1995/11/09 22:46:58 gibbs Exp $
d26 1
a26 1
config		kernel	root on wd0 
d45 2
a46 2
options         ATAPI   #Enable ATAPI support for IDE bus
device          wcd0    #IDE CD-ROM
d56 1
a56 1
controller	aic0    at isa? port 0x340 bio irq 11 vector aicintr
d83 1
a83 1
#options		"PCVT_FREEBSD=210"	# pcvt running on FreeBSD 2.1
d85 1
@


1.51
log
@Change ahb device line to eisaconf syntax.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.50 1995/11/05 17:02:50 gibbs Exp $
d85 2
@


1.50
log
@Add eisa0 and remove ISA configuration line for ahc0.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.49 1995/10/31 16:59:59 joerg Exp $
d49 1
a54 1
controller	ahb0	at isa? bio irq ? vector ahbintr
@


1.49
log
@Include the "od" driver.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.48 1995/10/25 16:43:00 jkh Exp $
d29 1
d50 1
a53 1
controller	ahc1	at isa? bio irq ? vector ahcintr
@


1.48
log
@Stable matcd port to 0x230, as per request by Bruce and Frank.
Submitted by: Frank Durda IV <uhclem@@fw.ast.com>
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.47 1995/08/18 11:26:16 jkh Exp $
d63 2
@


1.47
log
@Bring in Serge Vakulenko's IDE CDROM (ATAPI) driver.  A number of
people have now indicated to me that it's working more than well
enough to bring into -current.
Submitted by:	Serge Vakulenko <vak@@cronyx.ru>
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46 1995/06/11 19:31:11 rgrimes Exp $
d72 1
a72 1
controller	matcd0	at isa? port ? bio
@


1.46
log
@Merge RELENG_2_0_5 into HEAD
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.45.2.3 1995/06/05 21:50:41 jkh Exp $
d43 3
@


1.46.2.1
log
@Add mse0 back to GENERIC, as I'd intended.  Also remove sio3 - do
we really want a serial probe on IRQ 9?  I think not.  I certainly
don't see that as GENERIC fodder, anyway.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46 1995/06/11 19:31:11 rgrimes Exp $
d85 1
a89 1
device		mse0	at isa? port 0x23c tty irq 5 vector mseintr
@


1.46.2.2
log
@Put sio3 back, add ATAPI to -current GENERIC kernel.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.1 1995/08/26 13:17:47 jkh Exp $
a43 3
options		ATAPI   #Enable ATAPI support for IDE bus
device		wcd0    #IDE CD-ROM

a84 1
device		sio3	at isa? port "IO_COM4" tty irq 9 vector siointr
@


1.46.2.3
log
@Bring in miscellaneous changes to the HEAD.
I also brought the ATAPI stuff into files.i386 where it shouldn't
cause any trouble and will also save David a few minescule diffs.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.2 1995/08/28 17:45:46 jkh Exp $
d44 2
a45 2
options         ATAPI   #Enable ATAPI support for IDE bus
device          wcd0    #IDE CD-ROM
@


1.46.2.4
log
@Comment out the IDE CDROM entries here.  2.1 doesn't *have* IDE CROM
support!
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.3 1995/09/14 23:47:06 jkh Exp $
d44 2
a45 2
#options         ATAPI   #Enable ATAPI support for IDE bus
#device          wcd0    #IDE CD-ROM
@


1.46.2.5
log
@Bloat GENERIC a little by seeing of SYSV* stuff fits.  If it's
too big on the floppy, we'll pare it back.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.4 1995/09/18 01:02:17 jkh Exp $
a24 4

options		SYSVSHM
options		SYSVSEM
options		SYSVMSG
@


1.46.2.6
log
@Merge from HEAD, also eliminate the now-useless ATAPI description.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.5 1995/09/23 00:50:05 jkh Exp $
d76 1
a76 1
controller	matcd0	at isa? port 0x230 bio
@


1.46.2.7
log
@Merge with HEAD.  Add eisaconf support and update all eisaconf based drivers
(ahb, ahc, bt).
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.6 1995/10/25 17:29:51 jkh Exp $
a32 1
controller	eisa0
a51 1
controller	ahb0
a52 1
controller	ahc1
d54 1
a54 1
controller	bt0	at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
d56 2
@


1.46.2.8
log
@Added a comment just before the npx0 device.

# Mandatory, don't remove
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.7 1996/01/04 08:51:05 gibbs Exp $
a87 1
# Mandatory, don't remove
@


1.46.2.9
log
@Added comment out psm0 (PS/2) mouse device entry so that users can find
it easier.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.8 1996/01/20 06:13:20 nate Exp $
a99 1
#device		psm0	at isa? port "IO_KBD" conflicts tty irq 12 vector psmintr
@


1.46.2.10
log
@Whoops, this got missed.
- Add commented out apm support to GENERIC.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.9 1996/04/18 04:04:21 nate Exp $
a89 6

#
# Laptop support (see LINT for more options)
#
#device		apm0    at isa?		# Advanced Power Management
#options		APM_BROKEN_STATCLOCK	# Workaround some buggy APM BIOS
@


1.46.2.11
log
@Bring in changes from the HEAD:
  GENERIC - Add a commented out line for adding support for IBM ThinkPad
            keyboards

  LINT - Add SCANSET=2 support to the LINT kernel and comments reflecting it's
         purpose.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.10 1996/04/22 19:49:45 nate Exp $
a86 2
# If you have a ThinkPAD, uncomment this along with the rest of the PCVT lines
#options		PCVT_SCANSET=2		# IBM keyboards are non-std
@


1.46.2.12
log
@Yikes!  The wcd0 driver got left out of -stable's GENERIC!  No wonder
the ATAPI 2.1-SNAP testers have been having problems! :-(
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.11 1996/07/03 05:23:11 nate Exp $
d49 2
a50 2
options         ATAPI   #Enable ATAPI support for IDE bus
device          wcd0    #IDE CD-ROM
@


1.46.2.13
log
@Do the same for 2.1-stable.  Those who'll note that sio2 and sio3 have
gone away can talk to David - this was done with his explicit OK. :-)
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.12 1996/07/08 23:01:41 jkh Exp $
d55 1
d75 1
d101 2
d106 1
d108 1
a108 1
device		psm0	at isa? disable port "IO_KBD" conflicts tty irq 12 vector psmintr
d122 1
@


1.46.2.14
log
@Add sio2 and sio3 back as disabled devices.  Sheesh, you'd think I killed
Nicole Simpson and Ron Goldman for all the impassioned feedback I've gotten
on this one!
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.13 1996/07/10 03:41:12 jkh Exp $
a98 2
device		sio2	at isa? disable port "IO_COM3" tty irq 5 vector siointr
device		sio3	at isa? disable port "IO_COM4" tty irq 9 vector siointr
@


1.46.2.15
log
@Add forgotten fxp0 entry.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.14 1996/07/11 01:09:47 jkh Exp $
a111 1
device fxp0
@


1.46.2.16
log
@Add forgotten fxp0 entry.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.15 1996/07/16 08:44:57 davidg Exp $
a112 1
device vx0
@


1.46.2.17
log
@Woops, one change snuck in that I wanted in a seperate commit...
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.16 1996/07/16 08:45:50 davidg Exp $
d113 1
@


1.46.2.18
log
@Ported the 3Com 3c590/3c595 driver from -current to -stable (for 2.1.5).
Done against my better judgement, but at least we won't be sued for false
advertising. Sigh.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.17 1996/07/16 08:47:09 davidg Exp $
a112 1
device vx0
@


1.46.2.19
log
@Document new userconfig options.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.46.2.18 1996/07/16 08:53:04 davidg Exp $
a24 3

options		USERCONFIG              #boot -c editor
options		VISUAL_USERCONFIG       #visual boot -c editor
@


1.46.2.20
log
@$Id$ -> $FreeBSD$
@
text
@d4 1
a4 1
# $FreeBSD$
@


1.45
log
@Changed swap partition handling/allocation so that it doesn't
require specific partitions be mentioned in the kernel config
file ("swap on foo" is now obsolete).

From Poul-Henning:

The visible effect is this:

As default, unless
        options "NSWAPDEV=23"
is in your config, you will have four swap-devices.
You can swapon(2) any block device you feel like, it doesn't have
to be in the kernel config.

There is a performance/resource win available by getting the NSWAPDEV right
(but only if you have just one swap-device ??), but using that as default
would be too restrictive.

The invisible effect is that:

Swap-handling disappears from the $arch part of the kernel.
It gets a lot simpler (-145 lines) and cleaner.

Reviewed by:	John Dyson, David Greenman
Submitted by:	Poul-Henning Kamp, with minor changes by me.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.44 1995/05/02 04:40:06 phk Exp $
d91 4
d98 1
a98 1
device eg0 at isa? port 0x310 net irq 5 vector egintr
a99 1
device ie0 at isa? port 0x360 net irq  7 iomem 0xd0000 vector ieintr
d111 3
a113 1
pseudo-device	ppp	1
a114 1
pseudo-device	speaker
a115 2
pseudo-device	vn
pseudo-device	tun	1
@


1.45.2.1
log
@# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
# Right now it appears that the ie0 must be probed before ep0. See
# revision 1.20 of this file.

There is a conflict with over loaded usage of address 0x100, the
Intel EtherExpress may have a hidden port here, Intel does not
document that even in the NDA stuff I have :-(.

Submitted by:	bde, [Original by gibbs]
Obtained from:	Revision 1.20 of this file.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.45 1995/05/14 02:59:44 davidg Exp $
a90 4
# Order is important here due to intrusive probes, do *not* alphabetize
# this list of network interfaces until the probes have been fixed.
# Right now it appears that the ie0 must be probed before ep0. See
# revision 1.20 of this file.
d95 1
a96 1
device ep0 at isa? port 0x300 net irq 10 vector epintr
@


1.45.2.2
log
@Removed eg driver, speaker, and vn devices to help reduce the size of the
GENERIC kernel.

Reviewed by:	Jordan Hubbard, Poul-Henning Kamp
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.45.2.1 1995/06/01 04:57:15 rgrimes Exp $
d98 1
d114 1
d116 1
@


1.45.2.3
log
@Take ppp out of the GENERIC kernel to save space.
We don't use it from GENERIC.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.45.2.2 1995/06/05 17:15:42 davidg Exp $
d111 1
a111 3
# ijppp uses tun instead of ppp device
#pseudo-device	ppp	1
pseudo-device	tun	1
d114 1
@


1.44
log
@A missing 'and', probably my fault.

Submitted by:	Ed Hudson <elh@@p5.spnet.com>
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.43 1995/04/24 05:33:58 phk Exp $
d26 1
a26 1
config		kernel	root on wd0 swap on wd0 and wd1 and wd2 and wd3 and sd0 and sd1 and vn0 dumps on wd0
@


1.43
log
@Added "bio" to matcd.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.42 1995/04/20 06:05:17 phk Exp $
d26 1
a26 1
config		kernel	root on wd0 swap on wd0 and wd1 and wd2 and wd3 sd0 and sd1 and vn0 dumps on wd0
@


1.42
log
@Add wd2 and wd3 as swap-devices too.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.41 1995/04/10 19:13:51 phk Exp $
d69 1
a69 1
controller	matcd0	at isa? port ?
@


1.41
log
@I got that wrong,
	lnc0	@@ 0x280
	lnc1	@@ 0x300

moved le0 into sorted sequence.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.40 1995/04/10 19:12:29 phk Exp $
d26 1
a26 1
config		kernel	root on wd0 swap on wd0 and wd1 and sd0 and sd1 and vn0 dumps on wd0
@


1.40
log
@lnc0 is @@ 0x300
lnc1 is @@ 0x280
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.39 1995/04/08 21:41:51 phk Exp $
d98 1
a100 1
device le0 at isa? port 0x300 net irq 5 iomem 0xd0000 vector le_intr
@


1.39
log
@Move default address of lnc0 to 0x300.  Luigi Rizzo said that his card
cannot even go below 0x300...
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.38 1995/04/08 09:36:00 phk Exp $
d98 2
a99 1
device lnc0 at isa? port 0x300 net irq 10 drq 0 vector lncintr
@


1.38
log
@Added the "eg0" interface driver for the 3Com "3c505" or "etherlink/+"
card.  This is the braindamaged card with the 80186 CPU on it.  It is
slow, probably not very good after all, but hey, if you have one lying
around doing nothing anyway...

Added the "zp0" driver to GENERIC.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.37 1995/03/30 00:20:07 rgrimes Exp $
d98 1
a98 1
device lnc0 at isa? port 0x280 net irq 10 drq 0 vector lncintr
@


1.37
log
@Submitted by:	Mahesh Neelakanta <mahesh@@gcomm.com>

Change I/O address of Intel EtherExpress driver (ix0) from 0x280 to
0x300.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.36 1995/03/18 08:12:47 rgrimes Exp $
d94 2
a97 1
device ep0 at isa? port 0x300 net irq 10 vector epintr
d101 1
@


1.36
log
@Add Intel EtherExpress16 (ix0) driver.
Reviewed by:
Submitted by:
Obtained from:
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.35 1995/03/12 12:10:35 amurai Exp $
d95 1
a95 1
device ix0 at isa? port 0x280 net irq 10 iomem 0xd0000 iosiz 32768 vector ixintr
@


1.35
log
@Adding tunnel pseudo-device for Network Installation with User process PPP.
Reviewed by:	amruai@@spec.co.jp
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.34 1995/03/05 22:23:31 joerg Exp $
d95 1
@


1.34
log
@pcvt is still using the XSERVER option; document this.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.33 1995/03/02 04:06:03 jkh Exp $
d109 1
@


1.33
log
@Changes to incorporate the Matsushita CDROM driver (otherwise known as
the "Sound blaster CDROM").
Submitted by:	Frank Durda IV <bsdmail@@nemesis.lonestar.org>
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.32 1995/02/15 20:38:36 joerg Exp $
d78 1
@


1.32
log
@Include three lines about the pcvt console driver, so we don't ever need
a different config file for it.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.31 1995/02/09 11:21:07 jkh Exp $
d68 2
@


1.31
log
@Add PPP to the generic kernel.  Now that Poul has made us all this space,
maybe I can get us back into the slip/ppp game without having to tell users
to reconfigure their kernels all the time! :)
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.30 1995/01/28 05:01:43 jkh Exp $
d71 1
d73 4
@


1.30
log
@Add soundblaster CD to generic kernel.  Hope this doesn't run us out
of space!
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.29 1995/01/27 07:48:58 phk Exp $
d95 2
a96 1
pseudo-device	sl	2
@


1.29
log
@New and far better NCR5380/NCR53400 scsi-driver.

Handles at least Trantor T130 and ProAudioSpectrum adapters.
The pas driver has consequently been removed.
This driver can be configured without without interrupts.

Manpage to follow when PAS16 has been edited in.

Reviewed by:	phk
Submitted by:	Serge Vakulenko, <vak@@cronyx.ru>
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.28 1995/01/26 05:04:34 ache Exp $
d68 2
@


1.28
log
@Remove FAT_CURSOR, it is already non-existent during several
last syscons versions
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.27 1995/01/24 20:38:27 paul Exp $
d53 2
a54 1
controller	pas0	at isa? port 0x1f88 bio
@


1.27
log
@is to lnc changes
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.26 1995/01/14 10:48:56 jkh Exp $
a21 1
options		"FAT_CURSOR"		#block cursor in syscons or pccons
@


1.26
log
@Remove bogus scd0 driver - I should have looked at LINT first, anyway.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.25 1995/01/14 02:39:19 jkh Exp $
d86 1
a86 1
device is0 at isa? port 0x280 net irq 10 drq 7 vector isintr
@


1.25
log
@Put UCONSOLE back - I was wrong, it's still used in one last place.
Submitted by:	ollivier
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.24 1995/01/13 02:23:03 gibbs Exp $
a67 1
device		scd0	at isa? port 0x330 bio irq 5 vector scdintr
@


1.24
log
@Add in aic7770.c (EISA/VL Adaptors) and aic7870.c (PCI adaptor) dependancies
for the ahc driver.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.23 1995/01/12 15:37:14 jkh Exp $
d25 1
d56 1
d68 1
@


1.23
log
@1. Remove UCONSOLE.  This appears to be well and truly dead (unless it's
   hiding someplace in /sys I can't find).
2. Remove NCONS.  Soren's latest changes make it a no-op.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.22 1994/12/18 12:01:40 jkh Exp $
d45 1
d49 1
a49 1
controller	ahc0	at isa? bio irq ? vector ahcintr
@


1.22
log
@Add a 'vn' to GENERIC
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.21 1994/12/16 06:04:14 phk Exp $
a21 1
options		UCONSOLE		#X Console support
a23 1
options		"NCONS=4"		#4 virtual consoles
@


1.21
log
@Remove sd1-sd3 & st1, now that we can autoallocate them.

fix the vn driver in LINT.  It autoallocates too.

Reviewed by:	phk
Submitted by:	rgrimes
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.20 1994/11/18 19:10:25 jkh Exp $
d28 1
a28 1
config		kernel	root on wd0 swap on wd0 and wd1 and sd0 and sd1 dumps on wd0
d96 1
@


1.20
log
@Put ie0 above ep0.  Otherwise, the ie0 probe clobbers it.
Submitted by:	gibbs
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.19 1994/11/17 20:20:53 gibbs Exp $
a58 3
device		sd1
device		sd2
device		sd3
a60 1
device		st1
@


1.19
log
@New device-driver entries for the aic7770 driver.  These use new features
of config so YOU MUST RECOMPILE CONFIG.  Modifying config was the cleanest
solution to integrating this driver into the tree which will become more
obvious in the next commit.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.18 1994/11/13 10:17:04 gibbs Exp $
d87 1
a88 1
device ie0 at isa? port 0x360 net irq  7 iomem 0xd0000 vector ieintr
@


1.18
log
@Add ep0 line to kernel config files.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.17 1994/11/13 09:42:07 nate Exp $
d49 2
a52 1
controller	uha0	at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr
@


1.17
log
@Add Matt Thomas' le0 DEPCA driver to the GENERIC kernel.  This works
but I can't test to see if it walks on other ethernet drivers.  Can the
install folks add this driver to the install script?
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.16 1994/11/13 07:20:03 davidg Exp $
d86 1
@


1.16
log
@Nuked ed2 - it was added for the common 16bit card case where the
irq is 10. This is auto-sensed/configured now in the 'ed' driver.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.15 1994/11/12 20:27:24 jkh Exp $
d88 1
@


1.15
log
@Add back ed2.  Harrumph..
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.13 1994/11/11 05:48:49 davidg Exp $
a85 1
device ed2 at isa? port 0x300 net irq 10 iomem 0xcc000 vector edintr
@


1.14
log
@ed2 was actually an impossible entry to reach!
@
text
@d86 1
@


1.13
log
@Added 'de' ethernet driver.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.12 1994/11/10 23:46:31 jkh Exp $
a85 1
device ed2 at isa? port 0x300 net irq 10 iomem 0xcc000 vector edintr
@


1.12
log
@Enable floppy-tape support.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.11 1994/11/08 07:39:26 jkh Exp $
d83 1
@


1.11
log
@Add back ze0 driver; somebody took it out of _both_ LINT and GENERIC,
kinda hosing the laptop folks.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.10 1994/11/05 07:41:08 jkh Exp $
d36 1
a36 1
#tape		ft0	at fdc0 drive 2
@


1.10
log
@Argh!  Missing quotes.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.9 1994/11/05 07:38:50 jkh Exp $
d88 1
@


1.9
log
@We need CD9660 and MSDOS filesystems built-in if the floppy is to have
a hope of getting at these types of filesystems without dragging all
the LKM stuff in.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.8 1994/11/03 15:51:36 jkh Exp $
d19 1
a19 1
options		CD9660			#ISO 9660 Filesystem
@


1.8
log
@Eliminate USERCONFIG.  This option is now standard.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.7 1994/11/03 01:46:59 gpalmer Exp $
d16 4
a19 2
options		FFS			#Berkeley Fast File System
options		NFS			#Network File system
@


1.7
log
@Cosmetic changes in comment at start (it's no longer a GENERICAH config
file!)
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.6 1994/10/26 19:20:26 jkh Exp $
a24 1
options		USERCONFIG		#Allow user configuration with -c
@


1.6
log
@Enable USERCONFIG and document it in LINT.
@
text
@d2 1
a2 1
# GENERICAH -- Generic machine with WD/AHx/NCR family disks
d4 1
a4 1
#	$Id: GENERIC,v 1.5 1994/10/24 22:18:11 sos Exp $
@


1.5
log
@Added sea0 - Seagate driver lines to config
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.4 1994/10/22 17:50:17 phk Exp $
d25 1
@


1.4
log
@NFS-diskless works.  Look in sys/i386/boot/netboot for some of the
explanation.  More doc needed, but not hard to do, if you want to.

A big hand to Martin Renters for the netboot program !

Anybody want to compete on who can "make world" in the shortest
amount of time ?  I have 127 i486DX2/66 and 5 P60's I can use
now.  And 3 times 66 Gb file servers to support it... :->

Anyway, NFS will be standard in the GENERIC kernel now, so that
people can use the bin-tarball to set up shop.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.3 1994/10/20 00:53:25 phk Exp $
d52 1
a52 1

@


1.3
log
@According to a quick reading of sources, one experiment and Bruce's word:
aha, ahb and bt all on "irq ?" now.
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.2 1994/10/20 00:19:34 phk Exp $
d17 1
@


1.2
log
@Bruce told me to:  Make uha0 use irq ?
@
text
@d4 1
a4 1
#	$Id: GENERIC,v 1.1 1994/10/17 21:10:19 phk Exp $
d45 3
a47 3
controller	bt0	at isa? port "IO_BT0" bio irq 12 vector btintr
controller	ahb0	at isa? bio irq 11 vector ahbintr
controller	aha0	at isa? port "IO_AHA0" bio irq 11 drq 5 vector ahaintr
@


1.1
log
@GENERIC is our new all singing and dancing kernel.  Please report ASAP if
there is anything GENERICAH or GENERICBT can, which this one cannot.

MINI changed to reflect the SCSI-pecking-order.
@
text
@d4 1
a4 1
#	$Id: GENERICAH,v 1.52 1994/10/15 22:19:37 phk Exp $
d48 1
a48 1
controller	uha0	at isa? port "IO_UHA0" bio irq 14 drq 5 vector uhaintr
@
