head	1.22;
access;
symbols
	RELENG_8_4:1.21.0.2
	RELENG_9_1_0_RELEASE:1.18.2.1.4.2
	RELENG_9_1:1.18.2.1.0.4
	RELENG_9_1_BP:1.18.2.1
	RELENG_8_3_0_RELEASE:1.13.2.2.6.1
	RELENG_8_3:1.13.2.2.0.6
	RELENG_8_3_BP:1.13.2.2
	RELENG_9_0_0_RELEASE:1.18.2.1.2.1
	RELENG_9_0:1.18.2.1.0.2
	RELENG_9_0_BP:1.18.2.1
	RELENG_9:1.18.0.2
	RELENG_9_BP:1.18
	RELENG_7_4_0_RELEASE:1.7.4.1.8.1
	RELENG_8_2_0_RELEASE:1.13.2.2.4.1
	RELENG_7_4:1.7.4.1.0.8
	RELENG_7_4_BP:1.7.4.1
	RELENG_8_2:1.13.2.2.0.4
	RELENG_8_2_BP:1.13.2.2
	RELENG_8_1_0_RELEASE:1.13.2.2.2.1
	RELENG_8_1:1.13.2.2.0.2
	RELENG_8_1_BP:1.13.2.2
	RELENG_7_3_0_RELEASE:1.7.4.1.6.1
	RELENG_7_3:1.7.4.1.0.6
	RELENG_7_3_BP:1.7.4.1
	RELENG_8_0_0_RELEASE:1.13.2.1.2.1
	RELENG_8_0:1.13.2.1.0.2
	RELENG_8_0_BP:1.13.2.1
	RELENG_8:1.13.0.2
	RELENG_8_BP:1.13
	RELENG_7_2_0_RELEASE:1.7.4.1.4.1
	RELENG_7_2:1.7.4.1.0.4
	RELENG_7_2_BP:1.7.4.1
	RELENG_7_1_0_RELEASE:1.7.4.1.2.1
	RELENG_6_4_0_RELEASE:1.7.2.2.2.1
	RELENG_7_1:1.7.4.1.0.2
	RELENG_7_1_BP:1.7.4.1
	RELENG_6_4:1.7.2.2.0.2
	RELENG_6_4_BP:1.7.2.2
	RELENG_7_0_0_RELEASE:1.7
	RELENG_6_3_0_RELEASE:1.7.2.1
	RELENG_7_0:1.7.0.6
	RELENG_7_0_BP:1.7
	RELENG_6_3:1.7.2.1.0.4
	RELENG_6_3_BP:1.7.2.1
	RELENG_7:1.7.0.4
	RELENG_7_BP:1.7
	RELENG_6_2_0_RELEASE:1.7.2.1
	RELENG_6_2:1.7.2.1.0.2
	RELENG_6_2_BP:1.7.2.1
	RELENG_6:1.7.0.2;
locks; strict;
comment	@# @;


1.22
date	2013.04.05.00.25.43;	author svnexp;	state Exp;
branches;
next	1.21;

1.21
date	2012.11.17.01.52.34;	author svnexp;	state Exp;
branches
	1.21.2.1;
next	1.20;

1.20
date	2012.03.21.08.38.42;	author ed;	state Exp;
branches;
next	1.19;

1.19
date	2012.03.04.21.31.13;	author rmh;	state Exp;
branches;
next	1.18;

1.18
date	2011.08.07.20.16.46;	author rmacklem;	state Exp;
branches
	1.18.2.1;
next	1.17;

1.17
date	2011.04.26.17.01.49;	author mav;	state Exp;
branches;
next	1.16;

1.16
date	2011.04.24.08.58.58;	author mav;	state Exp;
branches;
next	1.15;

1.15
date	2010.12.28.21.20.58;	author imp;	state Exp;
branches;
next	1.14;

1.14
date	2010.04.22.21.31.34;	author thompsa;	state Exp;
branches;
next	1.13;

1.13
date	2009.05.10.00.00.25;	author kuriyama;	state Exp;
branches
	1.13.2.1;
next	1.12;

1.12
date	2009.03.19.20.33.26;	author thompsa;	state Exp;
branches;
next	1.11;

1.11
date	2009.02.23.18.34.56;	author thompsa;	state Exp;
branches;
next	1.10;

1.10
date	2008.08.20.08.31.58;	author ed;	state Exp;
branches;
next	1.9;

1.9
date	2008.03.27.11.54.18;	author dfr;	state Exp;
branches;
next	1.8;

1.8
date	2007.11.28.05.50.44;	author attilio;	state Exp;
branches;
next	1.7;

1.7
date	2006.08.09.23.47.38;	author imp;	state Exp;
branches
	1.7.2.1
	1.7.4.1;
next	1.6;

1.6
date	2006.06.27.20.22.32;	author rink;	state Exp;
branches;
next	1.5;

1.5
date	2006.06.15.19.58.50;	author netchild;	state Exp;
branches;
next	1.4;

1.4
date	2006.03.03.14.52.56;	author rink;	state Exp;
branches;
next	1.3;

1.3
date	2006.02.04.10.01.33;	author rink;	state Exp;
branches;
next	1.2;

1.2
date	2005.11.27.23.16.59;	author ru;	state Exp;
branches;
next	1.1;

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

1.21.2.1
date	2012.11.17.01.52.34;	author svnexp;	state dead;
branches;
next	1.21.2.2;

1.21.2.2
date	2013.03.28.13.05.06;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1
date	2011.09.23.00.51.37;	author kensmith;	state Exp;
branches
	1.18.2.1.2.1
	1.18.2.1.4.1;
next	1.18.2.2;

1.18.2.2
date	2012.11.17.11.37.11;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1.2.1
date	2011.11.11.04.20.22;	author kensmith;	state Exp;
branches;
next	1.18.2.1.2.2;

1.18.2.1.2.2
date	2012.11.17.08.37.07;	author svnexp;	state Exp;
branches;
next	;

1.18.2.1.4.1
date	2012.08.05.23.54.33;	author kensmith;	state Exp;
branches;
next	1.18.2.1.4.2;

1.18.2.1.4.2
date	2012.11.17.08.47.58;	author svnexp;	state Exp;
branches;
next	;

1.13.2.1
date	2009.08.03.08.13.06;	author kensmith;	state Exp;
branches
	1.13.2.1.2.1;
next	1.13.2.2;

1.13.2.2
date	2010.04.29.22.44.04;	author thompsa;	state Exp;
branches
	1.13.2.2.2.1
	1.13.2.2.4.1
	1.13.2.2.6.1;
next	1.13.2.3;

1.13.2.3
date	2012.11.17.10.36.50;	author svnexp;	state Exp;
branches;
next	;

1.13.2.1.2.1
date	2009.10.25.01.10.29;	author kensmith;	state Exp;
branches;
next	;

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

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

1.13.2.2.6.1
date	2012.03.03.06.15.13;	author kensmith;	state Exp;
branches;
next	1.13.2.2.6.2;

1.13.2.2.6.2
date	2012.11.17.08.25.27;	author svnexp;	state Exp;
branches;
next	;

1.7.2.1
date	2006.08.23.16.28.03;	author rink;	state Exp;
branches;
next	1.7.2.2;

1.7.2.2
date	2008.04.24.10.46.19;	author dfr;	state Exp;
branches
	1.7.2.2.2.1;
next	1.7.2.3;

1.7.2.3
date	2012.11.17.07.43.51;	author svnexp;	state Exp;
branches;
next	;

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

1.7.4.1
date	2008.04.10.09.39.23;	author dfr;	state Exp;
branches
	1.7.4.1.2.1
	1.7.4.1.4.1
	1.7.4.1.6.1
	1.7.4.1.8.1;
next	1.7.4.2;

1.7.4.2
date	2012.11.17.08.06.23;	author svnexp;	state Exp;
branches;
next	;

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

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

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

1.7.4.1.8.1
date	2010.12.21.17.10.29;	author kensmith;	state Exp;
branches;
next	1.7.4.1.8.2;

1.7.4.1.8.2
date	2012.11.17.08.17.22;	author svnexp;	state Exp;
branches;
next	;


desc
@@


1.22
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/249083
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@#
# XBOX -- kernel for an XBOX
#
# $FreeBSD: head/sys/i386/conf/XBOX 249083 2013-04-04 07:12:24Z mav $
cpu		I686_CPU		# Celeron
ident		XBOX

makeoptions	MODULES_OVERRIDE=""

options 	KDB
options 	DDB

options 	XBOX			# kernel is for XBOX
device		xboxfb			# frame buffer support (REQUIRED!)
device		sc			# syscons
device		fb

# no support yet for root device name fetching
options 	ROOTDEVNAME=\"ufs:ada0s1a\"
#options 	ROOTDEVNAME=\"cd9660:acd0\"

options 	SCHED_4BSD		# 4BSD 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 	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 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
#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
# Xbox has a non-standard default timer frequency
options 	TIMER_FREQ=1125000	# Gives ~733.34MHz CPU

#device		apic			# I/O APIC

device		pci

# ATA and ATAPI devices
device		ata
options 	ATA_STATIC_ID	# Static device numbering

# ATA/SCSI peripherals
device		scbus		# SCSI bus (required for ATA/SCSI)
device		cd		# CD
device		da		# Direct Access (disks)
device		pass		# Passthrough device (direct ATA/SCSI access)

# Pseudo devices.
device		loop		# Network loopback
device		random		# Entropy device
device		ether		# Ethernet support
#device		tun		# Packet tunnel.
#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!
# 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		usb		# USB Bus (required)
device		ukbd		# Keyboard
device		umass		# Disks/Mass storage - Requires scbus and da

device		miibus

device		sound
device		snd_ich		# nForce audio

device		nfe		# nVidia nForce MCP on-board Ethernet Networking
@


1.21
log
@Switching exporter and resync
@
text
@d4 1
a4 1
# $FreeBSD: head/sys/i386/conf/XBOX 233271 2012-03-21 08:38:42Z ed $
a53 1
options 	ATA_CAM
@


1.21.2.1
log
@file XBOX was added on branch RELENG_8_4 on 2013-03-28 13:05:06 +0000
@
text
@d1 90
@


1.21.2.2
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/248810
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
@
text
@a0 107
#
# XBOX -- kernel for an XBOX
#
# $FreeBSD: releng/8.4/sys/i386/conf/XBOX 207399 2010-04-29 22:44:04Z thompsa $
cpu		I686_CPU		# Celeron
ident		XBOX

makeoptions	MODULES_OVERRIDE=""

options 	KDB
options 	DDB

options 	XBOX			# kernel is for XBOX
device		xboxfb			# frame buffer support (REQUIRED!)
device		sc			# syscons
device		fb

# no support yet for root device name fetching
options 	ROOTDEVNAME=\"ufs:ad0s1a\"
#options 	ROOTDEVNAME=\"cd9660:acd0\"

options 	SCHED_4BSD		# 4BSD 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 	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 	COMPAT_FREEBSD4		# Compatible with FreeBSD4
#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
# Xbox has a non-standard default timer frequency
options 	TIMER_FREQ=1125000	# Gives ~733.34MHz CPU

#device		apic			# I/O APIC

# Bus support.  Do not remove isa, even if you have no isa slots
device		isa
device		pci

# ATA and ATAPI devices
device		ata
device		atadisk		# ATA disk drives
device		atapicd		# ATAPI CDROM drives
options 	ATA_STATIC_ID	# Static device numbering

# SCSI peripherals
device		scbus		# SCSI bus (required for SCSI)
device		da		# Direct Access (disks)

# Floating point support - do not disable.
device		npx

# Pseudo devices.
device		loop		# Network loopback
device		mem		# Memory and kernel memory devices
device		io		# I/O device
device		random		# Entropy device
device		ether		# Ethernet 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)

# 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		usb		# USB Bus (required)
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		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		sound
device		snd_ich		# nForce audio

device		nfe		# nVidia nForce MCP on-board Ethernet Networking
@


1.20
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
@d4 1
a4 1
# $FreeBSD$
@


1.19
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
@a67 1
device		pty		# BSD-style compatibility pseudo ttys
@


1.18
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
@a82 1
device		uhid		# "Human Interface Devices"
a83 1
device		ulpt		# Printer
a84 2
device		ums		# Mouse
device		urio		# Diamond Rio 500 MP3 player
a86 6
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
@


1.18.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.18.2.2
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
@d4 1
a4 1
# $FreeBSD: stable/9/sys/i386/conf/XBOX 224699 2011-08-07 20:16:46Z rmacklem $
@


1.18.2.1.4.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.18.2.1.4.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/9.1/sys/i386/conf/XBOX 224699 2011-08-07 20:16:46Z rmacklem $
@


1.18.2.1.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.18.2.1.2.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/9.0/sys/i386/conf/XBOX 224699 2011-08-07 20:16:46Z rmacklem $
@


1.17
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
@d30 2
a31 2
options 	NFSCLIENT		# Network Filesystem Client
#options 	NFSSERVER		# Network Filesystem Server
d33 1
a33 1
#options 	NFS_ROOT		# NFS usable as /, requires NFSCLIENT
@


1.16
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
@d55 1
@


1.15
log
@SVN rev 216776 on 2010-12-28 21:20:58Z by imp

Remove mem, io, isa and npx since they are duplicative of the entries
in DEFAULTS.  Saves 8 lines of warnings when we build XBOX.
@
text
@d19 1
a19 1
options 	ROOTDEVNAME=\"ufs:ad0s1a\"
d54 1
a54 3
device		atadisk		# ATA disk drives
device		atapicd		# ATAPI CDROM drives
options 	ATA_STATIC_ID	# Static device numbering
d56 3
a58 2
# SCSI peripherals
device		scbus		# SCSI bus (required for SCSI)
d60 1
@


1.14
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
@a49 2
# Bus support.  Do not remove isa, even if you have no isa slots
device		isa
a61 3
# Floating point support - do not disable.
device		npx

a63 2
device		mem		# Memory and kernel memory devices
device		io		# I/O device
@


1.13
log
@SVN rev 191954 on 2009-05-10 00:00:25Z by kuriyama

- Use "device\t" and "options \t" for consistency.
@
text
@d85 1
@


1.13.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.13.2.2
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
@a84 1
options 	USB_DEBUG	# enable debug msgs
@


1.13.2.3
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
@d4 1
a4 1
# $FreeBSD: stable/8/sys/i386/conf/XBOX 207399 2010-04-29 22:44:04Z thompsa $
@


1.13.2.2.6.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.13.2.2.6.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/8.3/sys/i386/conf/XBOX 207399 2010-04-29 22:44:04Z thompsa $
@


1.13.2.2.4.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.13.2.2.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.13.2.1.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.12
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
@d13 1
a13 1
options		XBOX			# kernel is for XBOX
d19 2
a20 2
options		ROOTDEVNAME=\"ufs:ad0s1a\"
#options	ROOTDEVNAME=\"cd9660:acd0\"
@


1.11
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
@a93 1
device		uscanner	# Scanners
@


1.10
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
@a87 1
device		ugen		# Generic
@


1.9
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
@d74 1
a74 1
device		pty		# Pseudo-ttys (telnet etc)
@


1.8
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
@d32 1
@


1.7
log
@Eliminate one set of XBOX #ifdefs.  The Xbox code just needs to set a
different TIMER_FREQ value than default.  Accomplish this via the
config file rather than via an #ifdef.
@
text
@a43 1
options 	ADAPTIVE_GIANT		# Giant mutex is adaptive.
@


1.7.4.1
log
@MFC: Kernel mode Network Lock Manager.
@
text
@a31 1
#options 	NFSLOCKD		# Network Lock Manager
@


1.7.4.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: stable/7/sys/i386/conf/XBOX 178061 2008-04-10 09:39:29Z dfr $
@


1.7.4.1.8.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.7.4.1.8.2
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: releng/7.4/sys/i386/conf/XBOX 178061 2008-04-10 09:39:29Z dfr $
@


1.7.4.1.6.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.7.4.1.4.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.7.4.1.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.7.2.1
log
@MFC: FreeBSD/xbox.

Added files missed during the import.

Reminded by:	?yvind Kolbu <oyvind@@kolbu.ws>
Reviewed by:	imp
Approved by:	imp
@
text
@a4 1
machine		i386
d14 1
a14 1
device		xboxfb			# frame buffer support
d45 2
d108 1
a108 1
device		nve		# nVidia nForce MCP on-board Ethernet Networking
@


1.7.2.2
log
@MFC: kernel-mode NFS lock manager.
@
text
@a32 1
#options 	NFSLOCKD		# Network Lock Manager
@


1.7.2.3
log
@Switch importer
@
text
@d4 1
a4 1
# $FreeBSD: stable/6/sys/i386/conf/XBOX 178459 2008-04-24 10:46:25Z dfr $
@


1.7.2.2.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.6
log
@Updated the XBOX kernel to use the new nfe(4) driver obtained from
OpenBSD. This driver seems to give a small performance increase, and
should lead to better maintainability in the future.

The nForce Ethernet-specific hack in sys/i386/xbox/xbox.c is still
required, judging from dev/nfe/if_nfe.c. The condition it hacks will
almost certainly only occur on XBOX-es anyway, so it is best left there.

Approved by:	imp (mentor)
@
text
@d45 2
@


1.5
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
@d106 1
a106 1
device		nve		# nVidia nForce MCP on-board Ethernet Networking
@


1.4
log
@Committed the xbox syscons(8)-able console driver.

Reviewed by:    arch@@ (no comments)
Approved by:    imp (mentor)
@
text
@a36 1
#options 	COMPAT_43		# Compatible with BSD 4.3 [KEEP THIS!]
@


1.3
log
@Patch to allow XBox-users to use the onboard nve(4) nForce ethernet driver.

The patch crudely forces the NIC out of operating mode before the nve(4)
driver can initialize it; this is required to properly initialize the NIC.

It is XBox-specific, as this condition can only occur on XBoxes (Most loaders
will simply leave the NIC running, forcing us to use a crude workaround like
this to get it in a workable condition). Due to the XBox-only aspect, this has
been solved in XBox-specific initialization code and not within nve(4).

Reviewed by:	imp
Approved by:	imp (mentor)
No objection:	bz@@, obrien@@, q@@ontheweb.com.au
@
text
@d15 2
@


1.2
log
@- Allow duplicate "machine" directives with the same arguments.
- Move existing "machine" directives to DEFAULTS.
@
text
@d104 2
@


1.1
log
@Add support for XBOX to the FreeBSD port.  The xbox architecture is
nearly identical to wintel/ia32, with a couple of tweaks.  Since it is
so similar to ia32, it is optionally added to a i386 kernel.  This
port is preliminary, but seems to work well.  Further improvements
will improve the interaction with syscons(4), port Linux nforce driver
and future versions of the xbox.

This supports the 64MB and 128MB boxes.  You'll need the most recent
CVS version of Cromwell (the Linux BIOS for the XBOX) to boot.

Rink will be maintaining this port, and is interested in feedback.
He's setup a website http://xbox-bsd.nl to report the latest
developments.

Any silly mistakes are my fault.

Submitted by: Rink P.W. Springer rink at stack dot nl and
	Ed Schouten ed at fxq dot nl
@
text
@a4 1
machine		i386
@

