PERFORCE change 15143 for review

[Robert Watson]

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=15143

Change 15143 by rwatson at rwatson_tislabs on 2002/07/29 13:59:16

	Merge changes from GENERIC.  I really should have created MAC
	by integ'ing GENERIC.

Affected files ...

.. //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#33 edit

Differences ...

==== //depot/projects/trustedbsd/mac/sys/i386/conf/MAC#33 (text+ko) ====

@@ -12,10 +12,11 @@
 # 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.
+# 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: src/sys/i386/conf/GENERIC,v 1.345 2002/06/06 16:35:58 gibbs Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.352 2002/07/23 06:35:08 peter Exp $
 
 machine		i386
 cpu		I486_CPU
@@ -47,6 +48,7 @@
 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
@@ -57,12 +59,13 @@
 options 	KBD_INSTALL_CDEV	# install a CDEV entry in /dev
 
 # Debugging for use in -current
+options 	ALT_BREAK_TO_DEBUGGER
+options 	BREAK_TO_DEBUGGER
 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
-options 	ALT_BREAK_TO_DEBUGGER
 
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
@@ -128,14 +131,13 @@
 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		atkbdc	1	# AT keyboard controller
+device		atkbd		# AT keyboard
+device		psm		# PS/2 mouse
 
-device		vga		# VGA screen
+device		vga		# VGA video card driver
 
-# splash screen/screen saver
-device		splash
+device		splash		# Splash screen and screen saver support
 
 # syscons is the default console driver, resembling an SCO console
 device		sc	1
@@ -149,13 +151,16 @@
 device		npx
 
 # Power management support (see NOTES for more options)
-device		apm
+#device		apm
 # Add suspend/resume support for the i8254.
 device		pmtimer
 
 # PCCARD (PCMCIA) support
-device		card		# pccard bus
-device		pcic		# PCMCIA bridge
+# Pcmcia and cardbus bridge support
+device		pccbb			# cardbus (yenta) bridge
+#device		pcic			# ExCA ISA and PCI bridges
+device		pccard			# PC Card (16-bit) bus
+device		cardbus			# CardBus (32-bit) bus
 
 # Serial (COM) ports
 device		sio		# 8250, 16[45]50 based serial ports
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message