head	1.66;
access;
symbols
	RELENG_4_11_0_RELEASE:1.21.2.5
	RELENG_4_11:1.21.2.5.0.16
	RELENG_4_11_BP:1.21.2.5
	RELENG_4_10_0_RELEASE:1.21.2.5
	RELENG_4_10:1.21.2.5.0.14
	RELENG_4_10_BP:1.21.2.5
	RELENG_4_9_0_RELEASE:1.21.2.5
	RELENG_4_9:1.21.2.5.0.12
	RELENG_4_9_BP:1.21.2.5
	RELENG_4_8_0_RELEASE:1.21.2.5
	RELENG_4_8:1.21.2.5.0.10
	RELENG_4_8_BP:1.21.2.5
	RELENG_4_7_0_RELEASE:1.21.2.5
	RELENG_4_7:1.21.2.5.0.8
	RELENG_4_7_BP:1.21.2.5
	RELENG_4_6_2_RELEASE:1.21.2.5
	RELENG_4_6_1_RELEASE:1.21.2.5
	RELENG_4_6_0_RELEASE:1.21.2.5
	RELENG_4_6:1.21.2.5.0.6
	RELENG_4_6_BP:1.21.2.5
	RELENG_4_5_0_RELEASE:1.21.2.5
	RELENG_4_5:1.21.2.5.0.4
	RELENG_4_5_BP:1.21.2.5
	RELENG_4_4_0_RELEASE:1.21.2.5
	RELENG_4_4:1.21.2.5.0.2
	RELENG_4_4_BP:1.21.2.5
	KSE_MILESTONE_2:1.50
	KSE_PRE_MILESTONE_2:1.50
	RELENG_4_3_0_RELEASE:1.21.2.4
	RELENG_4_3:1.21.2.4.0.2
	RELENG_4_3_BP:1.21.2.4
	RELENG_4_2_0_RELEASE:1.21.2.3
	RELENG_4_1_1_RELEASE:1.21.2.1
	PRE_SMPNG:1.28
	RELENG_4_1_0_RELEASE:1.21.2.1
	RELENG_4_0_0_RELEASE:1.21
	RELENG_4:1.21.0.2
	RELENG_4_BP:1.21;
locks; strict;
comment	@# @;


1.66
date	2002.08.15.08.04.06;	author imp;	state dead;
branches;
next	1.65;

1.65
date	2002.07.23.06.35.08;	author peter;	state Exp;
branches;
next	1.64;

1.64
date	2002.07.21.23.09.15;	author peter;	state Exp;
branches;
next	1.63;

1.63
date	2002.07.08.11.56.44;	author markm;	state Exp;
branches;
next	1.62;

1.62
date	2002.04.09.11.18.38;	author phk;	state Exp;
branches;
next	1.61;

1.61
date	2002.04.03.10.56.55;	author ru;	state Exp;
branches;
next	1.60;

1.60
date	2002.03.06.19.44.08;	author cjc;	state Exp;
branches;
next	1.59;

1.59
date	2002.01.15.06.43.59;	author imp;	state Exp;
branches;
next	1.58;

1.58
date	2001.12.09.01.57.06;	author dillon;	state Exp;
branches;
next	1.57;

1.57
date	2001.12.05.18.08.23;	author rwatson;	state Exp;
branches;
next	1.56;

1.56
date	2001.12.04.11.13.20;	author des;	state Exp;
branches;
next	1.55;

1.55
date	2001.10.31.20.15.18;	author rwatson;	state Exp;
branches;
next	1.54;

1.54
date	2001.10.30.06.11.15;	author imp;	state Exp;
branches;
next	1.53;

1.53
date	2001.10.25.19.45.39;	author asmodai;	state Exp;
branches;
next	1.52;

1.52
date	2001.10.25.19.41.13;	author asmodai;	state Exp;
branches;
next	1.51;

1.51
date	2001.09.25.18.56.38;	author brooks;	state Exp;
branches;
next	1.50;

1.50
date	2001.08.06.16.04.39;	author nate;	state Exp;
branches;
next	1.49;

1.49
date	2001.07.28.20.40.49;	author markm;	state Exp;
branches;
next	1.48;

1.48
date	2001.07.13.13.34.08;	author dd;	state Exp;
branches;
next	1.47;

1.47
date	2001.06.17.02.02.33;	author imp;	state Exp;
branches;
next	1.46;

1.46
date	2001.06.17.01.57.39;	author imp;	state Exp;
branches;
next	1.45;

1.45
date	2001.05.29.18.49.02;	author phk;	state Exp;
branches;
next	1.44;

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

1.43
date	2001.04.05.17.00.46;	author imp;	state Exp;
branches;
next	1.42;

1.42
date	2001.03.16.11.52.25;	author sos;	state Exp;
branches;
next	1.41;

1.41
date	2001.03.16.06.33.44;	author imp;	state Exp;
branches;
next	1.40;

1.40
date	2001.03.03.08.31.37;	author imp;	state Exp;
branches;
next	1.39;

1.39
date	2001.02.25.05.52.38;	author peter;	state Exp;
branches;
next	1.38;

1.38
date	2001.02.04.15.35.08;	author peter;	state Exp;
branches;
next	1.37;

1.37
date	2001.01.19.14.23.51;	author peter;	state Exp;
branches;
next	1.36;

1.36
date	2001.01.14.17.50.13;	author markm;	state Exp;
branches;
next	1.35;

1.35
date	2000.12.13.21.52.44;	author imp;	state Exp;
branches;
next	1.34;

1.34
date	2000.11.15.18.42.44;	author imp;	state Exp;
branches;
next	1.33;

1.33
date	2000.11.07.21.26.34;	author imp;	state Exp;
branches;
next	1.32;

1.32
date	2000.11.07.21.07.35;	author imp;	state Exp;
branches;
next	1.31;

1.31
date	2000.11.07.20.22.19;	author semenu;	state Exp;
branches;
next	1.30;

1.30
date	2000.10.03.18.30.15;	author wpaul;	state Exp;
branches;
next	1.29;

1.29
date	2000.09.12.13.21.40;	author markm;	state Exp;
branches;
next	1.28;

1.28
date	2000.08.03.21.51.03;	author imp;	state Exp;
branches;
next	1.27;

1.27
date	2000.06.13.22.28.46;	author peter;	state Exp;
branches;
next	1.26;

1.26
date	2000.05.30.23.01.37;	author green;	state Exp;
branches;
next	1.25;

1.25
date	2000.05.29.03.34.04;	author imp;	state Exp;
branches;
next	1.24;

1.24
date	2000.05.13.11.21.19;	author hoek;	state Exp;
branches;
next	1.23;

1.23
date	2000.04.30.15.38.28;	author markm;	state Exp;
branches;
next	1.22;

1.22
date	2000.03.25.03.15.03;	author imp;	state Exp;
branches;
next	1.21;

1.21
date	2000.02.16.04.27.04;	author yokota;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2000.01.24.05.38.55;	author bde;	state Exp;
branches;
next	1.19;

1.19
date	2000.01.23.18.31.19;	author peter;	state Exp;
branches;
next	1.18;

1.18
date	2000.01.14.20.40.59;	author wpaul;	state Exp;
branches;
next	1.17;

1.17
date	2000.01.14.03.14.43;	author wpaul;	state Exp;
branches;
next	1.16;

1.16
date	2000.01.13.07.01.13;	author mdodd;	state Exp;
branches;
next	1.15;

1.15
date	2000.01.08.16.19.33;	author peter;	state Exp;
branches;
next	1.14;

1.14
date	2000.01.08.16.17.41;	author peter;	state Exp;
branches;
next	1.13;

1.13
date	2000.01.05.04.27.13;	author wpaul;	state Exp;
branches;
next	1.12;

1.12
date	99.12.28.02.01.04;	author wpaul;	state Exp;
branches;
next	1.11;

1.11
date	99.12.23.05.32.53;	author wpaul;	state Exp;
branches;
next	1.10;

1.10
date	99.12.19.21.55.29;	author imp;	state Exp;
branches;
next	1.9;

1.9
date	99.12.18.07.49.54;	author imp;	state Exp;
branches;
next	1.8;

1.8
date	99.12.18.07.47.34;	author imp;	state Exp;
branches;
next	1.7;

1.7
date	99.12.06.18.17.42;	author peter;	state Exp;
branches;
next	1.6;

1.6
date	99.12.04.17.41.19;	author wpaul;	state Exp;
branches;
next	1.5;

1.5
date	99.11.20.07.23.26;	author imp;	state Exp;
branches;
next	1.4;

1.4
date	99.11.01.17.50.29;	author imp;	state Exp;
branches;
next	1.3;

1.3
date	99.11.01.04.02.58;	author peter;	state Exp;
branches;
next	1.2;

1.2
date	99.10.26.16.53.55;	author imp;	state Exp;
branches;
next	1.1;

1.1
date	99.10.26.04.57.24;	author imp;	state Exp;
branches;
next	;

1.21.2.1
date	2000.05.13.11.22.14;	author hoek;	state Exp;
branches;
next	1.21.2.2;

1.21.2.2
date	2000.10.03.18.46.53;	author wpaul;	state Exp;
branches;
next	1.21.2.3;

1.21.2.3
date	2000.11.07.20.28.23;	author semenu;	state Exp;
branches;
next	1.21.2.4;

1.21.2.4
date	2001.04.05.17.23.11;	author sos;	state Exp;
branches;
next	1.21.2.5;

1.21.2.5
date	2001.04.21.04.51.03;	author imp;	state dead;
branches;
next	;


desc
@@


1.66
log
@No longer needed
@
text
@#
# NEWCARD -- efforts at porting newconfig pccard/cardbus code to newbus
#
# This is a new implementation of pccard and cardbus support.  It works
# for many folks right now.  Some folks still have issues.  The support
# around the edges isn't as complete as the previous pccard system.
#
# For more information on this file, please read the handbook section on
# Kernel Configuration Files:
#
#    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 NOTES configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in NOTES.
#
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.65 2002/07/23 06:35:08 peter Exp $

machine		i386
cpu		I486_CPU
cpu		I586_CPU
cpu		I686_CPU
ident		NEWCARD
maxusers	0

#To statically compile in device wiring instead of /boot/device.hints
#hints		"NEWCARD.hints"		#Default places to look for devices.

makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols

options 	INET			#InterNETworking
options 	INET6			#IPv6 communications protocols
options 	FFS			#Berkeley Fast Filesystem
options 	SOFTUPDATES		#Enable FFS soft updates support
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 root device, requires NFSCLIENT
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 	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 	P1003_1B		#Posix P1003_1B real-time extensions
options 	_KPOSIX_PRIORITY_SCHEDULING
options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev

# Debugging for use in -current
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 mutex checks to detects 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

device		isa
device		eisa
device		pci
#options 	PCI_ENABLE_IO_MODES	# Enable pci resources left off by a "lazy BIOS"

# Floppy drives
device		fdc

# ATA and ATAPI devices
device		ata
device		atadisk			# ATA disk 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		ahb		# EISA AHA1742 family
device		ahc		# AHA2940 and onboard AIC7xxx devices
device		amd		# AMD 53C974 (Tekram DC-390(T))
device		isp		# Qlogic family
#device		ncr		# NCR/Symbios Logic
device		sym		# NCR/Symbios Logic (newer chipsets + those of `ncr')

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		amr		# AMI MegaRAID
device		ida		# Compaq Smart RAID
device		mlx		# Mylex DAC960 family
device		twe		# 3ware ATA RAID

# atkbdc0 controls both the keyboard and the PS/2 mouse
device		atkbdc	1	# At keyboard controller
device		atkbd		# at keyboard
device		psm		# psm mouse

device		vga		# VGA screen

# splash screen/screen saver
device		splash

# syscons is the default console driver, resembling an SCO console
device		sc	1

# 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

# 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

# Pcmcia and cardbus bridge support
device		pccbb			# cardbus (yenta) bridge
device		pccard
device		cardbus

# Serial (COM) ports
device		sio		# 8250, 16[45]50 based serial ports

# 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


# PCI Ethernet NICs.
device		de		# DEC/Intel DC21x4x (``Tulip'')
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		dc		# DEC/Intel 21143 and various workalikes
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
device		pcn		# AMD Am79C97x PCI 10/100 NICs
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
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		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		an		# Aironet 4500/4800 802.11 wireless NICs. 
device		awi		# BayStack 660 and others
device		wi		# WaveLAN/IEEE 802.11 wireless NICs. 
#device		wl		# Older non 802.11 Wavelan wireless NIC.

# Pseudo devices - the number indicates how many units to allocate.
device		random		# Entropy device
device		loop		# Network loopback
device		ether		# Ethernet support
device		sl		# Kernel SLIP
device		ppp	1	# Kernel PPP
device		tun		# Packet tunnel.
device		pty		# Pseudo-ttys (telnet etc)
device		md		# Memory "disks"
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

# USB support
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		cue		# CATC USB ethernet
device		kue		# Kawasaki LSI USB ethernet
@


1.65
log
@de-count pci
@
text
@d22 1
a22 1
# $FreeBSD$
@


1.64
log
@Add static unit count for pci here as well.
@
text
@d72 1
a72 1
device		pci	1		# Unit count is for ahc/ahd
@


1.63
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
@d72 1
a72 1
device		pci
@


1.62
log
@GC various bits and pieces of USERCONFIG from all over the place.
@
text
@d149 1
a149 1
device		apm
@


1.61
log
@Dike out a highly insecure UCONSOLE option.
TIOCCONS must be able to VOP_ACCESS() /dev/console to succeed.

Obtained from:	OpenBSD
@
text
@a50 2
#options 	USERCONFIG		#boot -c editor
#options 	VISUAL_USERCONFIG	#visual boot -c editor
@


1.60
log
@Sync with GENERIC. WITNESS_SKIPSPIN, and the ciss and iir devices.
@
text
@a50 1
options 	UCONSOLE		#Allow users to grab the console
@


1.59
log
@Sync to GENERIC: add UFS_DIRHASH

Submitted by: Anders Andersson <anders@@hack.org>
@
text
@d67 1
d109 1
d111 1
@


1.58
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
@d40 1
@


1.57
log
@o Whitespace sync to GENERIC
@
text
@d29 1
a29 1
maxusers	32
@


1.56
log
@PROCFS requires PSEUDOFS.
@
text
@d74 1
a74 1
#options		PCI_ENABLE_IO_MODES	# Enable pci resources left off by a "lazy BIOS"
@


1.55
log
@Spell deivces as devices.
@
text
@d46 2
a47 1
options 	PROCFS			#Process filesystem
@


1.54
log
@MFGeneric: ->1.327 Sync with GENERIC
@
text
@d200 1
a200 1
# ISA deivces that use the old ISA shims
@


1.53
log
@Remove wx driver, which got recently removed.

Submitted by:	revamped kernincludes.sh
@
text
@a35 1
options 	MATH_EMULATE		#Support for x87 emulation
d43 1
a43 1
options 	NFS_ROOT		#NFS usable as root device, NFS required
d61 4
a64 4
options 	DDB
options 	INVARIANTS
options 	INVARIANT_SUPPORT
options 	WITNESS
d73 1
d111 1
d116 1
d170 1
a171 1
device		txp		# 3Com 3cR990 (``Typhoon'')
d196 1
d200 1
a200 2
# The probe order of these is presently determined by i386/isa/isa_compat.c.
#device		ie
a201 1
device		lnc
@


1.52
log
@Unbreak NEWCARD by removing options NFS and replacing it with the
new NFSCLIENT and NFSSERVER options.

Submitted by:	revamped kernincludes.sh
@
text
@a184 1
device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
@


1.51
log
@The faith(4) device is no longer a count device so don't specify a count.
@
text
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.50 2001/08/06 16:04:39 nate Exp $
d42 2
a43 1
options 	NFS			#Network Filesystem
@


1.50
log
@-Finished cleanup of old 'ThinkPad' comments that are no longer useful.

Reminded by:	bde
@
text
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.49 2001/07/28 20:40:49 markm Exp $
d218 1
a218 1
device		faith	1	# IPv6-to-IPv4 relaying (translation)
@


1.49
log
@Diff-reduce this with GENERIC.

OK'ed by:	imp
@
text
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.48 2001/07/13 13:34:08 dd Exp $
a138 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.48
log
@`pcn' supports AMD Am79C97x cards, not Am79C79x cards.

PR:		28946
Submitted by:	Ryuichiro Imura <imura@@ryu16.org>
@
text
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.47 2001/06/17 02:02:33 imp Exp $
d34 1
a34 1
#makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
a150 1
#device		pcic			# pcmcia bridge
d170 1
d219 1
a219 1
device		gif	4	# IPv6 and IPv4 tunneling
@


1.47
log
@Move cardbus and pccard bus bridge devices to near the bridge chips.  This
is so that all the pccard options are together and this reduces diffs with
GENERIC.
@
text
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.46 2001/06/17 01:57:39 imp Exp $
d177 1
a177 1
device		pcn		# AMD Am79C79x PCI 10/100 NICs
@


1.46
log
@MFGENERIC:
	1.307		Turn on kernel debug support
	1.309		Turn off pcm
	1.311		move wx to miibus chipsets
	1.312		Comment out USERCONFIG

Reminded by: mihira-san <sanpei@@sanpei.org>
@
text
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.45 2001/05/29 18:49:02 phk Exp $
a72 2
device		pccard
device		cardbus
d153 2
@


1.45
log
@Remove MFS options from all example kernel configs.
@
text
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.44 2001/05/13 20:52:39 phk Exp $
d50 2
a51 2
options 	USERCONFIG		#boot -c editor
options 	VISUAL_USERCONFIG	#visual boot -c editor
d60 6
a151 3
# Audio support
device		pcm

a170 1
device		wx		# Intel Gigabit Ethernet Card (``Wiseman'')
d186 1
a242 6

# This is an experimental kernel, so include DDB, INVARIANTS and WITNESS
options 	DDB
options 	INVARIANTS
options 	INVARIANT_SUPPORT
options 	WITNESS
@


1.44
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
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.43 2001/04/05 17:00:46 imp Exp $
a40 1
options 	MFS			#Memory Filesystem
@


1.43
log
@Soften the dire warnings about this code.  Things are kinda working
now and it does compile :-).  There are still some issues, but it is a
good time to soften the warning.
@
text
@d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.42 2001/03/16 11:52:25 sos Exp $
a46 1
options 	DEVFS			#Device Filesystem
@


1.42
log
@Remove the now defunct ATA_ENABLE* options

Spotted by: phk
@
text
@d4 3
a6 8
# ***************
# *** WARNING ***
# ***************
#
# USE THIS CODE AT YOUR OWN RISK.  IT IS EXPERIMENTAL AND WILL LIKELY NOT
# EVEN COMPILE FOR A WHILE.  YOU HAVE BEEN WARNED. -- imp
#
# CURRENT STATUS OF CODE: NOT WORKING.
d22 1
a22 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.41 2001/03/16 06:33:44 imp Exp $
@


1.41
log
@Resync to GENERIC.  This backs out the spammage that I committed wrt
killing ipv6 and some other things.

This makes GENERIC and NEWCARD the same, with OLDCARD stuff commented
out and the NEWCARD stuff included.  For the moment, pcic is commented
out (which has a old).  Plus invariants.  Plus ddb.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.40 2001/03/03 08:31:37 imp Exp $
a86 1
#options 	ATA_ENABLE_ATAPI_DMA	#Enable DMA on ATAPI devices
@


1.40
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.39 2001/02/25 05:52:38 peter Exp $
d43 1
a43 1
#options 	INET6			#IPv6 communications protocols
d52 1
a52 1
#options 	DEVFS			#Device Filesystem
d55 1
a55 1
options 	SCSI_DELAY=1000		#Delay (in ms) before probing SCSI
a70 5
options		IPFIREWALL
options		DUMMYNET
options		IPFIREWALL_DEFAULT_TO_ACCEPT
options		IPDIVERT

a74 1
device		pmtimer
a75 1
#options 	COMPAT_OLDISA		# compatability shims for lnc, le
d92 1
a92 1
device		amd		# AMD 53C974 (Teckram DC-390(T))
d97 5
a101 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
d153 1
a153 1
 
a156 1

a174 1
device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
d182 1
d207 1
a207 1
#device		lnc
d215 1
a215 1
# Pseudo devices - the number indicates how many units to allocated.
d224 2
a225 2
#device		gif	4	# IPv6 and IPv4 tunneling
#device		faith	1	# IPv6-to-IPv4 relaying (translation)
@


1.39
log
@Drop the 'count' from the aha device specs
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.38 2001/02/04 15:35:08 peter Exp $
d43 1
a43 1
options 	INET6			#IPv6 communications protocols
d71 5
d82 1
a82 1
options 	COMPAT_OLDISA		# compatability shims for lnc, le
d166 1
a166 1
device		pcic			# pcmcia bridge
d204 1
d213 2
a214 2
device		ie
device		le
d232 2
a233 2
device		gif	4	# IPv6 and IPv4 tunneling
device		faith	1	# IPv6-to-IPv4 relaying (translation)
d257 5
a261 2
# This is an experimental kernel, so include DDB
options DDB
@


1.38
log
@Clean up some leftovers from the root mount cleanup that was done some
time ago.  FFS_ROOT and CD9660_ROOT are obsolete.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.37 2001/01/19 14:23:51 peter Exp $
d101 1
a101 1
device		aha	1	# Adaptec 154x scsi adapters
@


1.37
log
@Sync with GENERIC - drop I386_CPU
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.36 2001/01/14 17:50:13 markm Exp $
a44 1
options 	FFS_ROOT		#FFS usable as root device [keep this!]
a51 1
options 	CD9660_ROOT		#CD-ROM usable as root, CD9660 required
@


1.36
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.35 2000/12/13 21:52:44 imp Exp $
a29 1
cpu		I386_CPU
@


1.35
log
@o Remove the COMPAT_OLDPCI option now that Mike removed it.
o Add pmtimer device
o Shorten scsi settle time to 1 second, since that's what I use and
  I'm tired of remerging it every time.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.34 2000/11/15 18:42:44 imp Exp $
a221 1
options 	NOBLOCKRANDOM	# avoid any blocking on device random
@


1.34
log
@MFGENERIC: 1.291
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.33 2000/11/07 21:26:34 imp Exp $
d58 1
a58 1
options 	SCSI_DELAY=15000	#Delay (in ms) before probing SCSI
d78 1
a80 1
options 	COMPAT_OLDPCI		# compatability shims for lnc
d212 1
a212 1
device		lnc
@


1.33
log
@Merge from GENERIC 1.288
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.32 2000/11/07 21:07:35 imp Exp $
d156 6
@


1.32
log
@Synchronize NEWCARD kernel to GENERIC kernel.  It is still experimental,
but it doesn't hurt to keep these things in sync.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.31 2000/11/07 20:22:19 semenu Exp $
d102 5
a106 5
device		adv
device		adw
device		aha	1
device		aic
device		bt
d132 3
a134 3
device		atkbdc	1
device		atkbd
device		psm
d136 1
a136 1
device		vga
d157 3
a159 3
# PCCARD (PCMCIA) support
device		pcic
device		pccbb
d162 1
a162 1
device		sio
d194 8
a201 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
d207 6
@


1.31
log
@Synced tx(4) driver descriptions + ``device tx'' line moved to the
list of drivers using miibus.

PR:		kern/22556
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.30 2000/10/03 18:30:15 wpaul Exp $
d37 2
a38 1
hints		"NEWCARD.hints"		#Default places to look for devices.
d55 1
a72 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
d78 3
a80 3
#device		cardbus
options 	COMPAT_OLDISA		# compatability shims for lnc, fe, le
options 	COMPAT_OLDPCI		# compatability shims for lnc, vx
a97 1
device		dpt		# DPT Smartcache - See NOTES for options!
a103 1
device		bt
d106 10
d125 2
a127 1
device		amr		# AMI MegaRAID
d129 1
d159 1
a159 1
#device		pccbb
d180 1
d183 1
a184 1
device		pcn		# AMD Am79C79x PCI 10/100 NICs
d195 1
d199 1
a199 1
device		cs
d215 1
d217 3
a219 4
#device		ie
#device		fe
#device		le
#device		lnc
d223 1
d239 12
a250 10
#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
#device		urio		# Diamond Rio 500 MP3 player
d252 3
a254 3
#device		aue		# ADMtek USB ethernet
#device		cue		# CATC USB ethernet
#device		kue		# Kawasaki LSI USB ethernet
d256 1
@


1.30
log
@Add the pcn device to NEWCARD and NOTES.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.29 2000/09/12 13:21:40 markm Exp $
a168 1
device		tx		# SMC 9432TX (83c170 ``EPIC'')
d181 1
@


1.29
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.28 2000/08/03 21:51:03 imp Exp $
d177 1
@


1.28
log
@Merge from GENERIC.  Mostly reenable some devices and add SOFTUPDATES
and RANDOMDEV to the list.  STill need to do more merging, but for now
things are better.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.27 2000/06/13 22:28:46 peter Exp $
a66 1
options 	RANDOMDEV		#entropy device
d212 1
@


1.27
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
@d24 2
a25 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.
d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.26 2000/05/30 23:01:37 green Exp $
d46 1
d67 1
d74 1
a74 1
#options 	NBUS=4			# number of busses
d83 2
a84 2
options 	COMPAT_OLDISA		# Old ISA driver shims
options 	COMPAT_OLDPCI		# Old PCI driver shims
d101 2
a102 2
#device		amd		# AMD 53C974 (Teckram DC-390(T))
#device		dpt		# DPT Smartcache - See LINT for options!
d105 1
a105 1
device		sym		# NCR/Symbios Logic (newer chipsets)
d107 1
a107 1
#device		adv
d148 1
a148 1
# Power management support (see LINT for more options)
d170 2
a171 2
#device		tx		# SMC 9432TX (83c170 ``EPIC'')
#device		vx		# 3Com 3c590, 3c595 (``Vortex'')
d190 2
d203 3
a205 1
#device		awi
a210 4
#device		cs
device		sn
# Disabled because it is currently broken.
#device		xe
@


1.26
log
@Change sl(4) configuration lines to reflect its new dynamic nature.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.25 2000/05/29 03:34:04 imp Exp $
d37 2
d65 1
d81 2
d85 1
a85 3
device		fdc0	at isa? port IO_FD1 irq 6 drq 2
device		fd0	at fdc0 drive 0
device		fd1	at fdc0 drive 1
a87 2
device		ata0	at isa? port IO_WD1 irq 14
device		ata1	at isa? port IO_WD2 irq 15
d105 1
a105 1
#device		adv0	at isa?
d107 3
a109 3
device		bt0	at isa?
device		aha0	at isa?
device		aic0	at isa?
d124 3
a126 3
device		atkbdc0	at isa? port IO_KBD
device		atkbd0	at atkbdc? irq 1
device		psm0	at atkbdc? irq 12
d128 1
a128 1
device		vga0	at isa?
d131 1
a131 1
pseudo-device	splash
d134 1
a134 1
device		sc0	at isa?
d137 1
a137 1
#device		vt0	at isa?
d144 1
a144 1
device		npx0	at nexus? port IO_NPX irq 13
d147 1
a147 1
device		apm0    at nexus? flags 0x20 # Advanced Power Management
d150 1
a150 1
device		pcic0	at isa? irq 10 port 0x3e0 iomem 0xd0000
d154 1
a154 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
d157 1
a157 1
device		ppc0	at isa? irq 7
d185 1
a185 1
device		ed0	at isa? port 0x280 irq 10 iomem 0xd8000
d201 6
a206 6
#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
#device		cs0	at isa? port 0x300
device		sn0	at isa? port 0x300 irq 10
d211 9
a219 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)
d221 1
a221 1
# The `bpf' pseudo-device enables the Berkeley Packet Filter.
d223 1
a223 1
pseudo-device	bpf		# Berkeley packet filter
@


1.25
log
@ICMP_RATELIM is no longer an option.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.24 2000/05/13 11:21:19 hoek Exp $
d215 1
a215 1
pseudo-device	sl	1	# Kernel SLIP
@


1.24
log
@Change to comments only: spell FreeBSD.org correctly
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.23 2000/04/30 15:38:28 markm Exp $
a62 1
options		ICMP_BANDLIM		#Rate limit bad replies
@


1.23
log
@Fix comments, whitespace to reduce diffs between this and GENERIC.
@
text
@d16 1
a16 1
#    http://www.freebsd.org/handbook/kernelconfig-config.html
d20 1
a20 1
# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.22 2000/03/25 03:15:03 imp Exp $
@


1.22
log
@Make this compile again and harmonize with GENERIC:
o added gif, faith, wx, ida, amr, mlw, INET6
o many comment nits
o Comment out all the compat shim devices, mostly so that I know what
  they are:
	amd, dpt, ncr, adv, tx, vx, fe, cs, lnc,
o Leave the following commented out:
	ie, le

NEWCARD now compiles again.  Back to testing...
@
text
@d11 1
a11 1
# CURRENT STATUS OF CODE: NOT WORKING.  Use PCCARD instead.
d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.21 2000/02/16 04:27:04 yokota Exp $
d61 1
a61 1
options 	P1003_1B		#Posix P1003_1B real-time extentions
d136 1
a136 1
# Enable this and PCVT_FREEBSD for pcvt vt220 compatible console driver
d150 1
a150 1
device		pcic0	at isa? port 0x3e0 irq 10 iomem 0xd0000
d167 1
d201 2
d210 2
a211 3
# requires PCCARD (PCMCIA) support to be activated
# XXX BROKEN
#device		xe0	at isa? port? irq ?
d226 1
a226 1
pseudo-device	bpf		#Berkeley packet filter
d238 2
@


1.21
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.20 2000/01/24 05:38:55 bde Exp $
d41 1
d53 1
a53 1
options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
d61 3
d99 2
a100 2
device		amd		# AMD 53C974 (Teckram DC-390(T))
device		dpt		# DPT Smartcache - See LINT for options!
d102 1
a102 1
device		ncr		# NCR/Symbios Logic
d105 1
a105 1
device		adv0	at isa? port ? irq ?
d107 3
a109 3
device		bt0	at isa? port ? irq ?
device		aha0	at isa? port ? irq ?
device		aic0	at isa? port ? irq ?
d119 3
a121 2
#device		amr		# AMI MegaRAID
#device		mlx		# Mylex DAC960 family
d128 1
a128 1
device		vga0	at isa? port ? conflicts
d160 1
a160 1
device		ppc0	at isa? port? flags 0x40 irq 7
d165 1
a165 1
#device		vpo		# Requires scbus and da0
d170 3
a172 2
device		tx		# SMC 9432TX (83c170 ``EPIC'')
device		vx		# 3Com 3c590, 3c595 (``Vortex'')
d202 1
a202 1
device		fe0	at isa? port 0x300 irq ?
d204 2
a205 2
device		lnc0	at isa? port 0x280 irq 10 drq 0
device		cs0	at isa? port 0x300 irq ?
d219 2
d234 1
a234 1
#device		umass		# Disks/Mass storage - Requires scbus and da0
@


1.21.2.1
log
@MFC: Change to comments only: spell FreeBSD.org correctly
@
text
@d16 1
a16 1
#    http://www.FreeBSD.org/handbook/kernelconfig-config.html
d20 1
a20 1
# FreeBSD World Wide Web server (http://www.FreeBSD.org/) for the
d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.21 2000/02/16 04:27:04 yokota Exp $
@


1.21.2.2
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.21.2.1 2000/05/13 11:22:14 hoek Exp $
a170 1
device		pcn		# AMD Am79C79x PCI 10/100 NICs
@


1.21.2.3
log
@tx(4) driver moved to the list of using miibus.

PR:		kern/22556
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.21.2.2 2000/10/03 18:46:53 wpaul Exp $
d165 1
a176 1
device		tx		# SMC EtherPower II (83c17x ``EPIC'')
@


1.21.2.4
log
@MFC:

remove opsolete WC/TAGS/ATAPI_DMA options, they are now tuneables

Approved by: jkh
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.21.2.3 2000/11/07 20:28:23 semenu Exp $
d90 1
@


1.21.2.5
log
@This is causing confusion.  Kill it until such time that a real MFC
has been done.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.21.2.4 2001/04/05 17:23:11 sos Exp $
@


1.20
log
@Removed bogus quotes and unmangled related contractions.
"ktrace(1) syscall trace" -> "ktrace(1)".
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.19 2000/01/23 18:31:19 peter Exp $
d133 1
a133 1
#options 	XSERVER			# support for X server
@


1.19
log
@Sync NEWCARD a bit with GENERIC.  Remove trailing '0' on unwired devices.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.18 2000/01/14 20:40:59 wpaul Exp $
d46 1
a46 1
options 	NFS_ROOT		#NFS usable as root device, "NFS" req'ed
d49 1
a49 1
options 	CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
d56 1
a56 1
options 	KTRACE			#ktrace(1) syscall trace support
@


1.18
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.17 2000/01/14 03:14:43 wpaul Exp $
d70 5
a74 5
device		isa0
device		eisa0
device		pci0
device		pccard0
#device		cardbus0
d84 5
a88 5
device		ata2
device		atadisk0	# ATA disk drives
device		atapicd0	# ATAPI CDROM drives
device		atapifd0	# ATAPI floppy drives
device		atapist0	# ATAPI tape drives
d93 7
a99 9
# A single entry for any of these controllers (ahb, ahc, amd, ncr, etc...) is
# sufficient for any number of installed devices.
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)
d102 1
a102 1
device		adw0
d108 5
a112 6
# Only one of each of these is needed, they are dynamically allocated.
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)
d115 2
a116 2
#device		amr0		# AMI MegaRAID
#device		mlx0		# Mylex DAC960 family
d146 1
a146 1
#device		pccbb0
d156 5
a160 5
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
d163 4
a166 4
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'')
d169 10
a178 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'')
d182 2
a183 2
device		ex0
device		ep0
d187 1
a187 1
device		wi0
d193 1
a193 1
device        an0
d219 12
a230 12
#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
#device		aue0		# ADMtek USB ethernet
#device		cue0		# CATC USB ethernet
#device		kue0		# Kawasaki LSI USB ethernet
@


1.17
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.16 2000/01/13 07:01:13 mdodd Exp $
d191 6
@


1.16
log
@Remove the 'at isa? ...' bits for ex0.

Remove the confusing text about pccard and unit numbers for ep0.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.15 2000/01/08 16:19:33 peter Exp $
d226 1
@


1.15
log
@Sync the sym0 description while here.  It doesn't conflict with ncr0
and is enabled in GENERIC.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.14 2000/01/08 16:17:41 peter Exp $
d185 1
a185 3
device		ex0	at isa? port? irq?
# NOTE: This removes the isa attachment so that the pccard unit numbers
# come out right.
@


1.14
log
@s/controller/device/ as per config(8) changes
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.13 2000/01/05 04:27:13 wpaul Exp $
d101 1
a101 1
#device		sym0		# NCR/Symbios Logic (do not mix with ncr, it conflicts)
@


1.13
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.12 1999/12/28 02:01:04 wpaul Exp $
d70 5
a74 5
controller	isa0
controller	eisa0
controller	pci0
controller	pccard0
# controller	cardbus0
d77 1
a77 1
controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
d82 3
a84 3
controller	ata0	at isa? port IO_WD1 irq 14
controller	ata1	at isa? port IO_WD2 irq 15
controller	ata2
d95 13
a107 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 (do not mix with ncr, it conflicts)

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 ?
d111 1
a111 1
controller	scbus0		# SCSI bus (required)
d122 1
a122 1
controller	atkbdc0	at isa? port IO_KBD
d148 2
a149 2
controller	pcic0	at isa? port 0x3e0 irq 10 iomem 0xd0000
# controller	pccbb0
d159 1
a159 1
controller	ppbus0		# Parallel port bus (required)
d163 1
a163 1
#controller	vpo0		# Requires scbus and da0
d172 1
a172 1
controller	miibus0		# MII bus support
d218 3
a220 3
#controller	uhci0		# UHCI PCI->USB interface
#controller	ohci0		# OHCI PCI->USB interface
#controller	usb0		# USB Bus (required)
d225 1
a225 1
#controller	umass0		# Disks/Mass storage - Requires scbus and da0
@


1.12
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.11 1999/12/23 05:32:53 wpaul Exp $
d228 1
@


1.11
log
@Fix minor typo in comments about WaveLAN/IEEE driver: 802.1 -> 802.11
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.10 1999/12/19 21:55:29 imp Exp $
d227 1
@


1.10
log
@Merge changes from GENERIC into PCCARD (cdrom)
Merge changes from PCCARD into NEWCARD (cdrom and markm's comments)
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.9 1999/12/18 07:49:54 imp Exp $
d189 1
a189 1
# WaveLAN/IEEE 802.1 wireless NICs. Note: the WaveLAN/IEEE really
@


1.9
log
@spell isa right on sn0 line
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.8 1999/12/18 07:47:34 imp Exp $
d43 1
a44 1
options 	MFS			#Memory Filesystem
a120 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

d186 2
@


1.8
log
@Merge GENERIC into PCCARD
Merge PCCARD into NEWCARD
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.7 1999/12/06 18:17:42 peter Exp $
d203 1
a203 1
device		sn0	at ias? port 0x300 irq 10
@


1.7
log
@Fold the pnp code into the base isa system to pave the way for PNPBIOS.

Reviewed by:	dfr (a few weeks ago)
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.6 1999/12/04 17:41:19 wpaul Exp $
d43 1
a44 1
options 	MFS_ROOT		#MFS usable as root device, "MFS" req'ed
d57 3
a59 3
options         SYSVSHM			#SYSV-style shared memory
options         SYSVMSG			#SYSV-style message queues
options         SYSVSEM			#SYSV-style semaphores
d81 10
a90 13
# 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)
d93 1
a93 1
# A single entry for any of these controllers (ncr, ahb, ahc) is
a94 1
controller	ncr0		# NCR/Symbios Logic
d97 2
d100 2
a101 1
controller      dpt0		# DPT Smartcache - See LINT for options!
d107 1
d117 4
d122 4
a125 4
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
d151 1
a151 1
device		apm0    at nexus? disable flags 0x31 # Advanced Power Management
a170 3
# MII bus support, required for some 10/100 NICs
controller	miibus0

d173 6
a179 1
device		fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
a184 1
device		tx0		# SMC 9432TX (83c170 ``EPIC'')
a185 1
device		vx0		# 3Com 3c590, 3c595 (``Vortex'')
a189 1
# The probe order of these is presently determined by i386/isa/isa_compat.c.
d191 1
a191 3
# device		ie0	at isa? port 0x300 irq 10 iomem 0xd0000
# NOTE: This removes the isa attachment so that the pccard unit numbers
# come out right.
d193 6
a198 1
device		ex0	at isa? port? irq?
d200 1
a200 1
# device		le0	at isa? port 0x300 irq 5 iomem 0xd0000
d203 1
d205 1
d215 1
a215 1
pseudo-device	gzip		# Exec gzipped a.out's
@


1.6
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
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.5 1999/11/20 07:23:26 imp Exp $
a70 1
controller	pnp0			# PnP support for ISA
@


1.5
log
@Latest incremental efforts on newcard:

o Delete pcic1 from NEWCARD
o Add explicit resource hints to pcic0
o Get attach working with newbus, kinda (it does all the newbus stuff,
  but doesn't try to attach the pccard yet, too many panics).
o Disable ie0 and le0 in NEWCARD config.  There appears to be a bug in
  the isa_compat code wrt memory conflicts with newbus drivers for
  reasons unknown.
o Minor cleanups.
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.4 1999/11/01 17:50:29 imp Exp $
a171 2
device		al0		# ADMtek AL981 (``Comet'')
device		ax0		# ASIX AX88140A
d173 1
a173 1
device		dm0		# Davicom DM9100/DM9102
a174 2
device		mx0		# Macronix 98713/98715/98725 (``PMAC'')
device		pn0		# Lite-On 82c168/82c169 (``PNIC'')
@


1.4
log
@Put more explict warning that this file should not be used if you want
a working kernel
@
text
@d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.3 1999/11/01 04:02:58 peter Exp $
d151 1
a151 2
controller	pcic0	at isa?
controller	pcic1	at isa?
d193 1
a193 1
device		ie0	at isa? port 0x300 irq 10 iomem 0xd0000
d199 1
a199 1
device		le0	at isa? port 0x300 irq 5 iomem 0xd0000
d228 2
@


1.3
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
@d11 2
d27 1
a27 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.2 1999/10/26 16:53:55 imp Exp $
@


1.2
log
@Very preliminary pcic device support.  Will make depend, but won't
(yet) compile and link.  Renamed pcic back to pcic from pcicx, but
conditionalize its inclusion on pccard being included also.  card is
the old and pccard is the new, which is a handy way to have both in
the tree at the same time.

Obtained from: newconfig project

More to follow...
@
text
@d25 1
a25 1
# $FreeBSD: src/sys/i386/conf/NEWCARD,v 1.1 1999/10/26 04:57:24 imp Exp $
d77 2
a78 2
disk		fd0	at fdc0 drive 0
disk		fd1	at fdc0 drive 1
d82 2
a83 2
disk		wd0	at wdc0 drive 0
disk		wd1	at wdc0 drive 1
d86 2
a87 2
disk		wd2	at wdc1 drive 0
disk		wd3	at wdc1 drive 1
@


1.1
log
@Here's the config file that I'm starting with for the port of the
newconfig pccard/cardbus code.

Much more to follow. :-)
@
text
@d25 1
a25 1
# $FreeBSD$
d149 2
a150 2
controller	pcicx0	at isa?
controller	pcicx1	at isa?
@
